Release v3.4.0

citrusframework · Oct 19, 2023 · d23642b · d23642b
1 parent 58f6fc0
commit d23642b
Show file tree

Hide file tree

Showing 80 changed files with 333 additions and 335 deletions.
diff --git a/demo/pom.xml b/demo/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-demo</artifactId>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <name>Citrus Samples:: Demos</name>
   <packaging>pom</packaging>
 

diff --git a/demo/sample-bakery/integration/pom.xml b/demo/sample-bakery/integration/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>citrus-sample-bakery</artifactId>
     <groupId>com.consol.citrus.samples</groupId>
-    <version>3.2.1</version>
+    <version>3.4.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/demo/sample-bakery/pom.xml b/demo/sample-bakery/pom.xml
@@ -5,7 +5,7 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-bakery</artifactId>
   <name>Citrus Samples:: Bakery</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -18,14 +18,14 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <apache.camel.version>3.16.0</apache.camel.version>
+    <spring.version>5.3.25</spring.version>
+    <apache.camel.version>3.20.1</apache.camel.version>
     <activemq.version>5.17.0</activemq.version>
     <jolokia.version>1.3.1</jolokia.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
-    <jetty.version>9.4.46.v20220331</jetty.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
+    <jetty.version>9.4.50.v20221201</jetty.version>
     <jackson.databind.version>2.13.2.2</jackson.databind.version>
     <jackson.version>2.13.2</jackson.version>
     <jakarta.mail.version>1.6.7</jakarta.mail.version>

diff --git a/demo/sample-bakery/report/pom.xml b/demo/sample-bakery/report/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>citrus-sample-bakery</artifactId>
     <groupId>com.consol.citrus.samples</groupId>
-    <version>3.2.1</version>
+    <version>3.4.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/demo/sample-bakery/web/pom.xml b/demo/sample-bakery/web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>citrus-sample-bakery</artifactId>
     <groupId>com.consol.citrus.samples</groupId>
-    <version>3.2.1</version>
+    <version>3.4.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/demo/sample-bakery/worker/pom.xml b/demo/sample-bakery/worker/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>citrus-sample-bakery</artifactId>
     <groupId>com.consol.citrus.samples</groupId>
-    <version>3.2.1</version>
+    <version>3.4.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/demo/sample-bookstore/pom.xml b/demo/sample-bookstore/pom.xml
@@ -5,21 +5,21 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-bookstore</artifactId>
   <name>Citrus Samples:: Bookstore</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <packaging>war</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.ws.version>3.1.3</spring.ws.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.ws.version>3.1.5</spring.ws.version>
     <spring.webflow.js.version>2.4.8.RELEASE</spring.webflow.js.version>
     <spring.integration.version>5.5.11</spring.integration.version>
     <activemq.version>5.17.0</activemq.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
-    <jetty.version>9.4.46.v20220331</jetty.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
+    <jetty.version>9.4.50.v20221201</jetty.version>
     <saaj.version>1.5.3</saaj.version>
     <jaxb.version>2.3.6</jaxb.version>
     <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>

diff --git a/demo/sample-flightbooking/pom.xml b/demo/sample-flightbooking/pom.xml
@@ -5,21 +5,21 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-flightbooking</artifactId>
   <name>Citrus Samples:: Flightbooking</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <packaging>war</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.ws.version>3.1.3</spring.ws.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.ws.version>3.1.5</spring.ws.version>
     <spring.webflow.js.version>2.4.8.RELEASE</spring.webflow.js.version>
     <spring.integration.version>5.5.11</spring.integration.version>
     <activemq.version>5.17.0</activemq.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
-    <jetty.version>9.4.46.v20220331</jetty.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
+    <jetty.version>9.4.50.v20221201</jetty.version>
     <jackson.databind.version>2.13.2.2</jackson.databind.version>
     <jackson.version>2.13.2</jackson.version>
     <saaj.version>1.5.3</saaj.version>

diff --git a/demo/sample-greeting/pom.xml b/demo/sample-greeting/pom.xml
@@ -5,22 +5,22 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-greeting</artifactId>
   <name>Citrus Samples:: Greeting: Java</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <packaging>war</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.ws.version>3.1.3</spring.ws.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.ws.version>3.1.5</spring.ws.version>
     <spring.webflow.js.version>2.4.8.RELEASE</spring.webflow.js.version>
     <spring.integration.version>5.5.11</spring.integration.version>
     <activemq.version>5.17.0</activemq.version>
-    <xbean.spring.version>4.5</xbean.spring.version>
+    <xbean.spring.version>4.22</xbean.spring.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
-    <jetty.version>9.4.46.v20220331</jetty.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
+    <jetty.version>9.4.50.v20221201</jetty.version>
     <jackson.databind.version>2.13.2.2</jackson.databind.version>
     <jackson.version>2.13.2</jackson.version>
     <jaxb.version>2.3.6</jaxb.version>

diff --git a/demo/sample-incident/pom.xml b/demo/sample-incident/pom.xml
@@ -5,22 +5,22 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-incident</artifactId>
   <name>Citrus Samples:: Incident</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <packaging>war</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.ws.version>3.1.3</spring.ws.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.ws.version>3.1.5</spring.ws.version>
     <spring.webflow.js.version>2.4.8.RELEASE</spring.webflow.js.version>
     <spring.integration.version>5.5.11</spring.integration.version>
     <activemq.version>5.17.0</activemq.version>
     <apache.cxf.version>3.5.2</apache.cxf.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
-    <jetty.version>9.4.46.v20220331</jetty.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
+    <jetty.version>9.4.50.v20221201</jetty.version>
     <jackson.databind.version>2.13.2.2</jackson.databind.version>
     <jackson.version>2.13.2</jackson.version>
     <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>

diff --git a/demo/sample-javaee/pom.xml b/demo/sample-javaee/pom.xml
@@ -5,17 +5,17 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-javaee</artifactId>
   <name>Citrus Samples:: Java EE</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <packaging>war</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <apache.cxf.version>3.4.2</apache.cxf.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
+    <log4j2.version>2.19.0</log4j2.version>
     <testng.version>7.5</testng.version>
-    <citrus.version>3.3.0</citrus.version>
+    <citrus.version>3.4.0</citrus.version>
     <jee.api.version>8.0.0</jee.api.version>
     <junit.version>4.13.2</junit.version>
     <arquillian.version>1.6.0.Final</arquillian.version>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-samples</artifactId>
-  <version>3.3.0</version>
+  <version>3.4.0</version>
   <name>Citrus Samples:: Parent</name>
   <packaging>pom</packaging>
 

diff --git a/sample-annotation-config/pom.xml b/sample-annotation-config/pom.xml
@@ -5,16 +5,16 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-annotation-config</artifactId>
   <name>Citrus Samples:: Annotation Config</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.boot.version>2.6.7</spring.boot.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.boot.version>2.7.16</spring.boot.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
     <system.under.test.mode>embedded</system.under.test.mode>
   </properties>
 

diff --git a/sample-behaviors/pom.xml b/sample-behaviors/pom.xml
@@ -5,16 +5,16 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-behaviors</artifactId>
   <name>Citrus Samples:: Behaviors</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.boot.version>2.6.7</spring.boot.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.boot.version>2.7.16</spring.boot.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
     <system.under.test.mode>embedded</system.under.test.mode>
   </properties>
 

diff --git a/sample-binary/pom.xml b/sample-binary/pom.xml
@@ -5,15 +5,15 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-binary</artifactId>
   <name>Citrus Samples:: Binary</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
+    <spring.version>5.3.25</spring.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
     <activemq.version>5.17.0</activemq.version>
     <system.under.test.mode>embedded</system.under.test.mode>
   </properties>

diff --git a/sample-camel-context/pom.xml b/sample-camel-context/pom.xml
@@ -4,21 +4,20 @@
 
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-camel-context</artifactId>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
   <name>Citrus Samples:: Apache Camel Context</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.ws.version>3.1.3</spring.ws.version>
-    <spring.webflow.js.version>2.4.8.RELEASE</spring.webflow.js.version>
-    <apache.camel.version>3.16.0</apache.camel.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.ws.version>3.1.5</spring.ws.version>
+    <apache.camel.version>3.20.1</apache.camel.version>
     <activemq.version>5.17.0</activemq.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
-    <xbean.spring.version>4.5</xbean.spring.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
+    <xbean.spring.version>4.22</xbean.spring.version>
     <system.under.test.mode>embedded</system.under.test.mode>
   </properties>
 
@@ -90,11 +89,6 @@
       <artifactId>spring-ws-core</artifactId>
       <version>${spring.ws.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.webflow</groupId>
-      <artifactId>spring-js</artifactId>
-      <version>${spring.webflow.js.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>

diff --git a/sample-camel-context/src/test/java/com/consol/citrus/EndpointConfig.java b/sample-camel-context/src/test/java/com/consol/citrus/EndpointConfig.java
@@ -16,24 +16,27 @@
 
 package com.consol.citrus;
 
+import java.util.Collections;
+import javax.jms.ConnectionFactory;
+
 import com.consol.citrus.dsl.endpoint.CitrusEndpoints;
 import com.consol.citrus.jms.endpoint.JmsEndpoint;
 import com.consol.citrus.variable.GlobalVariables;
 import com.consol.citrus.ws.server.WebServiceServer;
 import com.consol.citrus.xml.XsdSchemaRepository;
 import com.consol.citrus.xml.namespace.NamespaceContextBuilder;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContext;
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spring.SpringCamelContext;
-import org.springframework.context.annotation.*;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.xml.xsd.SimpleXsdSchema;
 
-import javax.jms.ConnectionFactory;
-import java.util.Collections;
-
 /**
  * @author Christoph Deppisch
  */
@@ -103,9 +106,10 @@ public JmsComponent jms() {
         return component;
     }
 
-    @Bean
-    public CamelContext camelContext() throws Exception {
-        SpringCamelContext context = new SpringCamelContext();
+    @Bean(initMethod = "start", destroyMethod = "stop")
+    @DependsOn("connectionFactory")
+    public SpringCamelContext camelContext(ApplicationContext applicationContext) throws Exception {
+        SpringCamelContext context = new SpringCamelContext(applicationContext);
         context.addRouteDefinition(new RouteDefinition()
             .from("jms:queue:JMS.Queue.News")
             .to("log:com.consol.citrus.camel?level=INFO")

diff --git a/sample-dictionaries/pom.xml b/sample-dictionaries/pom.xml
@@ -5,16 +5,16 @@
   <groupId>com.consol.citrus.samples</groupId>
   <artifactId>citrus-sample-dictionaries</artifactId>
   <name>Citrus Samples:: Dictionaries</name>
-  <version>3.2.1</version>
+  <version>3.4.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.version>5.3.19</spring.version>
-    <spring.boot.version>2.6.7</spring.boot.version>
+    <spring.version>5.3.25</spring.version>
+    <spring.boot.version>2.7.16</spring.boot.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <log4j2.version>2.17.2</log4j2.version>
-    <citrus.version>3.3.0</citrus.version>
+    <log4j2.version>2.19.0</log4j2.version>
+    <citrus.version>3.4.0</citrus.version>
     <system.under.test.mode>embedded</system.under.test.mode>
   </properties>