svn commit: r1599204 - in /aries/trunk/proxy: proxy-bundle/pom.xml proxy-itests/pom.xml proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java

[gnodet]

Author: gnodet
Date: Mon Jun  2 13:03:04 2014
New Revision: 1599204

URL: http://svn.apache.org/r1599204
Log:
Fix proxy integration tests

Modified:
    aries/trunk/proxy/proxy-bundle/pom.xml
    aries/trunk/proxy/proxy-itests/pom.xml
    
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java

Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1599204&r1=1599203&r2=1599204&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Mon Jun  2 13:03:04 2014
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.api</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1599204&r1=1599203&r2=1599204&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-itests/pom.xml Mon Jun  2 13:03:04 2014
@@ -155,6 +155,16 @@
             <version>1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: 
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java?rev=1599204&r1=1599203&r2=1599204&view=diff
==============================================================================
--- 
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
 (original)
+++ 
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
 Mon Jun  2 13:03:04 2014
@@ -298,7 +298,9 @@ public abstract class AbstractProxyTest 
               when(localRepo != 
null).useOptions(CoreOptions.vmOption("-Dorg.ops4j.pax.url.mvn.localRepository="
 + localRepo)),
                  mavenBundle("org.apache.aries", 
"org.apache.aries.util").versionAsInProject(),
                  mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
-                 mavenBundle("org.apache.aries.testsupport", 
"org.apache.aries.testsupport.unit").versionAsInProject()
+                 mavenBundle("org.apache.aries.testsupport", 
"org.apache.aries.testsupport.unit").versionAsInProject(),
+              mavenBundle("org.ops4j.pax.logging", 
"pax-logging-api").versionAsInProject(),
+              mavenBundle("org.ops4j.pax.logging", 
"pax-logging-service").versionAsInProject()
                 /* vmOption 
("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
                  waitForFrameworkStartup(),*/
          );