You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dk...@apache.org on 2014/06/04 16:43:38 UTC

svn commit: r1600242 - in /aries/trunk/blueprint: blueprint-annotation-api/ blueprint-annotation-impl/ blueprint-bundle/ blueprint-cm/ blueprint-compatibility/ blueprint-core-compatibility/ blueprint-jexl-evaluator/ blueprint-parser/ blueprint-web/

Author: dkulp
Date: Wed Jun  4 14:43:38 2014
New Revision: 1600242

URL: http://svn.apache.org/r1600242
Log:
Update all of blueprint to build with Maven 3.2.1, update poms for simplified versioning plugin cnfig

Modified:
    aries/trunk/blueprint/blueprint-annotation-api/pom.xml
    aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
    aries/trunk/blueprint/blueprint-bundle/pom.xml
    aries/trunk/blueprint/blueprint-cm/pom.xml
    aries/trunk/blueprint/blueprint-compatibility/pom.xml
    aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
    aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
    aries/trunk/blueprint/blueprint-parser/pom.xml
    aries/trunk/blueprint/blueprint-web/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=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-api/pom.xml Wed Jun  4 14:43:38 2014
@@ -52,6 +52,8 @@
             org.osgi.framework
         </aries.osgi.import.pkg>
         <aries.osgi.private.pkg />
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
+
     </properties>
 
     <dependencies>
@@ -67,7 +69,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -75,9 +76,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.annotation.api:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-impl/pom.xml Wed Jun  4 14:43:38 2014
@@ -62,6 +62,8 @@
         </aries.osgi.export.service>
         <blueprint.annotation.api.version>1.0.0</blueprint.annotation.api.version>
         <util.version>1.0.0</util.version>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
+
     </properties>
 
     <profiles>
@@ -140,7 +142,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -148,9 +149,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.annotation.impl:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Wed Jun  4 14:43:38 2014
@@ -23,9 +23,9 @@
 
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -102,6 +102,8 @@
         <aries.osgi.failok>
             true
         </aries.osgi.failok>
+        <lastReleaseVersion>1.1.0</lastReleaseVersion>
+
     </properties>
 
     <dependencies>
@@ -149,11 +151,6 @@
             <version>4.0</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
@@ -224,7 +221,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -232,9 +228,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint:1.1.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Wed Jun  4 14:43:38 2014
@@ -58,6 +58,7 @@
         <blueprint.api.version>1.0.0</blueprint.api.version>
         <blueprint.core.version>1.2.0</blueprint.core.version>
         <blueprint.parser.version>1.1.0</blueprint.parser.version>
+        <lastReleaseVersion>1.0.3</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -153,7 +154,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -161,9 +161,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.cm:1.0.2</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/blueprint/blueprint-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-compatibility/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-compatibility/pom.xml Wed Jun  4 14:43:38 2014
@@ -51,6 +51,7 @@
             org.apache.aries.blueprint.reflect;deprecated="true",
             org.apache.aries.blueprint.compendium.cm;deprecated="true",
         </aries.osgi.export>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -141,7 +142,6 @@
 		            <plugin>
 		                <groupId>org.apache.aries.versioning</groupId>
 		                <artifactId>org.apache.aries.versioning.plugin</artifactId>
-		                <version>0.1.0</version>
 		                <executions>
 		                    <execution>
 		                        <id>default-verify</id>
@@ -149,9 +149,6 @@
 		                        <goals>
 		                            <goal>version-check</goal>
 		                        </goals>
-		                        <configuration>
-		                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.compatibility:1.0.0</oldArtifact>
-		                        </configuration>
 		                    </execution>
 		                </executions>
 		            </plugin>

Modified: aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core-compatibility/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core-compatibility/pom.xml Wed Jun  4 14:43:38 2014
@@ -50,6 +50,7 @@
             org.apache.aries.blueprint.di;deprecated="true",
             org.apache.aries.blueprint.reflect;deprecated="true",
         </aries.osgi.export>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -139,7 +140,6 @@
                     <plugin>
                         <groupId>org.apache.aries.versioning</groupId>
                         <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                        <version>0.1.0</version>
                         <executions>
                             <execution>
                                 <id>default-verify</id>
@@ -147,9 +147,6 @@
                                 <goals>
                                     <goal>version-check</goal>
                                 </goals>
-                                <configuration>
-                                    <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.core.compatibility:1.0.0</oldArtifact>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>

Modified: aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml Wed Jun  4 14:43:38 2014
@@ -56,6 +56,7 @@
             org.apache.aries.blueprint.jexl.evaluator
         </aries.osgi.private.pkg>
         <blueprint.core.version>1.0.0</blueprint.core.version>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -96,7 +97,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -104,9 +104,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.jexl.evaluator:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-parser/pom.xml Wed Jun  4 14:43:38 2014
@@ -45,6 +45,7 @@
 
     <properties>
         <blueprint.api.version>1.0.0</blueprint.api.version>
+        <lastReleaseVersion>1.2.0</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -75,7 +76,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -83,9 +83,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:blueprint-parser:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/blueprint/blueprint-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/pom.xml?rev=1600242&r1=1600241&r2=1600242&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-web/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-web/pom.xml Wed Jun  4 14:43:38 2014
@@ -46,6 +46,7 @@
 
     <properties>
         <blueprint.nosgi.version>1.0.0</blueprint.nosgi.version>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -120,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -128,9 +128,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.core:1.1.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>