You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2013/08/13 17:07:19 UTC

svn commit: r1513539 - in /db/jdo/branches/3.1-rc1: api/pom.xml assembly.xml copyjdorijars/pom.xml exectck/pom.xml parent-pom/pom.xml pom.xml tck/pom.xml

Author: mcaisse
Date: Tue Aug 13 15:07:19 2013
New Revision: 1513539

URL: http://svn.apache.org/r1513539
Log:
JDO-723 Change release number on internal dependencies to 3.1-SNAPSHOT. Fix assembly.xml so it does not copy files in lib/** to the release.

Modified:
    db/jdo/branches/3.1-rc1/api/pom.xml
    db/jdo/branches/3.1-rc1/assembly.xml
    db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml
    db/jdo/branches/3.1-rc1/exectck/pom.xml
    db/jdo/branches/3.1-rc1/parent-pom/pom.xml
    db/jdo/branches/3.1-rc1/pom.xml
    db/jdo/branches/3.1-rc1/tck/pom.xml

Modified: db/jdo/branches/3.1-rc1/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/api/pom.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/api/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/api/pom.xml Tue Aug 13 15:07:19 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.jdo</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>3.1.SNAPSHOT</version>
+    <version>3.1-SNAPSHOT</version>
     <relativePath>../parent-pom</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
   <groupId>javax.jdo</groupId>
   <artifactId>jdo-api</artifactId>
   <name>JDO API</name>
-  <version>3.1.SNAPSHOT</version>
+  <version>3.1-SNAPSHOT</version>
   <description>The Java Data Objects (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request 243 under the auspices of the Java Community Process.</description>
 
   <scm>

Modified: db/jdo/branches/3.1-rc1/assembly.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/assembly.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/assembly.xml (original)
+++ db/jdo/branches/3.1-rc1/assembly.xml Tue Aug 13 15:07:19 2013
@@ -106,7 +106,9 @@
 	  <include>README.html</include>
 	  <include>assembly.xml</include>
 	  <include>pom.xml</include>
-	  <include>lib/**</include>
+	  <include>lib/ext</include>
+	  <include>lib/iut</include>
+	  <include>lib/jdori</include>
 	</includes>
       </fileSet>
     </fileSets>

Modified: db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml Tue Aug 13 15:07:19 2013
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.jdo</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>3.1.SNAPSHOT</version>
+    <version>3.1-SNAPSHOT</version>
     <relativePath>../parent-pom</relativePath>
   </parent>
   
@@ -29,7 +29,7 @@
   <groupId>org.apache.jdo</groupId>
   <artifactId>copy-jdori-jars</artifactId>
   <name>JDO RI Jar Copy</name>
-  <version>3.1.SNAPSHOT</version>
+  <version>3.1-SNAPSHOT</version>
   <description>The Java Data Objects (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request 243 under the auspices of the Java Community Process.</description>
 
   <scm>

Modified: db/jdo/branches/3.1-rc1/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/exectck/pom.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/exectck/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/exectck/pom.xml Tue Aug 13 15:07:19 2013
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.jdo</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>3.1.SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
 
@@ -12,7 +12,7 @@
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo-exectck</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>3.1.SNAPSHOT</version>
+    <version>3.1-SNAPSHOT</version>
     <name>JDO TCK Execution Maven Mojo</name>
     <url>http://maven.apache.org</url>
 

Modified: db/jdo/branches/3.1-rc1/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/parent-pom/pom.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/parent-pom/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/parent-pom/pom.xml Tue Aug 13 15:07:19 2013
@@ -12,7 +12,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.jdo</groupId>
   <artifactId>parent-pom</artifactId>
-  <version>3.1.SNAPSHOT</version>
+  <version>3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JDO PARENT</name>
   <description>The Java Data Objects (JDO) API is a standard interface-based 
@@ -23,32 +23,20 @@ Requests (JSR 12 and 243) under the ausp
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/branches/3.1-rc1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/branches/3.1-rc1</developerConnection>
-    <tag>HEAD</tag>
-    <url>http://svn.apache.org/viewvc/db/jdo</url>
-  </scm>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/branches/3.1-rc1</developerConnection> <tag>HEAD</tag> <url>http://svn.apache.org/viewvc/db/jdo</url> </scm> <organization> <name>Apache Software Foundation</name> <url>http://www.apache.org</url> </organization> <dependencyManagement> <dependencies> <dependency>
         <groupId>javax.jdo</groupId>
         <artifactId>jdo-api</artifactId>
-        <version>3.1</version>
+        <version>3.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.jdo</groupId>
         <artifactId>jdo-exectck</artifactId>
-        <version>1.0</version>
+        <version>3.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.jdo</groupId>
         <artifactId>jdo-tck</artifactId>
-        <version>3.1</version>
+        <version>3.1-SNAPSHOT</version>
       </dependency>
      <dependency>
         <groupId>org.apache.maven</groupId>

Modified: db/jdo/branches/3.1-rc1/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/pom.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/pom.xml Tue Aug 13 15:07:19 2013
@@ -6,7 +6,7 @@
   <groupId>org.apache</groupId>
   <artifactId>jdo</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.SNAPSHOT</version>
+  <version>3.1-SNAPSHOT</version>
   <name>JDO Root POM</name>
 
   <modules>

Modified: db/jdo/branches/3.1-rc1/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/tck/pom.xml?rev=1513539&r1=1513538&r2=1513539&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/tck/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/tck/pom.xml Tue Aug 13 15:07:19 2013
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.apache.jdo</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>3.1.SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo-tck</artifactId>
-    <version>3.1.SNAPSHOT</version>
+    <version>3.1-SNAPSHOT</version>
     <name>JDO Technology Compatibility Kit (TCK)</name>
     <description>The Java Data Objects (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process.
 
@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>org.apache.jdo</groupId>
                 <artifactId>jdo-exectck</artifactId>
-                <version>1.0</version>
+                <version>3.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>integration-test</phase>