svn commit: r1602445 - in /aries/trunk/application: application-resolve-transform-cm-itests/ application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ application-tooling-repository-generator/

[jbonofre]

Author: jbonofre
Date: Fri Jun 13 14:42:05 2014
New Revision: 1602445

URL: http://svn.apache.org/r1602445
Log:
Merge branch 'APP_JAVA8' into trunk

Modified:
    aries/trunk/application/application-resolve-transform-cm-itests/pom.xml
    
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

Modified: 
aries/trunk/application/application-resolve-transform-cm-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm-itests/pom.xml?rev=1602445&r1=1602444&r2=1602445&view=diff
==============================================================================
--- aries/trunk/application/application-resolve-transform-cm-itests/pom.xml 
(original)
+++ aries/trunk/application/application-resolve-transform-cm-itests/pom.xml Fri 
Jun 13 14:42:05 2014
@@ -99,7 +99,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/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=1602445&r1=1602444&r2=1602445&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 Jun 13 14:42:05 2014
@@ -127,6 +127,11 @@ public class ConfigurationPostResolverTe
     @Configuration
     public static Option[] configuration() throws Exception {
         return options(
+                mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", 
"org.osgi.compendium").versionAsInProject(),
+                mavenBundle("org.ops4j.pax.logging", 
"pax-logging-api").versionAsInProject(),
+                mavenBundle("org.ops4j.pax.logging", 
"pax-logging-service").versionAsInProject(),
+
                 
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
                 junitBundles(),
                 mavenBundle("org.apache.aries.testsupport", 
"org.apache.aries.testsupport.unit").versionAsInProject(),

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=1602445&r1=1602444&r2=1602445&view=diff
==============================================================================
--- aries/trunk/application/application-tooling-repository-generator/pom.xml 
(original)
+++ aries/trunk/application/application-tooling-repository-generator/pom.xml 
Fri Jun 13 14:42:05 2014
@@ -94,7 +94,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>