Return-Path: 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 43DEE118CC for ; Fri, 13 Jun 2014 14:42:27 +0000 (UTC) Received: (qmail 10057 invoked by uid 500); 13 Jun 2014 14:42:27 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 9988 invoked by uid 500); 13 Jun 2014 14:42:27 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 9977 invoked by uid 99); 13 Jun 2014 14:42:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 14:42:27 +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; Fri, 13 Jun 2014 14:42:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8077623889B9; Fri, 13 Jun 2014 14:42:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Fri, 13 Jun 2014 14:42:05 -0000 To: commits@aries.apache.org From: jbonofre@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140613144205.8077623889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.aries.proxy org.apache.aries.proxy - 1.0.0 + 1.0.2-SNAPSHOT test 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 @@ org.apache.aries.proxy org.apache.aries.proxy - 1.0.0 + 1.0.2-SNAPSHOT