You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/06/06 10:24:18 UTC
[cxf] branch master updated (93a6a50 -> 67472c5)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 93a6a50 Squashed commit of the following: Closes #561
new 4dfe29c Update some plugin versions in maven-plugins
new 9c55315 Merge branch 'master' of github.com:apache/cxf
new 67472c5 More work on version consistency in the samples
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/release/samples/jax_rs/basic_https/pom.xml | 5 +----
.../release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +-
.../release/samples/jax_rs/description_swagger2_web/pom.xml | 2 +-
distribution/src/main/release/samples/jax_rs/odata/pom.xml | 10 +++++-----
distribution/src/main/release/samples/jax_rs/search/pom.xml | 4 ++--
distribution/src/main/release/samples/jax_rs/spark/pom.xml | 4 ++--
.../src/main/release/samples/jax_rs/spring_security/pom.xml | 2 +-
distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml | 4 ++--
.../src/main/release/samples/jax_rs/tracing_brave/pom.xml | 9 +++++----
.../release/samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/websocket_web/pom.xml | 3 +--
distribution/src/main/release/samples/oauth/client/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 2 ++
distribution/src/main/release/samples/ws_eventing/pom.xml | 2 +-
maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml | 2 +-
maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +-
maven-plugins/codegen-plugin/pom.xml | 2 +-
maven-plugins/wadl2java-plugin/pom.xml | 2 +-
parent/pom.xml | 1 +
21 files changed, 33 insertions(+), 33 deletions(-)
[cxf] 02/03: Merge branch 'master' of github.com:apache/cxf
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9c553151f94f2589ec759ff29f83a53b16a53f3f
Merge: 4dfe29c 93a6a50
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jun 6 09:13:50 2019 +0100
Merge branch 'master' of github.com:apache/cxf
.../databinding/stax/StaxDataBindingFeature.java | 40 +-
.../org/apache/cxf/feature/AbstractFeature.java | 46 +-
...ctFeature.java => AbstractPortableFeature.java} | 38 +-
.../org/apache/cxf/feature/DelegatingFeature.java | 70 ++
.../org/apache/cxf/feature/FastInfosetFeature.java | 110 +--
.../org/apache/cxf/feature/LoggingFeature.java | 190 ++--
.../apache/cxf/feature/StaxTransformFeature.java | 106 ++-
.../apache/cxf/feature/transform/XSLTFeature.java | 52 +-
.../validation/SchemaValidationFeature.java | 45 +-
.../security/JAASAuthenticationFeature.java | 52 +-
.../cxf/transport/common/gzip/GZIPFeature.java | 131 +--
.../cxf/validation/BeanValidationFeature.java | 44 +-
.../validation/ClientBeanValidationFeature.java | 47 +-
.../cxf/tracing/brave/BraveClientFeature.java | 48 +-
.../org/apache/cxf/tracing/brave/BraveFeature.java | 77 +-
.../opentracing/OpenTracingClientFeature.java | 30 +-
.../tracing/opentracing/OpenTracingFeature.java | 42 +-
.../cxf/binding/coloc/feature/ColocFeature.java | 31 +-
.../org/apache/cxf/clustering/FailoverFeature.java | 124 ++-
.../cxf/clustering/LoadDistributorFeature.java | 19 +-
.../CircuitBreakerFailoverFeature.java | 91 +-
.../org/apache/cxf/ext/logging/LoggingFeature.java | 220 +++--
.../org/apache/cxf/metrics/MetricsFeature.java | 163 ++--
.../apache/cxf/throttling/ThrottlingFeature.java | 45 +-
.../validation/JAXRSBeanValidationFeature.java | 53 +-
.../cxf/javascript/JavascriptOptionsFeature.java | 48 +-
.../interceptor/ResponseTimeFeature.java | 35 +-
.../JAXRSClientBeanValidationFeature.java | 24 +-
.../apache/cxf/jaxrs/openapi/OpenApiFeature.java | 994 +++++++++++++--------
.../cxf/jaxrs/swagger/AbstractSwaggerFeature.java | 305 +++++--
.../apache/cxf/jaxrs/swagger/Swagger2Feature.java | 779 +++++++++-------
.../java/org/apache/cxf/jaxrs/sse/SseFeature.java | 28 +-
.../cxf/transport/http/HttpConduitFeature.java | 32 +-
.../cxf/transport/http/HttpDestinationFeature.java | 33 +-
.../transport/https/CertConstraintsFeature.java | 96 +-
.../transport/jms/ConnectionFactoryFeature.java | 66 +-
.../apache/cxf/transport/jms/JMSConfigFeature.java | 79 +-
.../org/apache/cxf/systest/jaeger/TestSender.java | 10 +
.../opentracing/OpenTracingTracingTest.java | 27 +-
.../ValidationClientServerTest.java | 12 +-
40 files changed, 2851 insertions(+), 1631 deletions(-)
[cxf] 01/03: Update some plugin versions in maven-plugins
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4dfe29cf59f2f0241d2515c63e86daeb7e2e853f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 5 17:34:33 2019 +0100
Update some plugin versions in maven-plugins
---
maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +-
.../cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml | 2 +-
maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml | 2 +-
maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +-
maven-plugins/codegen-plugin/pom.xml | 2 +-
maven-plugins/wadl2java-plugin/pom.xml | 2 +-
parent/pom.xml | 1 +
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
index c1a6d94..23926b3 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
index 747ae0f..32e4965 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.22.2</version>
<executions>
<execution>
<id>integration-test</id>
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
index 221f4e4..24469b8 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
@@ -49,7 +49,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
index 5ae0583..ac11142 100644
--- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index af6c70b..9745e29 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.1.0</version>
+ <version>${cxf.plexus-archiver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 7f717a5..8ef8b8d 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.1.0</version>
+ <version>${cxf.plexus-archiver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index d8104ef..3dcc4b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -173,6 +173,7 @@
<cxf.opensaml.osgi.version>3.3.0_2</cxf.opensaml.osgi.version>
<cxf.opensaml.version>3.3.0</cxf.opensaml.version>
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
+ <cxf.plexus-archiver.version>4.1.0</cxf.plexus-archiver.version>
<cxf.plexus-utils.version>3.2.0</cxf.plexus-utils.version>
<cxf.reactivestreams.version>1.0.1</cxf.reactivestreams.version>
<cxf.reactor.version>3.2.9.RELEASE</cxf.reactor.version>
[cxf] 03/03: More work on version consistency in the samples
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 67472c5a991966b35382bb68fda98f2238bc68a5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jun 6 11:23:49 2019 +0100
More work on version consistency in the samples
---
.../src/main/release/samples/jax_rs/basic_https/pom.xml | 5 +----
.../release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +-
.../release/samples/jax_rs/description_swagger2_web/pom.xml | 2 +-
distribution/src/main/release/samples/jax_rs/odata/pom.xml | 10 +++++-----
distribution/src/main/release/samples/jax_rs/search/pom.xml | 4 ++--
distribution/src/main/release/samples/jax_rs/spark/pom.xml | 4 ++--
.../src/main/release/samples/jax_rs/spring_security/pom.xml | 2 +-
distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml | 4 ++--
.../src/main/release/samples/jax_rs/tracing_brave/pom.xml | 9 +++++----
.../release/samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/websocket_web/pom.xml | 3 +--
distribution/src/main/release/samples/oauth/client/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 2 ++
distribution/src/main/release/samples/ws_eventing/pom.xml | 2 +-
14 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
index f12562d..f88ab03 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
@@ -28,9 +28,6 @@
<version>3.3.3-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
- <properties>
- <httpclient.version>4.5.3</httpclient.version>
- </properties>
<profiles>
<profile>
<id>server</id>
@@ -98,7 +95,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
+ <version>${cxf.httpcomponents.client.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
index ea633ac..1826f81 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
@@ -39,7 +39,7 @@ under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.14.v20181114</version>
+ <version>${cxf.jetty9.version}</version>
<configuration>
<webApp>
<contextPath>/</contextPath>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index edfc0bb..d8e9ab1 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -39,7 +39,7 @@ under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.14.v20181114</version>
+ <version>${cxf.jetty9.version}</version>
<configuration>
<webApp>
<contextPath>/</contextPath>
diff --git a/distribution/src/main/release/samples/jax_rs/odata/pom.xml b/distribution/src/main/release/samples/jax_rs/odata/pom.xml
index 240f910..c5b913e 100644
--- a/distribution/src/main/release/samples/jax_rs/odata/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/odata/pom.xml
@@ -29,7 +29,7 @@
<relativePath>../..</relativePath>
</parent>
<properties>
- <olingo.version>4.5.3</olingo.version>
+ <olingo.version>4.6.0</olingo.version>
</properties>
<profiles>
<profile>
@@ -70,22 +70,22 @@
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-commons-api</artifactId>
- <version>4.4.0</version>
+ <version>${olingo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-commons-core</artifactId>
- <version>4.4.0</version>
+ <version>${olingo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-api</artifactId>
- <version>4.4.0</version>
+ <version>${olingo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-core</artifactId>
- <version>4.4.0</version>
+ <version>${olingo.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml
index 9b0beff..ebd80be 100644
--- a/distribution/src/main/release/samples/jax_rs/search/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.16</version>
+ <version>${cxf.tika.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.5.3</version>
+ <version>${cxf.httpcomponents.client.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/spark/pom.xml b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
index e3395ad..39dc527 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
@@ -65,12 +65,12 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.11</artifactId>
- <version>2.9.7</version>
+ <version>2.9.9</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.16</version>
+ <version>${cxf.tika.version}</version>
</dependency>
</dependencies>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
index d0adcb8..f826aa8 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
@@ -32,7 +32,7 @@
<properties>
<cxf.version>${project.version}</cxf.version>
<aspectj.version>1.9.1</aspectj.version>
- <spring.security.version>5.0.3.RELEASE</spring.security.version>
+ <spring.security.version>5.1.5.RELEASE</spring.security.version>
</properties>
<build>
<finalName>JAXRSSpringSecurity</finalName>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
index 5e26ac3..8634cfd 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
@@ -48,13 +48,13 @@
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
- <version>2.4.0.Final</version>
+ <version>2.4.8.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>2.4.0.Final</version>
+ <version>2.4.8.Final</version>
</dependency>
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
index 93bcdc4..ac44c8e 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
@@ -30,6 +30,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <cxf.brave.version>5.4.2</cxf.brave.version>
</properties>
<profiles>
<profile>
@@ -199,22 +200,22 @@
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-context-slf4j</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-httpclient</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-httpasyncclient</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-okhttp3</artifactId>
- <version>5.4.2</version>
+ <version>${cxf.brave.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
index b4df1d6..6212ed5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
@@ -31,7 +31,7 @@
<properties>
<cxf.version>${project.version}</cxf.version>
- <cxf.camel.version>2.22.0</cxf.camel.version>
+ <cxf.camel.version>2.24.0</cxf.camel.version>
</properties>
<profiles>
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 992e4b4..8fe5b93 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -31,7 +31,6 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <cxf.jetty.version>9.4.14.v20181114</cxf.jetty.version>
<cxf.tomcat.version>7.0.92</cxf.tomcat.version>
</properties>
<build>
@@ -39,7 +38,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${cxf.jetty.version}</version>
+ <version>${cxf.jetty9.version}</version>
<configuration>
<webAppSourceDirectory>${project.build.directory}/${project.name}</webAppSourceDirectory>
<scanIntervalSeconds>1</scanIntervalSeconds>
diff --git a/distribution/src/main/release/samples/oauth/client/pom.xml b/distribution/src/main/release/samples/oauth/client/pom.xml
index ee823ae..549fd74 100644
--- a/distribution/src/main/release/samples/oauth/client/pom.xml
+++ b/distribution/src/main/release/samples/oauth/client/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index e215c0c..2362276 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,6 +33,8 @@
<spring.boot.version>2.1.3.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.18.v20190429</cxf.jetty9.version>
+ <cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
+ <cxf.tika.version>1.21</cxf.tika.version>
</properties>
<dependencies>
<dependency>
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 574cbcc..9684a4c 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>