Skip to content

Commit

Permalink
Release 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
christophd committed Dec 7, 2021
1 parent f0637ec commit 780aa49
Show file tree
Hide file tree
Showing 79 changed files with 88 additions and 88 deletions.
4 changes: 2 additions & 2 deletions .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Citrus Simulator
release:
current-version: 1.1.0
next-version: 2.0.0-SNAPSHOT
current-version: 2.0.0
next-version: 2.1.0-SNAPSHOT
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ apply plugin: 'org.springframework.boot'
jar {
group = "org.citrusframework.simulator"
baseName = 'citrus-simulator-sample'
version = '1.2-SNAPSHOT'
version = '2.0.0'
}
repositories {
Expand All @@ -73,7 +73,7 @@ targetCompatibility = 1.8
dependencies {
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("com.consol.citrus:citrus-simulator-starter:1.2-SNAPSHOT")
implementation("com.consol.citrus:citrus-simulator-starter:2.0.0")
testImplementation("junit:junit")
}
```
Expand All @@ -99,7 +99,7 @@ When choosing Maven as build tool the pom file is a normal Spring Boot project w
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.simulator.version>1.2-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.0.9.RELEASE</spring.boot.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>org.citrusframework</groupId>
<artifactId>citrus-simulator</artifactId>
<name>${project.artifactId}</name>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<packaging>pom</packaging>
<description>Citrus Simulator</description>
<url>https://citrusframework.org</url>
Expand Down
12 changes: 6 additions & 6 deletions simulator-archetypes/archetype-catalog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,42 @@
<archetype>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetype-rest</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0.0</version>
<repository>http://labs.consol.de/maven/repository/</repository>
<description>Archetype for Citrus REST simulator</description>
</archetype>
<archetype>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetype-ws</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0.0</version>
<repository>http://labs.consol.de/maven/repository/</repository>
<description>Archetype for Citrus SOAP simulator</description>
</archetype>
<archetype>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetype-jms</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0.0</version>
<repository>http://labs.consol.de/maven/repository/</repository>
<description>Archetype for Citrus JMS simulator</description>
</archetype>
<archetype>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetype-mail</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0.0</version>
<repository>http://labs.consol.de/maven/repository/</repository>
<description>Archetype for Citrus mail simulator</description>
</archetype>
<archetype>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetype-swagger</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0.0</version>
<repository>http://labs.consol.de/maven/repository/</repository>
<description>Archetype for Citrus Swagger auto generated REST simulator</description>
</archetype>
<archetype>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetype-wsdl</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0.0</version>
<repository>http://labs.consol.de/maven/repository/</repository>
<description>Archetype for Citrus WSDL auto generated SOAP simulator</description>
</archetype>
Expand Down
2 changes: 1 addition & 1 deletion simulator-archetypes/archetype-jms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetypes</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<activemq.version>5.15.9</activemq.version>
<testng.version>7.3.0</testng.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

<xs:element name="GoodNight" type="xs:string"/>
<xs:element name="GoodNightResponse" type="xs:string"/>
</xs:schema>
</xs:schema>
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
<property name="brokerURL" value="tcp://localhost:61616" />
</bean>

</beans>
</beans>
2 changes: 1 addition & 1 deletion simulator-archetypes/archetype-mail/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetypes</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<testng.version>7.3.0</testng.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
<contentType>text/plain; charset=utf-8</contentType>
<content>Say GoodBye!</content>
</body>
</mail-message>
</mail-message>
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
<contentType>text/plain; charset=utf-8</contentType>
<content>Say Hello!</content>
</body>
</mail-message>
</mail-message>
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
port="2222"
host="localhost"/>

</beans>
</beans>
2 changes: 1 addition & 1 deletion simulator-archetypes/archetype-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetypes</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<testng.version>7.3.0</testng.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

<xs:element name="GoodNight" type="xs:string"/>
<xs:element name="GoodNightResponse" type="xs:string"/>
</xs:schema>
</xs:schema>
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
request-url="http://localhost:8080/services/rest/simulator"
timeout="5000"/>

</beans>
</beans>
2 changes: 1 addition & 1 deletion simulator-archetypes/archetype-swagger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetypes</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<testng.version>7.3.0</testng.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
$.category.name=@assertThat(anyOf(is(dog),is(cat)))@
$.status=@matches(available|pending|sold|placed)@
$.quantity=@greaterThan(0)@
$.quantity=@greaterThan(0)@
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$.category.name=citrus:randomEnumValue('dog', 'cat')
$.name=citrus:randomEnumValue('hasso', 'cutie', 'fluffy')
$.name=citrus:randomEnumValue('hasso', 'cutie', 'fluffy')
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
timeout="5000"
/>

</beans>
</beans>
2 changes: 1 addition & 1 deletion simulator-archetypes/archetype-ws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetypes</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<testng.version>7.3.0</testng.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

<xs:element name="GoodNight" type="xs:string"/>
<xs:element name="GoodNightResponse" type="xs:string"/>
</xs:schema>
</xs:schema>
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@

<bean id="clientLoggingInterceptor" class="com.consol.citrus.ws.interceptor.LoggingClientInterceptor"/>

</beans>
</beans>
2 changes: 1 addition & 1 deletion simulator-archetypes/archetype-wsdl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework.archetypes</groupId>
<artifactId>citrus-simulator-archetypes</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<testng.version>7.3.0</testng.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<properties>
<entry key="//sim:Hello">Say Hello!</entry>
<entry key="//sim:GoodBye">Say GoodBye!</entry>
</properties>
</properties>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<properties>
<entry key="//sim:HelloResponse">Hello!</entry>
<entry key="//sim:GoodByeResponse">GoodBye!</entry>
</properties>
</properties>
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@

<bean id="clientLoggingInterceptor" class="com.consol.citrus.ws.interceptor.LoggingClientInterceptor"/>

</beans>
</beans>
2 changes: 1 addition & 1 deletion simulator-archetypes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-simulator</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion simulator-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-simulator</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/endpoint-support.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@ mail XML marshalling is automatically done by Citrus. This is the usual way how
features in our simulator, too. The scenario sends back a positive mail response to the calling client.

This is how we can use any Citrus endpoint component as simulator inbound source. This gives us the opportunity to support a huge set of message transports and
message types in our simulator applications. Each incoming request on the endpoint component triggers a new simulator scenario.
message types in our simulator applications. Each incoming request on the endpoint component triggers a new simulator scenario.
4 changes: 2 additions & 2 deletions simulator-docs/src/main/asciidoc/installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ See the following sample Maven project POM file that defines the project sources
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.simulator.version>2.0.0-SNAPSHOT</citrus.simulator.version>
<citrus.simulator.version>2.0.0</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
</properties>
Expand Down Expand Up @@ -310,4 +310,4 @@ you can open your browser and point to link:http://localhost:8080[http://localho

Now everything is set up and you can start to create some simulator scenarios.

That's it you are ready to use the Citrus simulator.
That's it you are ready to use the Citrus simulator.
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ public class FaxCancelledScenario extends AbstractFaxScenario {
The sample above uses XPath expressions to start a new correlation within the scenario. This makes sure that the second incoming request *CancelFaxMessage* is forwarded to this very same scenario.

With intermediate message handling we are able to create more complex scenarios that require multiple request/response messages. The message correlation makes sure that the
needed requests are handled within the same scenarion and other parallel running scenarios are not affected.
needed requests are handled within the same scenarion and other parallel running scenarios are not affected.
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ java -version

The simulator provides a small web user interface when started. You can access this web UI with your browser. As we are in an early state in this project we do not
invest much time in full cross-browser compatibility. We use Chrome and Firefox during development. So the simulator application is most likely to be 100% working
on these two browsers. Of course other browsers might work without any limitations, too.
on these two browsers. Of course other browsers might work without any limitations, too.
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/jms-support.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,4 @@ public class Simulator extends SimulatorJmsAdapter {
}
----

This completes the JMS communication support within the simulator. Read more about other messaging transports such as Http REST or SOAP in this documentation.
This completes the JMS communication support within the simulator. Read more about other messaging transports such as Http REST or SOAP in this documentation.
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/links.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
link:https://www.citrusframework.org/reference/html/[Citrus manual]:: gives you a detailed description of all Citrus features
link:https://github.com/citrusframework/citrus-simulator/blob/master/simulator-samples[Sample projects]:: demonstrate typical simulator scenarios with different message transports
link:https://www.citrusframework.org/docs/history[ChangeLog]:: shows the release history
link:https://github.com/citrusframework/citrus-simulator/blob/master/simulator-docs/contributing.md[Contributing]:: explains how you can contribute to this project
link:https://github.com/citrusframework/citrus-simulator/blob/master/simulator-docs/contributing.md[Contributing]:: explains how you can contribute to this project
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/overview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ hesitate to contact us. Find below the reference documentation for the latest Ci
|Version |HTML |PDF

|Latest |link:/citrus-simulator/reference/html/index.html[HTML] |link:/citrus-simulator/reference/pdf/citrus-reference.pdf[PDF]
|2.0.0-SNAPSHOT |link:/citrus-simulator/reference/2.0.0-SNAPSHOT/html/index.html[HTML] |link:/citrus-simulator/reference/2.0.0-SNAPSHOT/pdf/citrus-simulator-reference-2.0.0-SNAPSHOT.pdf[PDF]
|2.0.0 |link:/citrus-simulator/reference/2.0.0/html/index.html[HTML] |link:/citrus-simulator/reference/2.0.0/pdf/citrus-simulator-reference-2.0.0.pdf[PDF]
|1.1.0 |link:/citrus-simulator/reference/1.1.0/html/index.html[HTML] |link:/citrus-simulator/reference/1.1.0/pdf/citrus-simulator-reference-1.1.0.pdf[PDF]
|1.0.2 |link:/citrus-simulator/reference/1.0.2/html/index.html[HTML] |link:/citrus-simulator/reference/1.0.2/pdf/citrus-simulator-reference-1.0.2.pdf[PDF]
|===
Expand Down
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/scenario-mapper.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ public class SimulatorAdapter extends SimulatorRestAdapter {
With the configuration above we use the _HeaderValueScenarioMapper_ implementation so the header name *X-simulator-scenario* gets evaluated for each incoming request message.
Depending on that header value the matching scenario is executed as a result. The scenario mapper is just a bean in the Spring application context. There is a default implementation but you can overwrite
this behavior very easy in the simulator adapter configuration. Read more about how to add simulator adapter configuration classes in configuration chapters link:#rest-config[rest-config], link:#ws-config[ws-config]
or link:#jms-config[jms-config].
or link:#jms-config[jms-config].
2 changes: 1 addition & 1 deletion simulator-docs/src/main/asciidoc/scenarios.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ we can use the Citrus test power for generating dynamic response messages. Of co
Now you are ready to write different scenarios that generate different response messages for the calling client. Just remember the scenarios do get unique names that match a value that is evaluated through the scenario mapper. With this
mechanism we are able to code different simulator scenarios for different incoming request messages. Also with the Citrus send and receive operations we are able to handle messages of different transport types.

Read more about special message transport support in chapters link:#rest[rest-support], link:#web-service[web-service-support], link:#jms[jms-support], link:#endpoint[endpoint-support].
Read more about special message transport support in chapters link:#rest[rest-support], link:#web-service[web-service-support], link:#jms[jms-support], link:#endpoint[endpoint-support].

0 comments on commit 780aa49

Please sign in to comment.