You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/30 21:39:41 UTC
svn commit: r1163353 - in /cxf/branches/2.4.x-fixes: ./ common/common/
parent/ rt/bindings/soap/ rt/frontend/jaxws/ rt/ws/security/
systests/databinding/ systests/jaxrs/ systests/jaxws/
systests/transport-jms/ systests/transports/ systests/uncategorized/
Author: dkulp
Date: Tue Aug 30 19:39:41 2011
New Revision: 1163353
URL: http://svn.apache.org/viewvc?rev=1163353&view=rev
Log:
Merged revisions 1163350 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1163350 | dkulp | 2011-08-30 15:36:52 -0400 (Tue, 30 Aug 2011) | 2 lines
[CXF-3189] Remove IBM profiles wherever they are not needed.
Only bring in jaxp-ri for IBM JDK v 5.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/pom.xml
cxf/branches/2.4.x-fixes/parent/pom.xml
cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml
cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml
cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml
cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml
cxf/branches/2.4.x-fixes/systests/transports/pom.xml
cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/common/common/pom.xml Tue Aug 30 19:39:41 2011
@@ -129,22 +129,6 @@
<profiles>
<profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk15</id>
<activation>
<jdk>1.5</jdk>
@@ -180,6 +164,7 @@
<dependency>
<groupId>${cxf.saaj.impl.groupId}</groupId>
<artifactId>${cxf.saaj.impl.artifactId}</artifactId>
+ <version>${cxf.saaj.impl.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -187,7 +172,12 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>${extra.saaj.dep.groupId}</groupId>
+ <artifactId>${extra.saaj.dep.artifactId}</artifactId>
+ <version>${extra.saaj.dep.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Aug 30 19:39:41 2011
@@ -48,6 +48,11 @@
<cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId>
<cxf.saaj.impl.version>1.3.12</cxf.saaj.impl.version>
+ <extra.saaj.dep.groupId>${cxf.saaj.impl.groupId}</extra.saaj.dep.groupId>
+ <extra.saaj.dep.artifactId>${cxf.saaj.impl.artifactId}</extra.saaj.dep.artifactId>
+ <extra.saaj.dep.version>${cxf.saaj.impl.version}</extra.saaj.dep.version>
+
+
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.2</cxf.abdera.version>
<cxf.activemq.version>5.4.2</cxf.activemq.version>
@@ -1616,6 +1621,11 @@
<artifactId>xalan</artifactId>
</dependency>
</dependencies>
+ <properties>
+ <extra.saaj.dep.groupId>com.sun.xml.parsers</extra.saaj.dep.groupId>
+ <extra.saaj.dep.artifactId>jaxp-ri</extra.saaj.dep.artifactId>
+ <extra.saaj.dep.version>1.4.2</extra.saaj.dep.version>
+ </properties>
<build>
<plugins>
<plugin>
Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml Tue Aug 30 19:39:41 2011
@@ -116,22 +116,6 @@
<profiles>
<profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk15</id>
<activation>
<jdk>1.5</jdk>
@@ -155,6 +139,13 @@
<dependency>
<groupId>${cxf.saaj.impl.groupId}</groupId>
<artifactId>${cxf.saaj.impl.artifactId}</artifactId>
+ <version>${cxf.saaj.impl.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${extra.saaj.dep.groupId}</groupId>
+ <artifactId>${extra.saaj.dep.artifactId}</artifactId>
+ <version>${extra.saaj.dep.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml Tue Aug 30 19:39:41 2011
@@ -280,21 +280,6 @@
</build>
</profile>
<profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk17</id>
<activation>
<jdk>1.7</jdk>
@@ -385,6 +370,12 @@
<dependency>
<groupId>${cxf.saaj.impl.groupId}</groupId>
<artifactId>${cxf.saaj.impl.artifactId}</artifactId>
+ <version>${cxf.saaj.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${extra.saaj.dep.groupId}</groupId>
+ <artifactId>${extra.saaj.dep.artifactId}</artifactId>
+ <version>${extra.saaj.dep.version}</version>
</dependency>
</dependencies>
<build>
Modified: cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml Tue Aug 30 19:39:41 2011
@@ -187,22 +187,6 @@
<profiles>
<profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk15</id>
<activation>
<jdk>1.5</jdk>
@@ -215,6 +199,13 @@
<dependency>
<groupId>${cxf.saaj.impl.groupId}</groupId>
<artifactId>${cxf.saaj.impl.artifactId}</artifactId>
+ <version>${cxf.saaj.impl.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${extra.saaj.dep.groupId}</groupId>
+ <artifactId>${extra.saaj.dep.artifactId}</artifactId>
+ <version>${extra.saaj.dep.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/databinding/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/databinding/pom.xml Tue Aug 30 19:39:41 2011
@@ -182,22 +182,7 @@
<doc.lit.bare.binding.file>none</doc.lit.bare.binding.file>
</properties>
</profile>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
+
</profiles>
<dependencies>
<dependency>
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml Tue Aug 30 19:39:41 2011
@@ -360,24 +360,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
</project>
Modified: cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml Tue Aug 30 19:39:41 2011
@@ -65,24 +65,7 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+
<dependencies>
<dependency>
<groupId>xerces</groupId>
Modified: cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml Tue Aug 30 19:39:41 2011
@@ -88,24 +88,7 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+
<dependencies>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
Modified: cxf/branches/2.4.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/transports/pom.xml Tue Aug 30 19:39:41 2011
@@ -64,24 +64,7 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+
<dependencies>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml?rev=1163353&r1=1163352&r2=1163353&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml Tue Aug 30 19:39:41 2011
@@ -97,24 +97,7 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+
<dependencies>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>