Author: dkulp
Date: Fri Jun 1 15:43:00 2012
New Revision: 1345250
URL: http://svn.apache.org/viewvc?rev=1345250&view=rev
Log:
Merged revisions 1345246 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1345246 | dkulp | 2012-06-01 11:36:17 -0400 (Fri, 01 Jun 2012) | 2 lines
Add jax_rs/minimal to build so release:prepare would handle it
........
Modified:
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/pom.xml
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=1345250&r1=1345249&r2=1345250&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 Jun 1 15:43: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.3-SNAPSHOT</version>
+ <version>2.5.4-SNAPSHOT</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.5.3-SNAPSHOT</version>
+ <version>2.5.4-SNAPSHOT</version>
<relativePath>../..</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=1345250&r1=1345249&r2=1345250&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
Jun 1 15:43:00 2012
@@ -97,6 +97,8 @@
<module>oauth/server</module>
<module>oauth/client</module>
+ <module>jax_rs/minimal_osgi</module>
+
<!--
these are a bit fragile as they need to go off to external sites to
get stuff like
wsdl's and certs and such
