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:02:25 UTC
svn commit: r1236831 - in /aries/trunk: application/application-itests/
application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/
application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/applica...
Author: ejiang
Date: Fri Jan 27 19:02:24 2012
New Revision: 1236831
URL: http://svn.apache.org/viewvc?rev=1236831&view=rev
Log:
ARIES-817: Upgrade to ASM4
Modified:
aries/trunk/application/application-itests/pom.xml
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
aries/trunk/application/application-tooling-repository-generator/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
Modified: aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/pom.xml?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/pom.xml (original)
+++ aries/trunk/application/application-itests/pom.xml Fri Jan 27 19:02:24 2012
@@ -77,13 +77,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>
- <artifactId>asm-all</artifactId>
- <version>3.2</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java Fri Jan 27 19:02:24 2012
@@ -158,7 +158,7 @@ public class BasicAppManagerTest extends
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
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.osgi", "org.osgi.compendium"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java Fri Jan 27 19:02:24 2012
@@ -132,7 +132,7 @@ public class BasicNoOpResolverTest exten
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
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.osgi", "org.osgi.compendium"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java Fri Jan 27 19:02:24 2012
@@ -365,7 +365,7 @@ public class IsolatedCfgAdminRuntimeTest
repository("http://repository.ops4j.org/maven2"),
paxLogging("DEBUG"),
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.blueprint"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java Fri Jan 27 19:02:24 2012
@@ -314,7 +314,7 @@ public class IsolatedRuntimeTest extends
// do not provision against the local runtime
// Bundles
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.blueprint"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java Fri Jan 27 19:02:24 2012
@@ -182,7 +182,7 @@ public class MinimumImportsTest extends
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
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.osgi", "org.osgi.compendium"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Fri Jan 27 19:02:24 2012
@@ -153,7 +153,7 @@ public class OBRAppManagerTest extends A
// Bundles
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", "org.apache.aries.util"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Fri Jan 27 19:02:24 2012
@@ -534,7 +534,7 @@ public class OBRResolverAdvancedTest ext
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
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.osgi", "org.osgi.compendium"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Fri Jan 27 19:02:24 2012
@@ -319,7 +319,7 @@ public class OBRResolverTest extends Abs
// Bundles
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", "org.apache.aries.util"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java Fri Jan 27 19:02:24 2012
@@ -256,7 +256,7 @@ public class UpdateAppTest extends Abstr
// Bundles
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.blueprint"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
Modified: aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java (original)
+++ aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java Fri Jan 27 19:02:24 2012
@@ -133,7 +133,7 @@ public class ConfigurationPostResolverTe
repository("http://repository.ops4j.org/maven2"),
paxLogging("DEBUG"),
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", "org.apache.aries.util"),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: aries/trunk/application/application-tooling-repository-generator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-tooling-repository-generator/pom.xml?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/application/application-tooling-repository-generator/pom.xml (original)
+++ aries/trunk/application/application-tooling-repository-generator/pom.xml Fri Jan 27 19:02:24 2012
@@ -88,7 +88,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>
@@ -127,9 +127,10 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
+ <optional>true</optional>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1236831&r1=1236830&r2=1236831&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Fri Jan 27 19:02:24 2012
@@ -138,15 +138,15 @@
<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>
<scope>test</scope>
<optional>true</optional>
- <version>3.2</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>