Return-Path: 
 <commits-return-6627-apmail-aries-commits-archive=aries.apache.org@aries.apache.org>
X-Original-To: apmail-aries-commits-archive@www.apache.org
Delivered-To: apmail-aries-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AC0BE11D6B
	for <apmail-aries-commits-archive@www.apache.org>;
 Mon,  2 Jun 2014 13:03:29 +0000 (UTC)
Received: (qmail 67161 invoked by uid 500); 2 Jun 2014 13:03:29 -0000
Delivered-To: apmail-aries-commits-archive@aries.apache.org
Received: (qmail 67092 invoked by uid 500); 2 Jun 2014 13:03:29 -0000
Mailing-List: contact commits-help@aries.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@aries.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@aries.apache.org>
List-Post: <mailto:commits@aries.apache.org>
List-Id: <commits.aries.apache.org>
Reply-To: dev@aries.apache.org
Delivered-To: mailing list commits@aries.apache.org
Received: (qmail 67080 invoked by uid 99); 2 Jun 2014 13:03:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2014 13:03:29 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2014 13:03:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 95C0D2388860;
	Mon,  2 Jun 2014 13:03:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Mon, 02 Jun 2014 13:03:05 -0000
To: commits@aries.apache.org
From: gnodet@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140602130305.95C0D2388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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(),*/
 	  );