You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ej...@apache.org on 2012/01/27 20:00:37 UTC
svn commit: r1236827 - in /aries/trunk: ejb/openejb-extender-itest/
ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/
jmx/jmx-itests/
jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/
jndi/jndi-url-it...
Author: ejiang
Date: Fri Jan 27 19:00:36 2012
New Revision: 1236827
URL: http://svn.apache.org/viewvc?rev=1236827&view=rev
Log:
ARIES-817: Upgrade to ASM4
Modified:
aries/trunk/ejb/openejb-extender-itest/pom.xml
aries/trunk/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
aries/trunk/jndi/jndi-url-itest/pom.xml
aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
aries/trunk/jpa/jpa-container-itest/pom.xml
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
aries/trunk/proxy/proxy-bundle/pom.xml
Modified: aries/trunk/ejb/openejb-extender-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender-itest/pom.xml?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender-itest/pom.xml (original)
+++ aries/trunk/ejb/openejb-extender-itest/pom.xml Fri Jan 27 19:00:36 2012
@@ -94,13 +94,13 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java (original)
+++ aries/trunk/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java Fri Jan 27 19:00:36 2012
@@ -42,7 +42,7 @@ public abstract class AbstractOpenEJBTes
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager"),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Fri Jan 27 19:00:36 2012
@@ -86,13 +86,13 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java Fri Jan 27 19:00:36 2012
@@ -62,7 +62,7 @@ public class BlueprintMBeanTest extends
mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Fri Jan 27 19:00:36 2012
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -165,10 +165,10 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<scope>test</scope>
- <version>3.2</version>
+ <version>4.0</version>
</dependency>
<dependency>
Modified: aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java (original)
+++ aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java Fri Jan 27 19:00:36 2012
@@ -151,7 +151,7 @@ public class JndiUrlIntegrationTest exte
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
/* For debugging, uncomment the next two lines */
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
Modified: aries/trunk/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-itest/pom.xml Fri Jan 27 19:00:36 2012
@@ -97,13 +97,13 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java Fri Jan 27 19:00:36 2012
@@ -65,7 +65,7 @@ public abstract class JPAWeavingAndAnnot
mavenBundle("commons-collections", "commons-collections"),
mavenBundle("commons-pool", "commons-pool"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java Fri Jan 27 19:00:36 2012
@@ -70,7 +70,7 @@ public class JPAInjectionTest extends Ab
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java Fri Jan 27 19:00:36 2012
@@ -192,7 +192,7 @@ public class JPAContainerDataSourceFacto
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java Fri Jan 27 19:00:36 2012
@@ -65,7 +65,7 @@ public class JPAContainerTest extends Ab
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java Fri Jan 27 19:00:36 2012
@@ -62,7 +62,7 @@ public class EclipseLinkStartupTest exte
// maven bundle plugin.
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java Fri Jan 27 19:00:36 2012
@@ -416,7 +416,7 @@ public abstract class JPAContextTest ext
// Adding blueprint to the runtime is a hack to placate the maven bundle plugin.
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1236827&r1=1236826&r2=1236827&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Fri Jan 27 19:00:36 2012
@@ -84,10 +84,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<optional>true</optional>
- <version>3.2</version>
+ <version>4.0</version>
</dependency>
</dependencies>