You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/05/17 18:13:35 UTC
[cxf] 03/04: examples: update maven plugins; fix ruby sample
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2d0c4633eef82a7eb5853ad5380cb5259da0992f
Author: amarkevich <am...@talend.com>
AuthorDate: Fri May 17 16:48:00 2019 +0300
examples: update maven plugins; fix ruby sample
---
.../release/samples/groovy_spring_support/pom.xml | 12 +++------
.../main/release/samples/java_first_jaxws/pom.xml | 13 ++++------
.../samples/java_first_spring_support/pom.xml | 12 +++------
.../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +++-----
.../main/release/samples/jax_rs/big_query/pom.xml | 14 +++++------
.../main/release/samples/jax_rs/sse_cdi/pom.xml | 23 +++--------------
.../main/release/samples/jax_rs/sse_client/pom.xml | 22 +++-------------
.../main/release/samples/jax_rs/sse_osgi/pom.xml | 14 +++--------
.../main/release/samples/jax_rs/sse_spring/pom.xml | 21 ++--------------
.../main/release/samples/jax_rs/sse_tomcat/pom.xml | 21 +++-------------
distribution/src/main/release/samples/pom.xml | 29 +++++++++++++++-------
.../release/samples/ruby_spring_support/pom.xml | 13 +++-------
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 10 +++++---
.../src/main/release/samples/wsdl_first/README.txt | 2 +-
.../src/main/release/samples/wsdl_first/pom.xml | 16 ++++--------
15 files changed, 76 insertions(+), 156 deletions(-)
diff --git a/distribution/src/main/release/samples/groovy_spring_support/pom.xml b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
index 4c3bc33..8361b9c 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
@@ -28,17 +28,13 @@
<artifactId>cxf-samples</artifactId>
<version>3.3.3-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.version>${project.version}</cxf.version>
- <cxf.release.base>${basedir}/../..</cxf.release.base>
- </properties>
+
<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
<configuration>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
</configuration>
@@ -99,18 +95,18 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
diff --git a/distribution/src/main/release/samples/java_first_jaxws/pom.xml b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
index d6ce8d2..5b8d62b 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
@@ -29,15 +29,12 @@
<version>3.3.3-SNAPSHOT</version>
</parent>
<properties>
- <cxf.version>${project.version}</cxf.version>
- <cxf.release.base>${basedir}/../..</cxf.release.base>
- <tomcat.version>8.5.29</tomcat.version>
+ <cxf.tomcat.version>8.5.41</cxf.tomcat.version>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
<configuration>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
</configuration>
@@ -62,13 +59,13 @@
<artifactInstaller>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
- <version>${tomcat.version}</version>
+ <version>${cxf.tomcat.version}</version>
</artifactInstaller>
</container>
<configuration>
<type>standalone</type>
<home>
- ${project.build.directory}/apache-tomcat-${tomcat.version}
+ ${project.build.directory}/apache-tomcat-${cxf.tomcat.version}
</home>
<properties>
<cargo.servlet.port>8080</cargo.servlet.port>
@@ -149,12 +146,12 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/java_first_spring_support/pom.xml b/distribution/src/main/release/samples/java_first_spring_support/pom.xml
index 9d92009..599340f 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/java_first_spring_support/pom.xml
@@ -28,15 +28,11 @@
<artifactId>cxf-samples</artifactId>
<version>3.3.3-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.version>${project.version}</cxf.version>
- <cxf.release.base>${basedir}/../..</cxf.release.base>
- </properties>
+
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
<configuration>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
</configuration>
@@ -96,17 +92,17 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml
index 10fb991..04b1da5 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml
@@ -35,22 +35,22 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@@ -76,7 +76,6 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.14.v20181114</version>
<configuration>
<webApp>
<contextPath>/${project.build.finalName}</contextPath>
@@ -87,7 +86,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
<configuration>
<webResources>
<resource>
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/pom.xml b/distribution/src/main/release/samples/jax_rs/big_query/pom.xml
index 52f1f25..5c0f853 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/big_query/pom.xml
@@ -35,32 +35,32 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@@ -86,7 +86,6 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.14.v20181114</version>
<configuration>
<webApp>
<contextPath>/${project.build.finalName}</contextPath>
@@ -97,7 +96,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
<configuration>
<webResources>
<resource>
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 e7db477..5e26ac3 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
@@ -10,11 +10,6 @@
<version>3.3.3-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.jetty9.version>9.4.6.v20170531</cxf.jetty9.version>
- </properties>
<dependencies>
<dependency>
@@ -25,19 +20,19 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-cdi</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -121,16 +116,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
index d14899a..71f27ac 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
@@ -11,27 +11,23 @@
<relativePath>../..</relativePath>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -104,16 +100,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml
index 28c8400..b69dce3 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml
@@ -30,13 +30,7 @@
<version>3.3.3-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
- <properties>
- <cxf.version>${project.version}</cxf.version>
- <!-- TODO remove these local entries after making the referenced dependency managed in parent/pom.xml -->
- <cxf.jetty92.version>9.2.15.v20160210</cxf.jetty92.version>
- <cxf.jetty93.version>9.3.5.v20151012</cxf.jetty93.version>
- <cxf.jetty.version>${cxf.jetty93.version}</cxf.jetty.version>
- </properties>
+
<build>
<plugins>
<plugin>
@@ -68,17 +62,17 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index 2e08553..477df64 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -10,23 +10,18 @@
<version>3.3.3-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.jetty9.version>9.4.6.v20170531</cxf.jetty9.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -114,16 +109,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
index a38dbef..29201ad 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
@@ -10,10 +10,9 @@
<version>3.3.3-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
-
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.tomcat.version>8.5.37</cxf.tomcat.version>
+ <cxf.tomcat.version>8.5.41</cxf.tomcat.version>
</properties>
<dependencies>
@@ -30,13 +29,13 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -112,16 +111,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index a95d863..2c42d35 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,6 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
</properties>
<dependencies>
<dependency>
@@ -171,7 +172,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -185,7 +186,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
+ <version>4.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${cxf.jetty9.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -221,12 +232,12 @@
</pluginRepositories>
</profile>
<profile>
- <id>java9-plus</id>
- <properties>
- <cxf.jaxb.version>2.3.2</cxf.jaxb.version>
- </properties>
- <activation>
- <jdk>[9,)</jdk>
+ <id>java9-plus</id>
+ <properties>
+ <cxf.jaxb.version>2.3.2</cxf.jaxb.version>
+ </properties>
+ <activation>
+ <jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
@@ -275,7 +286,7 @@
<version>${cxf.jaxb.version}</version>
</dependency>
</dependencies>
- </profile>
+ </profile>
</profiles>
<!--
we turn off the deploy in the properties above, but deploy plugin will
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index 41c923e..9cd529a 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -28,17 +28,12 @@
<artifactId>cxf-samples</artifactId>
<version>3.3.3-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.version>${project.version}</cxf.version>
- <cxf.release.base>${basedir}/../..</cxf.release.base>
- </properties>
<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
<configuration>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
</configuration>
@@ -99,23 +94,23 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.5.5</version>
+ <version>1.7.27</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
index 7286592..05c8eeb 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -22,11 +22,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
xmlns:lang="http://www.springframework.org/schema/lang"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
+ http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd
+ ">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
- <lang:jruby id="helloworldImpl" script-source="classpath:HelloWorldImpl.rb" script-interfaces="demo.spring.service.HelloWorld" scope="prototype">
- </lang:jruby>
+ <lang:std id="helloworldImpl" engine="jruby" script-source="classpath:HelloWorldImpl.rb" script-interfaces="demo.spring.service.HelloWorld" scope="prototype">
+ </lang:std>
<simple:server id="pojoservice" serviceClass="demo.spring.service.HelloWorld" address="/HelloWorld">
<simple:serviceBean>
<ref bean="helloworldImpl"/>
diff --git a/distribution/src/main/release/samples/wsdl_first/README.txt b/distribution/src/main/release/samples/wsdl_first/README.txt
index d3fdb92..af5fca2 100644
--- a/distribution/src/main/release/samples/wsdl_first/README.txt
+++ b/distribution/src/main/release/samples/wsdl_first/README.txt
@@ -85,7 +85,7 @@ Using either UNIX or Windows:
Alteratively there is a profile available for the server when configured via spring:
- mvn -server-spring
+ mvn -Pserver-spring
If you want to run the client and server with netty transport, you can use below command to
start up the server and client:
diff --git a/distribution/src/main/release/samples/wsdl_first/pom.xml b/distribution/src/main/release/samples/wsdl_first/pom.xml
index 2a26240..5abedc4 100644
--- a/distribution/src/main/release/samples/wsdl_first/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first/pom.xml
@@ -28,18 +28,13 @@
<artifactId>cxf-samples</artifactId>
<version>3.3.3-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.version>${project.version}</cxf.version>
- <cxf.xjc-utils.version>3.2.1</cxf.xjc-utils.version>
- <cxf.release.base>${basedir}/../..</cxf.release.base>
- </properties>
+
<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
<configuration>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webResources>
@@ -249,27 +244,26 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-metrics</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>cxf-xjc-runtime</artifactId>
- <version>${cxf.xjc-utils.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>