You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2011/10/10 18:46:55 UTC

svn commit: r1181064 - in /aries/trunk/jndi: jndi-bundle/pom.xml jndi-core/pom.xml jndi-rmi/pom.xml jndi-url-itest/pom.xml jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java jndi-url/pom.xml

Author: timothyjward
Date: Mon Oct 10 16:46:55 2011
New Revision: 1181064

URL: http://svn.apache.org/viewvc?rev=1181064&view=rev
Log:
ARIES-754: Update jndi version ranges ready to release

Modified:
    aries/trunk/jndi/jndi-bundle/pom.xml
    aries/trunk/jndi/jndi-core/pom.xml
    aries/trunk/jndi/jndi-rmi/pom.xml
    aries/trunk/jndi/jndi-url-itest/pom.xml
    aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
    aries/trunk/jndi/jndi-url/pom.xml

Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1181064&r1=1181063&r2=1181064&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Mon Oct 10 16:46:55 2011
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.api</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/pom.xml?rev=1181064&r1=1181063&r2=1181064&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/pom.xml (original)
+++ aries/trunk/jndi/jndi-core/pom.xml Mon Oct 10 16:46:55 2011
@@ -50,6 +50,15 @@
             org.apache.aries.jndi.startup.Activator
         </aries.osgi.activator>
         <aries.osgi.export.pkg />
+        <!-- 
+          We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+          stabilizing API. This should be removed once the dependency is available at a 
+          version greater than or equal to 1.0.0
+        -->
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -57,7 +66,7 @@
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.api</artifactId>
             <scope>provided</scope>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/pom.xml?rev=1181064&r1=1181063&r2=1181064&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/pom.xml (original)
+++ aries/trunk/jndi/jndi-rmi/pom.xml Mon Oct 10 16:46:55 2011
@@ -44,8 +44,19 @@
         <aries.osgi.activator>
             org.apache.aries.jndi.rmi.Activator
         </aries.osgi.activator>
-        <aries.osgi.private.pkg />
-        <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
+        <aries.osgi.private.pkg>
+            ${project.artifactId}*
+        </aries.osgi.private.pkg>
+        <aries.osgi.export.pkg/>
+        <!-- 
+          We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+          stabilizing API. This should be removed once the dependency is available at a 
+          version greater than or equal to 1.0.0
+        -->
+        <aries.osgi.import.pkg>
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+            *
+        </aries.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -53,7 +64,7 @@
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.api</artifactId>
             <scope>provided</scope>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>

Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1181064&r1=1181063&r2=1181064&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Mon Oct 10 16:46:55 2011
@@ -60,7 +60,14 @@
 
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
+            <artifactId>org.apache.aries.blueprint.api</artifactId>
+            <scope>test</scope>
+            <version>0.3</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.core</artifactId>
             <scope>test</scope>
             <version>0.3.2-SNAPSHOT</version>
         </dependency>
@@ -220,7 +227,7 @@
         <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>0.3.1-SNAPSHOT</version>
+          <version>0.4-SNAPSHOT</version>
           <scope>test</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=1181064&r1=1181063&r2=1181064&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 Oct 10 16:46:55 2011
@@ -140,7 +140,8 @@ public class JndiUrlIntegrationTest exte
         mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
         mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
         
-        mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+        mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
+        mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
         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"),

Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1181064&r1=1181063&r2=1181064&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Mon Oct 10 16:46:55 2011
@@ -51,7 +51,13 @@
         <aries.osgi.activator>
             org.apache.aries.jndi.url.Activator
         </aries.osgi.activator>
+        <!-- 
+          We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+          stabilizing API. This should be removed once the dependency is available at a 
+          version greater than or equal to 1.0.0
+        -->
         <aries.osgi.import.pkg>
+          org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
           org.osgi.service.blueprint.container;resolution:=optional,
           *
         </aries.osgi.import.pkg>
@@ -62,7 +68,7 @@
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.api</artifactId>
             <scope>provided</scope>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
@@ -88,7 +94,7 @@
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.core</artifactId>
             <scope>test</scope>
-        <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>