Skip to content

Commit

Permalink
Update to v3.3.0-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophd
christophd committed May 19, 2022
1 parent e41d1fe commit a01f9a6
Show file tree
Hide file tree
Showing 80 changed files with 427 additions and 1,140 deletions.
29 changes: 10 additions & 19 deletions demo/sample-bakery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.version>5.3.16</spring.version>
<apache.camel.version>3.14.0</apache.camel.version>
<activemq.version>5.16.3</activemq.version>
<spring.version>5.3.19</spring.version>
<apache.camel.version>3.16.0</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.2.1</citrus.version>
<jetty.version>9.4.44.v20210927</jetty.version>
<jackson.version>2.12.6</jackson.version>
<citrus.version>3.3.0-SNAPSHOT</citrus.version>
<jetty.version>9.4.46.v20220331</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>
<jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
Expand Down Expand Up @@ -255,7 +257,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>${jackson.databind.version}</version>
</dependency>

<dependency>
Expand All @@ -267,7 +269,7 @@
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>
<version>1.3.1</version>
<version>${jolokia.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -430,17 +432,6 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>consol-labs-snapshots</id>
<url>http://labs.consol.de/maven/snapshots-repository/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:10080</updatePolicy>
</snapshots>
</repository>
</repositories>

<profiles>
<profile>
<id>bakery-embedded</id>
Expand Down
9 changes: 8 additions & 1 deletion ...sample-bakery/web/src/main/java/com/consol/citrus/samples/bakery/routes/BakeryRouter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,19 @@ public void configure() throws Exception {

rest("/order")
.consumes("application/json")
.post().route().unmarshal().json(JsonLibrary.Jackson).process(this).to("direct:bakery");
.post()
.to("direct:bakery-http");

from("jms:queue:bakery.order.inbound")
.routeId("bakery_jms_inbound")
.to("direct:bakery");

from("direct:bakery-http")
.unmarshal()
.json(JsonLibrary.Jackson)
.process(this)
.to("direct:bakery");

from("direct:bakery")
.routeId("bakery")
.choice()
Expand Down
41 changes: 10 additions & 31 deletions demo/sample-bookstore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.version>5.3.16</spring.version>
<spring.ws.version>3.1.2</spring.ws.version>
<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>
<spring.integration.version>5.5.9</spring.integration.version>
<activemq.version>5.16.3</activemq.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.2.1</citrus.version>
<jetty.version>9.4.44.v20210927</jetty.version>
<citrus.version>3.3.0-SNAPSHOT</citrus.version>
<jetty.version>9.4.46.v20220331</jetty.version>
<saaj.version>1.5.3</saaj.version>
<jaxb.version>2.3.5</jaxb.version>
<jaxb.version>2.3.6</jaxb.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
<jakarta.xml.soap-api.version>1.4.2</jakarta.xml.soap-api.version>
<xerces.version>2.12.2</xerces.version>
<server.port>18001</server.port>
<server.stop.port>18100</server.stop.port>
<system.under.test.mode>embedded</system.under.test.mode>
Expand Down Expand Up @@ -149,7 +150,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.1</version>
<version>${xerces.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -227,7 +228,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.1</version>
<version>${xerces.version}</version>
</dependency>

<!-- Logging -->
Expand Down Expand Up @@ -261,17 +262,6 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
Expand Down Expand Up @@ -341,17 +331,6 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>consol-labs-snapshots</id>
<url>http://labs.consol.de/maven/snapshots-repository/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:10080</updatePolicy>
</snapshots>
</repository>
</repositories>

<profiles>
<profile>
<id>bookstore-embedded</id>
Expand Down
2 changes: 1 addition & 1 deletion demo/sample-bookstore/src/test/java/com/consol/citrus/samples/bookstore/AddBook_Ok_2_IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
import com.consol.citrus.testng.spring.TestNGCitrusSpringSupport;
import com.consol.citrus.validation.xml.XmlMarshallingValidationProcessor;
import com.consol.citrus.ws.client.WebServiceClient;
import com.consol.citrus.xml.Marshaller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.oxm.Marshaller;
import org.springframework.util.Assert;
import org.testng.annotations.Test;

Expand Down
23 changes: 13 additions & 10 deletions ...ple-bookstore/src/test/java/com/consol/citrus/samples/bookstore/CitrusEndpointConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,31 @@

package com.consol.citrus.samples.bookstore;

import java.util.Collections;
import java.util.List;

import com.consol.citrus.dsl.endpoint.CitrusEndpoints;
import com.consol.citrus.report.MessageTracingTestListener;
import com.consol.citrus.variable.GlobalVariables;
import com.consol.citrus.ws.client.WebServiceClient;
import com.consol.citrus.ws.interceptor.LoggingClientInterceptor;
import com.consol.citrus.ws.validation.*;
import com.consol.citrus.ws.validation.SimpleSoapAttachmentValidator;
import com.consol.citrus.ws.validation.SimpleSoapFaultValidator;
import com.consol.citrus.ws.validation.SoapAttachmentValidator;
import com.consol.citrus.ws.validation.SoapFaultValidator;
import com.consol.citrus.xml.Jaxb2Marshaller;
import com.consol.citrus.xml.Marshaller;
import com.consol.citrus.xml.XsdSchemaRepository;
import com.consol.citrus.xml.namespace.NamespaceContextBuilder;
import org.springframework.context.annotation.*;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.oxm.Marshaller;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
import org.springframework.ws.client.support.interceptor.ClientInterceptor;
import org.springframework.ws.soap.SoapMessageFactory;
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
import org.springframework.xml.xsd.SimpleXsdSchema;

import java.util.Collections;
import java.util.List;

/**
* @author Christoph Deppisch
*/
Expand Down Expand Up @@ -105,8 +110,6 @@ public WebServiceClient bookStoreClient() {

@Bean
public Marshaller jax2bMarshaller() {
Jaxb2Marshaller jaxb2Marshaller = new Jaxb2Marshaller();
jaxb2Marshaller.setContextPath("com.consol.citrus.samples.bookstore.model");
return jaxb2Marshaller;
return new Jaxb2Marshaller("com.consol.citrus.samples.bookstore.model");
}
}
49 changes: 17 additions & 32 deletions demo/sample-flightbooking/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,22 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.version>5.3.16</spring.version>
<spring.ws.version>3.1.2</spring.ws.version>
<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>
<spring.integration.version>5.5.9</spring.integration.version>
<activemq.version>5.16.3</activemq.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.2.1</citrus.version>
<jetty.version>9.4.44.v20210927</jetty.version>
<jackson.version>2.12.6</jackson.version>
<citrus.version>3.3.0-SNAPSHOT</citrus.version>
<jetty.version>9.4.46.v20220331</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>
<jaxb.version>2.3.5</jaxb.version>
<jaxb.version>2.3.6</jaxb.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
<jakarta.xml.soap-api.version>1.4.2</jakarta.xml.soap-api.version>
<xerces.version>2.12.2</xerces.version>
<server.port>18001</server.port>
<server.stop.port>18100</server.stop.port>
<system.under.test.mode>embedded</system.under.test.mode>
Expand Down Expand Up @@ -165,7 +167,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.1</version>
<version>${xerces.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -281,9 +283,14 @@

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>

<!-- Logging -->
<dependency>
Expand Down Expand Up @@ -316,17 +323,6 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
Expand Down Expand Up @@ -396,17 +392,6 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>consol-labs-snapshots</id>
<url>http://labs.consol.de/maven/snapshots-repository/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>interval:10080</updatePolicy>
</snapshots>
</repository>
</repositories>

<profiles>
<profile>
<id>flightbooking-embedded</id>
Expand Down
Loading

0 comments on commit a01f9a6

Please sign in to comment.