Author: jbonofre
Date: Sat Jun 14 06:26:36 2014
New Revision: 1602556
URL: http://svn.apache.org/r1602556
Log:
Merge branch 'JAVA8' into trunk
Modified:
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jndi/jndi-url-itest/pom.xml
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1602556&r1=1602555&r2=1602556&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Sat Jun 14 06:26:36 2014
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1602556&r1=1602555&r2=1602556&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Sat Jun 14 06:26:36 2014
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
