Author: dkulp
Date: Fri Jan 20 15:10:00 2012
New Revision: 1233942
URL: http://svn.apache.org/viewvc?rev=1233942&view=rev
Log:
Merged revisions 1233940 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1233940 | dkulp | 2012-01-20 10:05:02 -0500 (Fri, 20 Jan 2012) | 1 line
Update some poms so the versions will resolve after a release
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1233942&r1=1233941&r2=1233942&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
Fri Jan 20 15:10:00 2012
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.5.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml?rev=1233942&r1=1233941&r2=1233942&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
Fri Jan 20 15:10:00 2012
@@ -23,12 +23,12 @@
<artifactId>jax_rs_minimal_osgi</artifactId>
<name>JAX-RS Minimal OSGI Demo</name>
<description>JAX-RS Minimal OSGI Demo</description>
- <version>2.5.2-SNAPSHOT</version>
+ <version>2.5.3-SNAPSHOT</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.5.2-SNAPSHOT</version>
+ <version>2.5.3-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml?rev=1233942&r1=1233941&r2=1233942&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
Fri Jan 20 15:10:00 2012
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml?rev=1233942&r1=1233941&r2=1233942&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
Fri Jan 20 15:10:00 2012
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1233942&r1=1233941&r2=1233942&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml Fri
Jan 20 15:10:00 2012
@@ -48,6 +48,7 @@
<module>jax_rs/content_negotiation</module>
<module>jax_rs/basic_https</module>
<module>jax_rs/basic</module>
+ <module>jax_rs/minimal_osgi</module>
<module>callback</module>
<module>wsdl_first_pure_xml</module>
<module>jaxws_dispatch_provider</module>
@@ -91,6 +92,8 @@
<module>ws_notification</module>
<module>sts</module>
+ <module>oauth/server</module>
+ <module>oauth/client</module>
<!--
these are a bit fragile as they need to go off to external sites to
get stuff like
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=1233942&r1=1233941&r2=1233942&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml
Fri Jan 20 15:10:00 2012
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.5.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
