Author: alessio.soldano(a)jboss.com Date: 2011-10-25 05:57:17 -0400 (Tue, 25 Oct 2011) New Revision: 15158 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/pom.xml Log: [JBWX-3374] Move to cxf-xjc utils 2.4.0 and remove dependency on cxf-xjc-bug671 Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/client/pom.xml 2011-10-25 09:57:17 UTC (rev 15158) @@ -103,10 +103,6 @@ </dependency> <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-bug671</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> <artifactId>cxf-xjc-dv</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin =================================================================== --- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-10-25 09:57:17 UTC (rev 15158) @@ -1,4 +1,3 @@ com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin -com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-10-25 09:57:17 UTC (rev 15158) @@ -37,7 +37,6 @@ rem CXF XJC patched plugins set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-bug671.jar rem shared jaxws libs set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-10-25 09:57:17 UTC (rev 15158) @@ -88,7 +88,6 @@ # CXF XJC patched plugins WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar" # shared jaxws libs WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-10-25 09:57:17 UTC (rev 15158) @@ -35,7 +35,6 @@ rem CXF XJC patched plugins set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-bug671.jar rem shared jaxws libs set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-10-25 09:57:17 UTC (rev 15158) @@ -89,7 +89,6 @@ # CXF XJC patched plugins WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar" # shared jaxws libs WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar" Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/modules/server/pom.xml 2011-10-25 09:57:17 UTC (rev 15158) @@ -115,10 +115,6 @@ </dependency> <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-bug671</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> <artifactId>cxf-xjc-dv</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-10-21 09:50:16 UTC (rev 15157) +++ stack/cxf/trunk/pom.xml 2011-10-25 09:57:17 UTC (rev 15158) @@ -57,7 +57,7 @@ <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.4-SNAPSHOT</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> - <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version> + <cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.0.0.Beta5</jboss.logging.version> @@ -803,45 +803,6 @@ </dependency> <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> - <artifactId>cxf-xjc-bug671</artifactId> - <version>${cxf.xjcplugins.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.cxf.xjcplugins</groupId> <artifactId>cxf-xjc-dv</artifactId> <version>${cxf.xjcplugins.version}</version> <exclusions>