You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2012/01/16 16:51:57 UTC
svn commit: r1232044 - in /aries/trunk/jndi: jndi-bundle/pom.xml
jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
Author: davidb
Date: Mon Jan 16 15:51:57 2012
New Revision: 1232044
URL: http://svn.apache.org/viewvc?rev=1232044&view=rev
Log:
Made blueprint dependency in jndi-bundle optional.
Added dependency to osgi.compendium in jndi-bundle to ensure version ranges are properly computed.
Removed superfluous bundle from system test.
Modified:
aries/trunk/jndi/jndi-bundle/pom.xml
aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1232044&r1=1232043&r2=1232044&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Mon Jan 16 15:51:57 2012
@@ -48,6 +48,7 @@
</aries.osgi.export.pkg>
<aries.osgi.import>
org.apache.aries.*;version="$<range;[==,=+)>",
+ org.osgi.service.blueprint.container;resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.private.pkg>
@@ -85,6 +86,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java?rev=1232044&r1=1232043&r2=1232044&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java (original)
+++ aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java Mon Jan 16 15:51:57 2012
@@ -145,7 +145,6 @@ public class JndiUrlIntegrationTest exte
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi"),
- mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz"),