Author: jbonofre
Date: Fri Jun 13 14:58:45 2014
New Revision: 1602453
URL: http://svn.apache.org/r1602453
Log:
Merge branch 'JAVA8' into trunk
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-noosgi/pom.xml
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1602453&r1=1602452&r2=1602453&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Fri Jun 13 14:58:45 2014
@@ -140,15 +140,15 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.0</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-debug-all</artifactId>
+ <version>5.0.3</version>
<scope>test</scope>
<optional>true</optional>
- <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1602453&r1=1602452&r2=1602453&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Jun 13 14:58:45 2014
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.0</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1602453&r1=1602452&r2=1602453&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Jun 13 14:58:45 2014
@@ -93,7 +93,7 @@
<blueprint.api.version>1.0.0</blueprint.api.version>
<blueprint.parser.version>1.2.1-SNAPSHOT</blueprint.parser.version>
<proxy.api.version>1.0.0</proxy.api.version>
- <proxy.impl.version>1.0.0</proxy.impl.version>
+ <proxy.impl.version>1.0.3-SNAPSHOT</proxy.impl.version>
<quiesce.api.version>1.0.0</quiesce.api.version>
<util.version>1.0.0</util.version>
<lastReleaseVersion>1.4.0</lastReleaseVersion>
Modified: aries/trunk/blueprint/blueprint-noosgi/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-noosgi/pom.xml?rev=1602453&r1=1602452&r2=1602453&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-noosgi/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-noosgi/pom.xml Fri Jun 13 14:58:45 2014
@@ -47,7 +47,7 @@
<blueprint.api.version>1.0.0</blueprint.api.version>
<blueprint.core.version>1.0.0</blueprint.core.version>
<blueprint.parser.version>1.0.0</blueprint.parser.version>
- <proxy.impl.version>1.0.0</proxy.impl.version>
+ <proxy.impl.version>1.0.3-SNAPSHOT</proxy.impl.version>
</properties>
<profiles>
