aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1210363 - in /aries/trunk/blueprint: blueprint-annotation-api/pom.xml blueprint-annotation-impl/pom.xml blueprint-api/pom.xml blueprint-cm/pom.xml blueprint-core/pom.xml blueprint-jexl-evaluator/pom.xml blueprint-parser/pom.xml
Date Mon, 05 Dec 2011 08:48:56 GMT
Author: djencks
Date: Mon Dec  5 08:48:56 2011
New Revision: 1210363

URL: http://svn.apache.org/viewvc?rev=1210363&view=rev
Log:
ARIES-798 introduce -Pdev profile to build against snapshots

Modified:
    aries/trunk/blueprint/blueprint-annotation-api/pom.xml
    aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
    aries/trunk/blueprint/blueprint-api/pom.xml
    aries/trunk/blueprint/blueprint-cm/pom.xml
    aries/trunk/blueprint/blueprint-core/pom.xml
    aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
    aries/trunk/blueprint/blueprint-parser/pom.xml

Modified: aries/trunk/blueprint/blueprint-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-api/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-api/pom.xml Mon Dec  5 08:48:56 2011
@@ -51,8 +51,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-impl/pom.xml Mon Dec  5 08:48:56 2011
@@ -61,8 +61,21 @@
         <aries.osgi.export.service>
             org.apache.aries.blueprint.annotation.AnnotationScannerService
         </aries.osgi.export.service>
+
+        <blueprint.annotation.api.version>0.3</blueprint.annotation.api.version>
+        <util.version>0.4</util.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <blueprint.annotation.api.version>0.3.3-SNAPSHOT</blueprint.annotation.api.version>
+                <util.version>0.5-SNAPSHOT</util.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-api/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-api/pom.xml Mon Dec  5 08:48:56 2011
@@ -51,8 +51,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Mon Dec  5 08:48:56 2011
@@ -50,24 +50,39 @@
         <aries.osgi.private.pkg>
             org.apache.aries.blueprint.compendium.cm
         </aries.osgi.private.pkg>
+
+        <blueprint.api.version>0.3</blueprint.api.version>
+        <blueprint.core.version>0.4</blueprint.core.version>
+        <blueprint.parser.version>0.4</blueprint.parser.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <blueprint.api.version>0.3.2-SNAPSHOT</blueprint.api.version>
+                <blueprint.core.version>0.4.1-SNAPSHOT</blueprint.core.version>
+                <blueprint.parser.version>0.4.1-SNAPSHOT</blueprint.parser.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3</version>
+            <version>${blueprint.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-parser</artifactId>
-            <version>0.4.1-SNAPSHOT</version>
+            <version>${blueprint.parser.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>0.4.1-SNAPSHOT</version>
+            <version>${blueprint.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Mon Dec  5 08:48:56 2011
@@ -91,31 +91,53 @@
             {maven-resources},
             org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd
         </aries.osgi.include.resource>
+
+        <blueprint.annotation.api.version>0.3</blueprint.annotation.api.version>
+        <blueprint.api.version>0.3</blueprint.api.version>
+        <blueprint.parser.version>0.4</blueprint.parser.version>
+        <proxy.api.version>0.4</proxy.api.version>
+        <proxy.impl.version>0.4</proxy.impl.version>
+        <quiesce.api.version>0.3</quiesce.api.version>
+        <util.version>0.4</util.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <blueprint.annotation.api.version>0.3.3-SNAPSHOT</blueprint.annotation.api.version>
+                <blueprint.api.version>0.3.2-SNAPSHOT</blueprint.api.version>
+                <blueprint.parser.version>0.4.1-SNAPSHOT</blueprint.parser.version>
+                <proxy.api.version>0.4.1-SNAPSHOT</proxy.api.version>
+                <proxy.impl.version>0.4.1-SNAPSHOT</proxy.impl.version>
+                <quiesce.api.version>0.3.1-SNAPSHOT</quiesce.api.version>
+                <util.version>0.5-SNAPSHOT</util.version>
+            </properties>
+        </profile>
+    </profiles>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3</version>
+            <version>${blueprint.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
             <optional>true</optional>
-            <version>0.3</version>
+            <version>${blueprint.annotation.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-parser</artifactId>
-            <version>0.4</version>
+            <version>${blueprint.parser.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <version>0.4</version>
+            <version>${util.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -128,11 +150,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
@@ -151,7 +168,7 @@
         <dependency>
             <groupId>org.apache.aries.quiesce</groupId>
             <artifactId>org.apache.aries.quiesce.api</artifactId>
-            <version>0.3</version>
+            <version>${quiesce.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
@@ -162,12 +179,12 @@
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.api</artifactId>
-            <version>0.4</version>
+            <version>${proxy.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>0.4</version>
+            <version>${proxy.impl.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -206,7 +223,6 @@
                                 <artifactItem>
                                     <groupId>org.apache.aries.blueprint</groupId>
                                     <artifactId>org.apache.aries.blueprint.api</artifactId>
-                                    <classifier>sources</classifier>
                                     <includes>**/blueprint.xsd</includes>
                                 </artifactItem>
                             </artifactItems>

Modified: aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml Mon Dec  5 08:48:56 2011
@@ -57,8 +57,19 @@
         <aries.osgi.private.pkg>
             org.apache.aries.blueprint.jexl.evaluator
         </aries.osgi.private.pkg>
+
+        <blueprint.core.version>0.4</blueprint.core.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <blueprint.core.version>0.4.1-SNAPSHOT</blueprint.core.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/trunk/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/pom.xml?rev=1210363&r1=1210362&r2=1210363&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-parser/pom.xml Mon Dec  5 08:48:56 2011
@@ -40,11 +40,25 @@
         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser</url>
     </scm>
 
+    <properties>
+        <blueprint.api.version>0.3</blueprint.api.version>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <blueprint.api.version>0.3.2-SNAPSHOT</blueprint.api.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3</version>
+            <version>${blueprint.api.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>



Mime
View raw message