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 <[email protected]> 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>
