Author: gnodet
Date: Tue Jun 10 11:41:09 2014
New Revision: 1601610
URL: http://svn.apache.org/r1601610
Log:
Support build with JDK 8, use asm-debug-all for easier debugging
Modified:
aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
Modified: aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl/pom.xml?rev=1601610&r1=1601609&r2=1601610&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-impl/pom.xml Tue Jun 10 11:41:09
2014
@@ -115,9 +115,9 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm-debug-all</artifactId>
<optional>true</optional>
- <version>4.0</version>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1601610&r1=1601609&r2=1601610&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Tue Jun 10 11:41:09 2014
@@ -145,10 +145,10 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm-debug-all</artifactId>
<scope>test</scope>
<optional>true</optional>
- <version>4.0</version>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1601610&r1=1601609&r2=1601610&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Jun 10 11:41:09 2014
@@ -159,9 +159,9 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm-debug-all</artifactId>
<optional>true</optional>
- <version>4.0</version>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1601610&r1=1601609&r2=1601610&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Tue Jun 10 11:41:09 2014
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
@@ -197,9 +197,9 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm-debug-all</artifactId>
<scope>test</scope>
- <version>4.0</version>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1601610&r1=1601609&r2=1601610&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
Tue Jun 10 11:41:09 2014
@@ -62,7 +62,7 @@ public class Helper {
public static Option blueprintBundles(boolean startBlueprint) {
return composite(
- mvnBundle("org.ow2.asm", "asm-all"),
+ mvnBundle("org.ow2.asm", "asm-debug-all"),
mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
mvnBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit"),
