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 2011/01/14 04:16:40 UTC
svn commit: r1058847 - in /db/jdo/trunk: api/pom.xml exectck/pom.xml pom.xml
tck/pom.xml
Author: mcaisse
Date: Fri Jan 14 03:16:39 2011
New Revision: 1058847
URL: http://svn.apache.org/viewvc?rev=1058847&view=rev
Log:
JDO-647 MBO's patch for managing dependency version numbers at top level pom.xml
Modified:
db/jdo/trunk/api/pom.xml
db/jdo/trunk/exectck/pom.xml
db/jdo/trunk/pom.xml
db/jdo/trunk/tck/pom.xml
Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1058847&r1=1058846&r2=1058847&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Fri Jan 14 03:16:39 2011
@@ -17,12 +17,21 @@
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <parent>
+ <groupId>javax.jdo</groupId>
+ <artifactId>root</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
<name>JDO API</name>
<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>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>test/java</testSourceDirectory>
@@ -123,24 +132,24 @@
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>transaction-api</artifactId>
- <version>1.1</version>
+ <version>${transaction.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <version>${ant.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.0</version>
+ <version>${geronimo-jpa.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: db/jdo/trunk/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/pom.xml?rev=1058847&r1=1058846&r2=1058847&view=diff
==============================================================================
--- db/jdo/trunk/exectck/pom.xml (original)
+++ db/jdo/trunk/exectck/pom.xml Fri Jan 14 03:16:39 2011
@@ -1,5 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>javax.jdo</groupId>
+ <artifactId>root</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-exectck</artifactId>
@@ -29,22 +36,22 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>10.6.1.0</version>
+ <version>${derbytools.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>javax.jdo</groupId>
@@ -54,67 +61,37 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <version>2.2.0-release</version>
+ <version>${datanucleus-core.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
- <version>2.2.0-release</version>
+ <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
- <version>2.1.2</version>
+ <version>${datanucleus-enhancer.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jpa</artifactId>
- <version>2.1.4</version>
+ <version>${datanucleus-jpa.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0</version>
+ <version>${spring-core.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0</version>
+ <version>${spring-beans.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-connectionpool</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.0.2</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.0</version>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
Modified: db/jdo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/pom.xml?rev=1058847&r1=1058846&r2=1058847&view=diff
==============================================================================
--- db/jdo/trunk/pom.xml (original)
+++ db/jdo/trunk/pom.xml Fri Jan 14 03:16:39 2011
@@ -1,25 +1,168 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>javax.jdo</groupId>
<artifactId>root</artifactId>
- <version>3.0</version>
+ <version>3.1-SNAPSHOT</version>
<packaging>pom</packaging>
-</project>
+ <name>Java Data Objects (JDO)</name>
+ <description>The Java Data Objects (JDO) API is a standard interface-based
+Java model abstraction of persistence, developed as Java Specification
+Requests (JSR 12 and 243) under the auspices of the Java Community Process.</description>
+ <url>http://db.apache.org/jdo</url>
+ <inceptionYear>2005</inceptionYear>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <properties>
+ <transaction.version>1.1</transaction.version>
+ <ant.version>1.7.0</ant.version>
+ <junit.version>3.8.1</junit.version>
+ <geronimo-jpa.version>1.0</geronimo-jpa.version>
+ <datanucleus-core.version>2.1.0-release</datanucleus-core.version>
+ <datanucleus-rdbms.version>2.1.0-release</datanucleus-rdbms.version>
+ <datanucleus-enhancer.version>2.1.0-release</datanucleus-enhancer.version>
+ <datanucleus-jpa.version>2.1.0-release</datanucleus-jpa.version>
+ <datanucleus-connectionpool.version>2.0.1</datanucleus-connectionpool.version>
+ <derby.version>10.6.1.0</derby.version>
+ <derbytools.version>10.6.1.0</derbytools.version>
+ <asm.version>3.0</asm.version>
+ <log4j.version>1.2.13</log4j.version>
+ <commons-logging.version>1.1</commons-logging.version>
+ <commons-io.version>1.4</commons-io.version>
+ <commons-collections.version>3.2</commons-collections.version>
+ <commons-dbcp.version>1.2.1</commons-dbcp.version>
+ <commons-pool.version>1.3</commons-pool.version>
+ <spring-core.version>2.0</spring-core.version>
+ <spring-beans.version>2.0</spring-beans.version>
+ <c3p0.version>0.9.0.2</c3p0.version>
+ </properties>
+ <mailingLists>
+ <mailingList>
+ <name>JDO User List</name>
+ <subscribe>jdo-user-subscribe@db.apache.org</subscribe>
+ <unsubscribe>jdo-user-unsubscribe@db.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/db-jdo-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>JDO Developer List</name>
+ <subscribe>jdo-dev-subscribe@db.apache.org</subscribe>
+ <unsubscribe>jdo-dev-unsubscribe@db.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/db-jdo-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>JDO Commits List</name>
+ <subscribe>jdo-commits-subscribe@db.apache.org</subscribe>
+ <unsubscribe>jdo-commits-unsubscribe@db.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/db-jdo-commits/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>clr</id>
+ <name>Craig Russell</name>
+ <email>Craig.Russell@Sun.COM</email>
+ <organization>Sun Microsystems, Inc.</organization>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>mbo</id>
+ <name>Michael Bouschen</name>
+ <email>mbo.tech@spree.de</email>
+ <organization>Tech@Spree Engineering GmbH</organization>
+ <timezone>1</timezone>
+ </developer>
+ <developer>
+ <id>brazil</id>
+ <name>Michael Watzek</name>
+ <email>mwa.tech@spree.de</email>
+ <organization>Tech@Spree Engineering GmbH</organization>
+ <timezone>1</timezone>
+ </developer>
+ <developer>
+ <id>mcaisse</id>
+ <name>Michelle Caisse</name>
+ <email>Michelle.Caisse@Sun.COM</email>
+ <organization>Sun Microsystems, Inc.</organization>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>madams</id>
+ <name>Matthew Adams</name>
+ <email>matthew@matthewadams.me</email>
+ <organization>Apache.org</organization>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>mzaun</id>
+ <name>Martin Zaun</name>
+ <email>martin.zaun@Sun.COM</email>
+ <organization>Sun Microsystems, Inc.</organization>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>ebengtson</id>
+ <name>Erik Bengtson</name>
+ <email>erik@jpox.org</email>
+ <organization>JPOX</organization>
+ <timezone>1</timezone>
+ </developer>
+ <developer>
+ <id>geirm</id>
+ <name>Geir Magnusson, Jr.</name>
+ <email>geirm@apache.org</email>
+ <organization>Apache.org</organization>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>brianm</id>
+ <name>Brian McCallister</name>
+ <email>brianm@apache.org</email>
+ <organization>Apache.org</organization>
+ <timezone>-8</timezone>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>${pom.name} ${pom.currentVersion}</doctitle>
+ <windowtitle>${pom.name} ${pom.currentVersion}</windowtitle>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${basedir}/../jdo_checks.xml</configLocation>
+ <headerLocation>${basedir}/../LICENSE.txt</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1058847&r1=1058846&r2=1058847&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Fri Jan 14 03:16:39 2011
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <groupId>javax.jdo</groupId>
+ <artifactId>root</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-tck</artifactId>
@@ -11,6 +18,7 @@
The JDO TCK is a test suite designed to test implementations of the Java Data Objects specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
NOTE!! There are no unit tests in this project.</description>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
@@ -160,97 +168,97 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <version>2.2.0-release</version>
+ <version>${datanucleus-core.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
- <version>2.2.0-release</version>
+ <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
- <version>2.1.2</version>
+ <version>${datanucleus-enhancer.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jpa</artifactId>
- <version>2.1.4</version>
+ <version>${datanucleus-jpa.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>10.6.1.0</version>
+ <version>${derbytools.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>3.0</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>transaction-api</artifactId>
- <version>1.1</version>
+ <version>${transaction.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0</version>
+ <version>${spring-core.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0</version>
+ <version>${spring-beans.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-connectionpool</artifactId>
- <version>2.0.1</version>
+ <version>${datanucleus-connectionpool.version}</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.0.2</version>
+ <version>${c3p0.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.3</version>
+ <version>${commons-pool.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2</version>
+ <version>${commons-collections.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.0</version>
+ <version>${geronimo-jpa.version}</version>
</dependency>
</dependencies>
<reporting>