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 cl...@apache.org on 2006/01/18 02:30:38 UTC
svn commit: r369999 - in /db/jdo/trunk: ./ api11/ api20/ btree/ core20/
enhancer20/ fostore20/ query20/ ri11/ runtime20/ tck11/ tck20/
Author: clr
Date: Tue Jan 17 17:30:28 2006
New Revision: 369999
URL: http://svn.apache.org/viewcvs?rev=369999&view=rev
Log:
JDO-278 Change groupId to javax.jdo and org.apache.jdo
Modified:
db/jdo/trunk/api11/maven.xml
db/jdo/trunk/api11/project.xml
db/jdo/trunk/api20/maven.xml
db/jdo/trunk/api20/project.xml
db/jdo/trunk/btree/maven.xml
db/jdo/trunk/btree/project.xml
db/jdo/trunk/core20/maven.xml
db/jdo/trunk/core20/project.xml
db/jdo/trunk/enhancer20/maven.xml
db/jdo/trunk/enhancer20/project.properties
db/jdo/trunk/enhancer20/project.xml
db/jdo/trunk/fostore20/maven.xml
db/jdo/trunk/fostore20/project.properties
db/jdo/trunk/fostore20/project.xml
db/jdo/trunk/project.xml
db/jdo/trunk/query20/maven.xml
db/jdo/trunk/query20/project.xml
db/jdo/trunk/ri11/maven.xml
db/jdo/trunk/ri11/project.properties
db/jdo/trunk/runtime20/maven.xml
db/jdo/trunk/runtime20/project.xml
db/jdo/trunk/tck11/maven.xml
db/jdo/trunk/tck11/project.properties
db/jdo/trunk/tck20/maven.xml
db/jdo/trunk/tck20/project.properties
db/jdo/trunk/tck20/project.xml
Modified: db/jdo/trunk/api11/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api11/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/api11/maven.xml (original)
+++ db/jdo/trunk/api11/maven.xml Tue Jan 17 17:30:28 2006
@@ -27,7 +27,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/api11/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api11/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/api11/project.xml (original)
+++ db/jdo/trunk/api11/project.xml Tue Jan 17 17:30:28 2006
@@ -22,6 +22,7 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO1 API</name>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo1-api</artifactId>
<currentVersion>1.1</currentVersion>
<package>javax.jdo</package>
Modified: db/jdo/trunk/api20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/api20/maven.xml (original)
+++ db/jdo/trunk/api20/maven.xml Tue Jan 17 17:30:28 2006
@@ -25,7 +25,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/api20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/api20/project.xml (original)
+++ db/jdo/trunk/api20/project.xml Tue Jan 17 17:30:28 2006
@@ -22,8 +22,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO2 API</name>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>javax.jdo</package>
<shortDescription>Java Data Object 2.0 (JDO) API</shortDescription>
<description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
@@ -69,6 +70,12 @@
<directory>${basedir}/src/dtd</directory>
<includes>
<include>javax/jdo/*.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/dtd</directory>
+ <includes>
+ <include>javax/jdo/*.xsd</include>
</includes>
</resource>
</resources>
Modified: db/jdo/trunk/btree/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/btree/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/btree/maven.xml (original)
+++ db/jdo/trunk/btree/maven.xml Tue Jan 17 17:30:28 2006
@@ -28,7 +28,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/btree/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/btree/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/btree/project.xml (original)
+++ db/jdo/trunk/btree/project.xml Tue Jan 17 17:30:28 2006
@@ -23,6 +23,7 @@
<!-- Identification -->
<!-- ============== -->
<name>Binary Tree for FOStore JDO</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo-btree</artifactId>
<currentVersion>1.1</currentVersion>
<package>org.netbeans.mdr</package>
Modified: db/jdo/trunk/core20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/core20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/core20/maven.xml (original)
+++ db/jdo/trunk/core20/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/core20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/core20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/core20/project.xml (original)
+++ db/jdo/trunk/core20/project.xml Tue Jan 17 17:30:28 2006
@@ -23,8 +23,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO2 Implementation (Core)</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-core</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
<description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
Modified: db/jdo/trunk/enhancer20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/enhancer20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/maven.xml (original)
+++ db/jdo/trunk/enhancer20/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/enhancer20/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/enhancer20/project.properties?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.properties (original)
+++ db/jdo/trunk/enhancer20/project.properties Tue Jan 17 17:30:28 2006
@@ -17,8 +17,8 @@
maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
-jdo.jdocore.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
+jdo.jdocore.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
logging.jarfile = ${pom.getDependencyPath('commons-logging')}
xmlparser =
@@ -33,5 +33,5 @@
jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
jdo.augmentationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
jdo.xmlexists.main = org.apache.jdo.impl.model.jdo.xml.XMLExists
-jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
Modified: db/jdo/trunk/enhancer20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/enhancer20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.xml (original)
+++ db/jdo/trunk/enhancer20/project.xml Tue Jan 17 17:30:28 2006
@@ -23,8 +23,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO2 Implementation (Enhancer)</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-enhancer</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object 2.0 (JDO) Enhancer</shortDescription>
<description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
@@ -36,12 +37,12 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-core</artifactId>
<version>SNAPSHOT</version>
</dependency>
Modified: db/jdo/trunk/fostore20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/fostore20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/maven.xml (original)
+++ db/jdo/trunk/fostore20/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
@@ -76,7 +76,7 @@
<ant target="runtest.list"
dir="${basedir}/test" antfile="runtest.xml">
<property name="testlist" value="${jdo.testlist}"/>
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
<property name="jdocore" value="${jdo.jdocore.jarfile}"/>
<property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
@@ -101,7 +101,7 @@
dir="${basedir}/test" antfile="runtest.xml">
<property name="policyfile" value="${jdo.security.policy}"/>
<property name="testlist" value="${jdo.testlist}"/>
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
<property name="jdocore" value="${jdo.jdocore.jarfile}"/>
<property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
@@ -128,7 +128,7 @@
<goal name="runtest.multiJVMtests" prereqs="pcclasses, testjar.build">
<ant target="runtest.multiJVMtests"
dir="${basedir}/test" antfile="runtest.xml">
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
<property name="jdocore" value="${jdo.jdocore.jarfile}"/>
<property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
@@ -320,7 +320,7 @@
<goal name="fsuid2.build">
<ant dir="${basedir}/test/fsuid2" target="build">
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdocore" value="${jdo.jdocore.jarfile}"/>
<property name="jdoenhancer" value="${jdo.jdoenhancer.jarfile}"/>
<property name="logging" value="${logging.jarfile}"/>
Modified: db/jdo/trunk/fostore20/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/fostore20/project.properties?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.properties (original)
+++ db/jdo/trunk/fostore20/project.properties Tue Jan 17 17:30:28 2006
@@ -21,12 +21,12 @@
maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
-jdo.jdocore.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
-jdo.jdoenhancer.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
-jdo.jdoruntime.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-runtime')}
-jdo.jdoquery.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-query')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
+jdo.jdocore.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+jdo.jdoenhancer.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
+jdo.jdoruntime.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-runtime')}
+jdo.jdoquery.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-query')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
@@ -48,14 +48,14 @@
jdo.enhancer.enhanced.dir = ${maven.build.dir}/test-classes
jdo.enhancer.main = org.apache.jdo.enhancer.Main
jdo.enhancer.options = -f -d "${jdo.enhancer.enhanced.dir}" -s "${jdo.enhancer.sourcepath}"
-jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoapi.jarfile}
-jdo.enhancer.classpath = ${jdo.jdoenhancer.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.api.jarfile}
+jdo.enhancer.classpath = ${jdo.jdoenhancer.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
jdo.annotationtest.main = org.apache.jdo.impl.enhancer.util.AnnotationTest
jdo.annotationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
jdo.augmentationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
jdo.xmlexists.main = org.apache.jdo.impl.model.jdo.xml.XMLExists
-jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoruntime.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoruntime.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
jdo.pcclasses.pc.classes= \
org.apache.jdo.pc.PCArrays \
Modified: db/jdo/trunk/fostore20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/fostore20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.xml (original)
+++ db/jdo/trunk/fostore20/project.xml Tue Jan 17 17:30:28 2006
@@ -24,7 +24,7 @@
<!-- ============== -->
<name>JDO2 Implementation (FOStore)</name>
<artifactId>jdo2-fostore</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
<description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
@@ -36,38 +36,34 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
- <artifactId>jdo2-core</artifactId>
+ <groupId>org.apache.jdo</groupId>
+ <artifactId>jdo2-runtime</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
- <artifactId>jdo2-enhancer</artifactId>
+ <groupId>org.apache.jdo</groupId>
+ <artifactId>jdo2-core</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
- <artifactId>jdo2-query</artifactId>
+ <groupId>org.apache.jdo</groupId>
+ <artifactId>jdo2-enhancer</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
- <artifactId>jdo2-runtime</artifactId>
+ <groupId>org.apache.jdo</groupId>
+ <artifactId>jdo2-query</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo-btree</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.4</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
@@ -78,6 +74,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
Modified: db/jdo/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/project.xml (original)
+++ db/jdo/trunk/project.xml Tue Jan 17 17:30:28 2006
@@ -22,7 +22,6 @@
<!-- Identification -->
<!-- ============== -->
<name>Java Data Objects (JDO)</name>
- <groupId>apache-jdo</groupId>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
Modified: db/jdo/trunk/query20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/query20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/query20/maven.xml (original)
+++ db/jdo/trunk/query20/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/query20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/query20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/query20/project.xml (original)
+++ db/jdo/trunk/query20/project.xml Tue Jan 17 17:30:28 2006
@@ -23,8 +23,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO2 Implementation (Query)</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-query</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
<description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
@@ -36,17 +37,17 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-core</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-runtime</artifactId>
<version>SNAPSHOT</version>
</dependency>
Modified: db/jdo/trunk/ri11/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/ri11/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/ri11/maven.xml (original)
+++ db/jdo/trunk/ri11/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/ri11/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/ri11/project.properties?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.properties (original)
+++ db/jdo/trunk/ri11/project.properties Tue Jan 17 17:30:28 2006
@@ -27,8 +27,8 @@
org/apache/jdo/impl/jdoql/jdoqlc/Optimizer.java
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo1-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
Modified: db/jdo/trunk/runtime20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/runtime20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/maven.xml (original)
+++ db/jdo/trunk/runtime20/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/runtime20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/runtime20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/project.xml (original)
+++ db/jdo/trunk/runtime20/project.xml Tue Jan 17 17:30:28 2006
@@ -23,8 +23,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO2 Implementation (Runtime)</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-runtime</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object 2.0 (JDO) Runtime</shortDescription>
<description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
@@ -36,12 +37,12 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-core</artifactId>
<version>SNAPSHOT</version>
</dependency>
Modified: db/jdo/trunk/tck11/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck11/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/tck11/maven.xml (original)
+++ db/jdo/trunk/tck11/maven.xml Tue Jan 17 17:30:28 2006
@@ -26,7 +26,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="build">
Modified: db/jdo/trunk/tck11/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck11/project.properties?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.properties (original)
+++ db/jdo/trunk/tck11/project.properties Tue Jan 17 17:30:28 2006
@@ -44,9 +44,9 @@
jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
-jdo.jdori.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-ri')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo1-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
+jdo.jdori.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo1-ri')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
Modified: db/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/maven.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/tck20/maven.xml (original)
+++ db/jdo/trunk/tck20/maven.xml Tue Jan 17 17:30:28 2006
@@ -27,7 +27,7 @@
<!-- ==================== -->
<goal name="default">
- <attainGoal name="jar:install-snapshot"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="help">
@@ -614,7 +614,7 @@
<!-- Directory where JDOTCK class files are located -->
<pathelement location="${jdo.tck.testclasses.dir}"/>
<!-- JDO jar file -->
- <pathelement location="${jdo.jdoapi.jarfile}"/>
+ <pathelement location="${jdo.api.jarfile}"/>
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Commons-logging jar file (for compiling pa/pc classes) -->
@@ -626,7 +626,7 @@
<!-- Directory where JDOTCK class files are located -->
<pathelement location="${jdo.tck.testclasses.dir}"/>
<!-- JDO jar file -->
- <pathelement location="${jdo.jdoapi.jarfile}"/>
+ <pathelement location="${jdo.api.jarfile}"/>
<!-- Commons logging jar file -->
<pathelement location="${logging.jarfile}"/>
<pathelement location="${jta.jarfile}" />
Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/project.properties?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Tue Jan 17 17:30:28 2006
@@ -18,6 +18,7 @@
# Maven repository
maven.repo.remote = http://www.ibiblio.org/maven, http://www.jpox.org/downloads/maven
+maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
# Flags indicating whether IUT supports application/datastore identity
iut.applicationidentity.supported = yes
@@ -57,7 +58,7 @@
jdori.runtck.sysproperties = -Xmx512m
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
jpox.jdori.jarfile = ${pom.getDependencyPath('jpox:jpox')}
jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
bcel.jarfile = ${pom.getDependencyPath('bcel:bcel')}
@@ -69,8 +70,8 @@
log4j.jarfile = ${pom.getDependencyPath('log4j')}
derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
-core20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
-enhancer20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
+core20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+enhancer20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
xmlparser =
# JDORI enhancer
Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/project.xml?rev=369999&r1=369998&r2=369999&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Tue Jan 17 17:30:28 2006
@@ -21,8 +21,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO2 Technology Compatibility Kit</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-tck</artifactId>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo.tck</package>
<shortDescription>Java Data Object 2.0 (JDO) TCK</shortDescription>
<description>The Java Data Objects 2.0 (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.
@@ -36,17 +37,17 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-enhancer</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo2-core</artifactId>
<version>SNAPSHOT</version>
</dependency>
Re: svn commit: r369999 - in /db/jdo/trunk: ./ api11/ api20/ btree/
core20/ enhancer20/ fostore20/ query20/ ri11/ runtime20/ tck11/ tck20/
Posted by Michael Bouschen <mb...@spree.de>.
Hi,
just a heads up:
this commit changes the groupId of all the subprojects. The groupId
determines the directory in the maven repository for the subproject and
it used to locate any jars defined in the project dependencies.
I propose to do a 'maven tck20.build' in the trunk directory. This will
build the tck20. More important it will build all the dependent jdo2
projects (api20, core20, enhancer20) and stores the generated jars under
the new groupId in the local maven repository.
Regards Michael
> Author: clr
> Date: Tue Jan 17 17:30:28 2006
> New Revision: 369999
>
> URL: http://svn.apache.org/viewcvs?rev=369999&view=rev
> Log:
> JDO-278 Change groupId to javax.jdo and org.apache.jdo
>
> Modified:
> db/jdo/trunk/api11/maven.xml
> db/jdo/trunk/api11/project.xml
> db/jdo/trunk/api20/maven.xml
> db/jdo/trunk/api20/project.xml
> db/jdo/trunk/btree/maven.xml
> db/jdo/trunk/btree/project.xml
> db/jdo/trunk/core20/maven.xml
> db/jdo/trunk/core20/project.xml
> db/jdo/trunk/enhancer20/maven.xml
> db/jdo/trunk/enhancer20/project.properties
> db/jdo/trunk/enhancer20/project.xml
> db/jdo/trunk/fostore20/maven.xml
> db/jdo/trunk/fostore20/project.properties
> db/jdo/trunk/fostore20/project.xml
> db/jdo/trunk/project.xml
> db/jdo/trunk/query20/maven.xml
> db/jdo/trunk/query20/project.xml
> db/jdo/trunk/ri11/maven.xml
> db/jdo/trunk/ri11/project.properties
> db/jdo/trunk/runtime20/maven.xml
> db/jdo/trunk/runtime20/project.xml
> db/jdo/trunk/tck11/maven.xml
> db/jdo/trunk/tck11/project.properties
> db/jdo/trunk/tck20/maven.xml
> db/jdo/trunk/tck20/project.properties
> db/jdo/trunk/tck20/project.xml
>
[...]
--
Michael Bouschen Tech@Spree Engineering GmbH
mailto:mbo.tech@spree.de http://www.tech.spree.de/
Tel.:++49/30/235 520-33 Buelowstr. 66
Fax.:++49/30/2175 2012 D-10783 Berlin