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/05 17:50:08 UTC

svn commit: r1600686 - in /aries/trunk/transaction: transaction-blueprint/pom.xml transaction-jdbc/pom.xml transaction-jms/pom.xml transaction-manager/pom.xml

Author: dkulp
Date: Thu Jun  5 15:50:07 2014
New Revision: 1600686

URL: http://svn.apache.org/r1600686
Log:
transaction builds with mvn 3.2.1

Modified:
    aries/trunk/transaction/transaction-blueprint/pom.xml
    aries/trunk/transaction/transaction-jdbc/pom.xml
    aries/trunk/transaction/transaction-jms/pom.xml
    aries/trunk/transaction/transaction-manager/pom.xml

Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1600686&r1=1600685&r2=1600686&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Thu Jun  5 15:50:07 2014
@@ -50,6 +50,7 @@
             org.apache.aries.transaction,
             org.apache.aries.transaction.parsing
         </aries.osgi.private.pkg>
+        <lastReleaseVersion>1.0.1</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -102,7 +103,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>
@@ -110,10 +110,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.blueprint:1.0.1
-                            </oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/transaction/transaction-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/pom.xml?rev=1600686&r1=1600685&r2=1600686&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/pom.xml (original)
+++ aries/trunk/transaction/transaction-jdbc/pom.xml Thu Jun  5 15:50:07 2014
@@ -58,6 +58,7 @@
         <aries.osgi.activator>
             org.apache.aries.transaction.jdbc.internal.Activator
         </aries.osgi.activator>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -143,7 +144,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>
@@ -151,10 +151,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.jdbc:1.0.0
-                            </oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/transaction/transaction-jms/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms/pom.xml?rev=1600686&r1=1600685&r2=1600686&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jms/pom.xml (original)
+++ aries/trunk/transaction/transaction-jms/pom.xml Thu Jun  5 15:50:07 2014
@@ -50,6 +50,7 @@
         <aries.osgi.private.pkg>
             org.apache.aries.transaction.jms.internal
         </aries.osgi.private.pkg>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -117,7 +118,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>
@@ -125,10 +125,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.jms:1.0.0
-                            </oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1600686&r1=1600685&r2=1600686&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Thu Jun  5 15:50:07 2014
@@ -21,9 +21,9 @@
 
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath/>
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -73,6 +73,7 @@
             {maven-resources},
             javax/resource/spi/XATerminator.class=target/classes/javax/resource/spi/XATerminator.class
         </aries.osgi.include.resource>
+        <lastReleaseVersion>1.1.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -248,14 +249,9 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-              - Disable plugin because it barfs that the org.apache.geronimo.transaction
-              - package version should be 2.2.1 because there has been no change
-              -
             <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>
@@ -263,13 +259,9 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.manager:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>