aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1181059 - in /aries/trunk/blueprint: blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/ blueprint-annotation-impl/ blueprint-annotation-itest/ blueprint-bundle/ blueprint-cm/ blueprint-core/ blueprint-itests/ blu...
Date Mon, 10 Oct 2011 16:28:03 GMT
Author: timothyjward
Date: Mon Oct 10 16:28:03 2011
New Revision: 1181059

URL: http://svn.apache.org/viewvc?rev=1181059&view=rev
Log:
ARIES-754: Update blueprint version ranges ready to release for use with variable version
ranges

Modified:
    aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo
    aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
    aries/trunk/blueprint/blueprint-annotation-itest/pom.xml
    aries/trunk/blueprint/blueprint-bundle/pom.xml
    aries/trunk/blueprint/blueprint-cm/pom.xml
    aries/trunk/blueprint/blueprint-core/pom.xml
    aries/trunk/blueprint/blueprint-itests/pom.xml
    aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
    aries/trunk/blueprint/blueprint-sample-annotation/pom.xml
    aries/trunk/blueprint/blueprint-sample-fragment/pom.xml
    aries/trunk/blueprint/blueprint-sample/pom.xml
    aries/trunk/blueprint/blueprint-testbundlea/pom.xml
    aries/trunk/blueprint/blueprint-testbundleb/pom.xml
    aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml

Modified: aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo
(original)
+++ aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo
Mon Oct 10 16:28:03 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.3.2
+version 0.3.0

Modified: aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-impl/pom.xml Mon Oct 10 16:28:03 2011
@@ -31,8 +31,7 @@
   <name>Apache Aries Blueprint Annotation Impl</name>
   <version>0.3.2-SNAPSHOT</version>
   <description>
-      This bundle contains the core implementation of Blueprint 
-      along with the "ext" namespace handler.
+      This bundle contains an implementation of Blueprint annotation support 
   </description>
 
      <scm>
@@ -42,28 +41,33 @@
      </scm>
 
   <properties>
+      <aries.osgi.export.pkg />
       <aries.osgi.activator>
           org.apache.aries.blueprint.annotation.impl.Activator
       </aries.osgi.activator>
-      <aries.osgi.export.pkg>
-          org.apache.aries.blueprint.jaxb.*,
+      <aries.osgi.private.pkg>
+          org.apache.aries.blueprint.jaxb,
           org.apache.aries.blueprint.annotation.impl
-      </aries.osgi.export.pkg>
-      <aries.osgi.import>
-          org.apache.aries.blueprint.annotation,
-        *
-      </aries.osgi.import>
+      </aries.osgi.private.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>
       <aries.osgi.export.service>
           org.apache.aries.blueprint.annotation.AnnotationScannerService
       </aries.osgi.export.service>
-      <aries.osgi.private.pkg />
   </properties>
   
   <dependencies>
       <dependency>
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-          <version>0.3.2-SNAPSHOT</version>
+          <version>0.3</version>
       </dependency>
       <dependency>
           <groupId>org.apache.aries</groupId>

Modified: aries/trunk/blueprint/blueprint-annotation-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-itest/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-itest/pom.xml Mon Oct 10 16:28:03 2011
@@ -52,11 +52,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>
@@ -75,12 +70,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.sample</artifactId>
-            <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
             <version>0.3.2-SNAPSHOT</version>
             <scope>test</scope>
@@ -92,18 +81,6 @@
             <scope>test</scope>
         </dependency>        
         <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
-            <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
-            <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
             <scope>test</scope>
@@ -133,21 +110,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>1.2.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.compendium</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.core</artifactId>
-                    </exclusion>
-                </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
             <scope>test</scope>
@@ -177,7 +139,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Mon Oct 10 16:28:03 2011
@@ -46,18 +46,26 @@
         <aries.osgi.activator>
             org.apache.aries.blueprint.container.BlueprintExtender
         </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>
             !org.apache.aries.blueprint*,
-            !org.osgi.service.blueprint*,
+            !org.osgi.service.blueprint,
+            org.osgi.service.blueprint.container,
+            org.osgi.service.blueprint.reflect,
             org.eclipse.osgi.internal.loader;resolution:=optional,
             org.eclipse.osgi.framework.internal.core;resolution:=optional,
             org.eclipse.osgi.framework.adaptor;resolution:=optional,
             org.osgi.service.event*;resolution:=optional,
             org.osgi.service.framework;resolution:=optional,
-            org.osgi.service.cm;version="[1.2.0,2.0.0)",
-            org.apache.aries.blueprint.annotation.service;resolution:=optional,
-            org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
-            org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
+            org.osgi.service.cm,
+            org.apache.aries.blueprint.annotation.service;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
+            org.apache.aries.quiesce.manager;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
+            org.apache.aries.quiesce.participant;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
+            org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
             *
         </aries.osgi.import>
         <!-- Export package versions are maintained in packageinfo files -->
@@ -90,7 +98,13 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
+            <version>0.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -132,7 +146,7 @@
             <groupId>org.apache.aries.quiesce</groupId>
             <artifactId>org.apache.aries.quiesce.api</artifactId>
             <scope>provided</scope>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
 
     </dependencies>

Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Mon Oct 10 16:28:03 2011
@@ -52,7 +52,7 @@
       <dependency>
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>org.apache.aries.blueprint.api</artifactId>
-          <version>0.3.2-SNAPSHOT</version>
+          <version>0.3</version>
       </dependency>
       <dependency>
           <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Mon Oct 10 16:28:03 2011
@@ -50,15 +50,21 @@
           org.apache.aries.blueprint*,
           org.osgi.service.blueprint;version=1.0.0
       </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>
         !org.osgi.service.blueprint,
         !org.apache.aries.blueprint*,
-        org.apache.aries.util.tracker;resolution:=optional,
+        org.apache.aries.util.tracker;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
         org.osgi.service.event*;resolution:=optional,
         org.osgi.service.framework;resolution:=optional,
-        org.apache.aries.blueprint.annotation.service;resolution:=optional,
-        org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
-        org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
+        org.apache.aries.blueprint.annotation.service;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
+        org.apache.aries.quiesce.manager;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
+        org.apache.aries.quiesce.participant;version="$&lt;range;[==,=+)&gt;";resolution:=optional,
+        org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
         *
       </aries.osgi.import>
       <aries.osgi.private.pkg />
@@ -124,7 +130,7 @@
       <dependency>
           <groupId>org.apache.aries.quiesce</groupId>
           <artifactId>org.apache.aries.quiesce.api</artifactId>
-          <version>0.3.1-SNAPSHOT</version>
+          <version>0.3</version>
       </dependency>
       <dependency>
           <groupId>org.apache.aries.testsupport</groupId>

Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Mon Oct 10 16:28:03 2011
@@ -174,7 +174,7 @@
         	<artifactId>org.apache.aries.quiesce.api</artifactId>
         	<type>bundle</type>
         	<scope>provided</scope>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
         	<groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml Mon Oct 10 16:28:03 2011
@@ -43,8 +43,13 @@
       
       <!-- Export package versions are maintained in packageinfo files -->
       <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>
-        org.apache.aries.blueprint.ext.evaluator;version="[0.3.2,0.4)",      
+        org.apache.aries.blueprint.ext.evaluator;version="$&lt;range;[==,=+)&gt;",
     
         org.apache.commons.jexl2,
         org.slf4j,
         org.osgi.service.blueprint

Modified: aries/trunk/blueprint/blueprint-sample-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-annotation/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-annotation/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample-annotation/pom.xml Mon Oct 10 16:28:03 2011
@@ -46,7 +46,7 @@
             org.apache.aries.blueprint.sample.Activator
         </aries.osgi.activator>
         <aries.osgi.import>
-            org.apache.aries.blueprint.annotation,
+            org.apache.aries.blueprint.annotation;version="$&lt;range;[==,=+)&gt;",
             *
         </aries.osgi.import>
         <aries.osgi.private.pkg />
@@ -61,12 +61,12 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/blueprint/blueprint-sample-fragment/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-fragment/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-fragment/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample-fragment/pom.xml Mon Oct 10 16:28:03 2011
@@ -43,7 +43,7 @@
 			org.apache.aries.blueprint.fragment;-noimport:=true
 		</aries.osgi.export>
         <aries.osgi.import>
-            org.apache.aries.blueprint.annotation,
+            org.apache.aries.blueprint.annotation;version="$&lt;range;[==,=+)&gt;",
             *
         </aries.osgi.import>
         <aries.osgi.private.pkg />
@@ -58,12 +58,12 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample/pom.xml Mon Oct 10 16:28:03 2011
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundlea/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundlea/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testbundlea/pom.xml Mon Oct 10 16:28:03 2011
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundleb/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundleb/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testbundleb/pom.xml Mon Oct 10 16:28:03 2011
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml?rev=1181059&r1=1181058&r2=1181059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml Mon Oct 10 16:28:03 2011
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>



Mime
View raw message