Author: dkulp
Date: Mon Mar 25 20:38:34 2013
New Revision: 1460884
URL: http://svn.apache.org/r1460884
Log:
Merged revisions 1460880 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1460880 | dkulp | 2013-03-25 16:36:52 -0400 (Mon, 25 Mar 2013) | 2 lines
Fix java5 builds
........
Modified:
cxf/branches/2.5.x-fixes/api/pom.xml
cxf/branches/2.5.x-fixes/rt/databinding/jibx/pom.xml
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/pom.xml
cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml
cxf/branches/2.5.x-fixes/tools/validator/pom.xml
cxf/branches/2.5.x-fixes/tools/wsdlto/core/pom.xml
cxf/branches/2.5.x-fixes/tools/wsdlto/misc/pom.xml
Modified: cxf/branches/2.5.x-fixes/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/api/pom.xml Mon Mar 25 20:38:34 2013
@@ -233,10 +233,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
- <dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- </dependency>
</dependencies>
</profile>
</profiles>
Modified: cxf/branches/2.5.x-fixes/rt/databinding/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jibx/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/jibx/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/jibx/pom.xml Mon Mar 25 20:38:34
2013
@@ -111,10 +111,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
- <dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- </dependency>
</dependencies>
</profile>
</profiles>
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/pom.xml Mon Mar 25 20:38:34 2013
@@ -353,10 +353,6 @@
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- </dependency>
- <dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</dependency>
Modified: cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/javato/ws/pom.xml Mon Mar 25 20:38:34 2013
@@ -221,11 +221,6 @@
<artifactId>saaj-api</artifactId>
</dependency>
<dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
Modified: cxf/branches/2.5.x-fixes/tools/validator/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/validator/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/validator/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/validator/pom.xml Mon Mar 25 20:38:34 2013
@@ -101,11 +101,6 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</dependency>
Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/core/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/core/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/core/pom.xml Mon Mar 25 20:38:34 2013
@@ -132,11 +132,6 @@
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</dependency>
- <dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</profile>
</profiles>
Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/misc/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/misc/pom.xml?rev=1460884&r1=1460883&r2=1460884&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/misc/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/misc/pom.xml Mon Mar 25 20:38:34 2013
@@ -113,11 +113,6 @@
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</dependency>
- <dependency>
- <groupId>${cxf.stax.impl.groupId}</groupId>
- <artifactId>${cxf.stax.impl.artifactId}</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</profile>
</profiles>
