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 2012/03/16 20:16:28 UTC
svn commit: r1301711 - in /cxf/trunk: api/ distribution/
distribution/manifest/ integration/jca/ parent/ rt/bindings/corba/
rt/databinding/jaxb/ rt/frontend/jaxws/ systests/transport-jms/
systests/transports/ systests/uncategorized/ systests/ws-securit...
Author: dkulp
Date: Fri Mar 16 19:16:27 2012
New Revision: 1301711
URL: http://svn.apache.org/viewvc?rev=1301711&view=rev
Log:
Downgrade to 3.3.1 of ASM as code compiled with ASM 4.0 is NOT
compatible with 3.3.1 and is causing some strange conflicts that need
more investigation
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/distribution/manifest/pom.xml
cxf/trunk/distribution/pom.xml
cxf/trunk/integration/jca/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/corba/pom.xml
cxf/trunk/rt/databinding/jaxb/pom.xml
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/systests/transport-jms/pom.xml
cxf/trunk/systests/transports/pom.xml
cxf/trunk/systests/uncategorized/pom.xml
cxf/trunk/systests/ws-security-examples/pom.xml
cxf/trunk/systests/ws-security/pom.xml
cxf/trunk/systests/ws-specs/pom.xml
cxf/trunk/tools/common/pom.xml
cxf/trunk/tools/javato/ws/pom.xml
cxf/trunk/tools/validator/pom.xml
cxf/trunk/tools/wsdlto/core/pom.xml
cxf/trunk/tools/wsdlto/misc/pom.xml
Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Fri Mar 16 19:16:27 2012
@@ -68,7 +68,7 @@
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<optional>true</optional>
</dependency>
Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Fri Mar 16 19:16:27 2012
@@ -292,7 +292,7 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Fri Mar 16 19:16:27 2012
@@ -344,7 +344,7 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/integration/jca/pom.xml (original)
+++ cxf/trunk/integration/jca/pom.xml Fri Mar 16 19:16:27 2012
@@ -46,7 +46,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Mar 16 19:16:27 2012
@@ -63,7 +63,7 @@
</cxf.osgi.export>
<cxf.osgi.dynamic.import />
<cxf.osgi.spring.version>[2.5,4)</cxf.osgi.spring.version>
- <cxf.osgi.asm.version>[2.0,5)</cxf.osgi.asm.version>
+ <cxf.osgi.asm.version>[2.0,4)</cxf.osgi.asm.version>
<cxf.osgi.commons.lang.version>[2.4,3)</cxf.osgi.commons.lang.version>
<cxf.osgi.slf4j.version>[1.5,2)</cxf.osgi.slf4j.version>
<cxf.osgi.javax.annotation.version>[0.0,2)</cxf.osgi.javax.annotation.version>
@@ -1142,9 +1142,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>4.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
Modified: cxf/trunk/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/pom.xml (original)
+++ cxf/trunk/rt/bindings/corba/pom.xml Fri Mar 16 19:16:27 2012
@@ -34,6 +34,9 @@
<properties>
<cxf.checkstyle.extension>-corba</cxf.checkstyle.extension>
+ <cxf.osgi.import>
+ org.objectweb.asm*;version="${cxf.osgi.asm.version}",
+ </cxf.osgi.import>
</properties>
<dependencies>
@@ -44,6 +47,10 @@
</dependency>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Fri Mar 16 19:16:27 2012
@@ -120,7 +120,7 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<optional>true</optional>
</dependency>
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri Mar 16 19:16:27 2012
@@ -37,6 +37,7 @@
<cxf.spi-dir>spi-2.1</cxf.spi-dir>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
</cxf.osgi.import>
</properties>
<dependencies>
@@ -71,7 +72,7 @@
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/pom.xml (original)
+++ cxf/trunk/systests/transport-jms/pom.xml Fri Mar 16 19:16:27 2012
@@ -251,7 +251,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/systests/transports/pom.xml (original)
+++ cxf/trunk/systests/transports/pom.xml Fri Mar 16 19:16:27 2012
@@ -227,7 +227,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Fri Mar 16 19:16:27 2012
@@ -261,7 +261,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/pom.xml (original)
+++ cxf/trunk/systests/ws-security-examples/pom.xml Fri Mar 16 19:16:27 2012
@@ -176,7 +176,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
Modified: cxf/trunk/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/pom.xml (original)
+++ cxf/trunk/systests/ws-security/pom.xml Fri Mar 16 19:16:27 2012
@@ -161,7 +161,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
Modified: cxf/trunk/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/pom.xml (original)
+++ cxf/trunk/systests/ws-specs/pom.xml Fri Mar 16 19:16:27 2012
@@ -156,7 +156,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
Modified: cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Fri Mar 16 19:16:27 2012
@@ -41,7 +41,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/pom.xml (original)
+++ cxf/trunk/tools/javato/ws/pom.xml Fri Mar 16 19:16:27 2012
@@ -93,7 +93,7 @@
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/tools/validator/pom.xml (original)
+++ cxf/trunk/tools/validator/pom.xml Fri Mar 16 19:16:27 2012
@@ -45,7 +45,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Fri Mar 16 19:16:27 2012
@@ -63,7 +63,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/tools/wsdlto/misc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/pom.xml?rev=1301711&r1=1301710&r2=1301711&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/misc/pom.xml Fri Mar 16 19:16:27 2012
@@ -40,7 +40,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>