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 mb...@apache.org on 2010/06/20 22:40:22 UTC

svn commit: r956414 - in /db/jdo/trunk: maven.xml pom.xml project.properties tck/project.xml

Author: mbo
Date: Sun Jun 20 20:40:22 2010
New Revision: 956414

URL: http://svn.apache.org/viewvc?rev=956414&view=rev
Log:
JDO-661: Add JDO3 goals to top-level maven.xml

Modified:
    db/jdo/trunk/maven.xml
    db/jdo/trunk/pom.xml
    db/jdo/trunk/project.properties
    db/jdo/trunk/tck/project.xml

Modified: db/jdo/trunk/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/maven.xml?rev=956414&r1=956413&r2=956414&view=diff
==============================================================================
--- db/jdo/trunk/maven.xml (original)
+++ db/jdo/trunk/maven.xml Sun Jun 20 20:40:22 2010
@@ -28,9 +28,9 @@
 
     <goal name="help">
         <echo>Custom goals for this project are:</echo>
-        <echo>  jdo11.build   - builds all JDO1 projects</echo>
-        <echo>  jdo11.default - calls the default goal for all JDO1 projects</echo>
-        <echo>  jdo11.clean   - cleans all JDO1 projects</echo>
+        <echo>  jdo3.build   - builds all JDO 3 projects</echo>
+        <echo>  jdo3.default - calls the default goal for all JDO 3 projects</echo>
+        <echo>  jdo3.clean   - cleans all JDO 3 projects</echo>
         <echo>  jdo2.build   - builds all JDO2 projects</echo>
         <echo>  jdo2.default - calls the default goal for  all JDO2 projects</echo>
         <echo>  jdo2.clean   - cleans all JDO2 projects</echo>
@@ -41,6 +41,9 @@
         <echo>  fostore20.clean   - cleans fostore20 and dependencies</echo>
         <echo>  fostore20.build   - builds fostore20 and dependencies</echo>
         <echo>  fostore20.default - calls the default goal for fostore20 and dependencies</echo>
+        <echo>  jdo11.build   - builds all JDO1 projects</echo>
+        <echo>  jdo11.default - calls the default goal for all JDO1 projects</echo>
+        <echo>  jdo11.clean   - cleans all JDO1 projects</echo>
         <echo>Please check README.txt for more details.</echo>
     </goal>
 
@@ -48,23 +51,23 @@
     <!-- JDO1 Goals -->
     <!-- ========== -->
 
-    <goal name="jdo11.build" 
-          description="Builds all JDO1 projects">
-        <j:set var="maven.multiproject.includes">${jdo11.projects}</j:set>
+    <goal name="jdo3.build" 
+          description="Builds all JDO 3 projects">
+        <j:set var="maven.multiproject.includes">${jdo3.projects}</j:set>
         <j:set var="goal">build</j:set>
         <attainGoal name="multiproject:goal"/>
     </goal>
 
-    <goal name="jdo11.default" 
-          description="Calls the default goal for all JDO1 projects">
-        <j:set var="maven.multiproject.includes">${jdo11.projects}</j:set>
+    <goal name="jdo3.default" 
+          description="Calls the default goal for all JDO 3 projects">
+        <j:set var="maven.multiproject.includes">${jdo3.projects}</j:set>
         <j:set var="goal">default</j:set>
         <attainGoal name="multiproject:goal"/>
     </goal>
 
-    <goal name="jdo11.clean" 
-          description="Cleans all JDO1 projects">
-        <j:set var="maven.multiproject.includes">${jdo11.projects}</j:set>
+    <goal name="jdo3.clean" 
+          description="Cleans all JDO 3 projects">
+        <j:set var="maven.multiproject.includes">${jdo3.projects}</j:set>
         <attainGoal name="multiproject:clean"/>
     </goal>
 
@@ -139,6 +142,29 @@
         <attainGoal name="multiproject:clean"/>
     </goal>
   
+    <!-- ========== -->
+    <!-- JDO1 Goals -->
+    <!-- ========== -->
+
+    <goal name="jdo11.build" 
+          description="Builds all JDO1 projects">
+        <j:set var="maven.multiproject.includes">${jdo11.projects}</j:set>
+        <j:set var="goal">build</j:set>
+        <attainGoal name="multiproject:goal"/>
+    </goal>
+
+    <goal name="jdo11.default" 
+          description="Calls the default goal for all JDO1 projects">
+        <j:set var="maven.multiproject.includes">${jdo11.projects}</j:set>
+        <j:set var="goal">default</j:set>
+        <attainGoal name="multiproject:goal"/>
+    </goal>
+
+    <goal name="jdo11.clean" 
+          description="Cleans all JDO1 projects">
+        <j:set var="maven.multiproject.includes">${jdo11.projects}</j:set>
+        <attainGoal name="multiproject:clean"/>
+    </goal>
 
     <!-- ==== -->
     <!-- Misc -->

Modified: db/jdo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/pom.xml?rev=956414&r1=956413&r2=956414&view=diff
==============================================================================
--- db/jdo/trunk/pom.xml (original)
+++ db/jdo/trunk/pom.xml Sun Jun 20 20:40:22 2010
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.jdo</groupId>
   <artifactId>root</artifactId>
-  <version>2.3-SNAPSHOT</version>
+  <version>3.0</version>
   <packaging>pom</packaging>
 </project>
 

Modified: db/jdo/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/project.properties?rev=956414&r1=956413&r2=956414&view=diff
==============================================================================
--- db/jdo/trunk/project.properties (original)
+++ db/jdo/trunk/project.properties Sun Jun 20 20:40:22 2010
@@ -41,6 +41,7 @@ maven.javadoc.windowtitle = ${pom.name} 
 
 # project lists
 #   please note, the project lists must not include blanks
+jdo3.projects=api/project.xml,tck/project.xml
 jdo11.projects=api11/project.xml,btree/project.xml,ri11/project.xml,tck11/project.xml
 jdo2.projects=api2/project.xml,util20/project.xml,model20/project.xml,enhancer20/project.xml,\
 runtime20/project.xml,query20/project.xml,btree/project.xml,fostore20/project.xml,\

Modified: db/jdo/trunk/tck/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/project.xml?rev=956414&r1=956413&r2=956414&view=diff
==============================================================================
--- db/jdo/trunk/tck/project.xml (original)
+++ db/jdo/trunk/tck/project.xml Sun Jun 20 20:40:22 2010
@@ -21,7 +21,7 @@
     <!-- ============== -->
     <!-- Identification -->
     <!-- ============== -->
-    <name>JDO2 Technology Compatibility Kit</name>
+    <name>JDO 3 Technology Compatibility Kit</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo-tck</artifactId>
     <currentVersion>${jdo.currentVersion}</currentVersion>