Author: tfischer
Date: Sat May 5 07:20:19 2007
New Revision: 535529
URL: http://svn.apache.org/viewvc?view=rev&rev=535529
Log:
- changed the artifact id of some maven2 artifacts:
runtime -> torque-runtime
generator -> torque-generator
templates -> torque-templates
- changed the group id of the maven2 artifacts from org.apache.db.torque to
org.apache.torque.
- added missing dependencies to the maven2 build of the test project.
These change only affects maven2 users.
Modified:
db/torque/common/trunk/pom.xml
db/torque/generator/trunk/pom.xml
db/torque/maven2-plugin/trunk/pom.xml
db/torque/runtime/trunk/pom.xml
db/torque/site/trunk/xdocs/changes.xml
db/torque/templates/trunk/pom.xml
db/torque/test/trunk/test-project/pom.xml
Modified: db/torque/common/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/common/trunk/pom.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/common/trunk/pom.xml (original)
+++ db/torque/common/trunk/pom.xml Sat May 5 07:20:19 2007
@@ -24,11 +24,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.db.torque</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
<packaging>pom</packaging>
<name>Torque</name>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
<description>Common project descriptor for the Torque project</description>
<url>http://db.apache.org/torque</url>
Modified: db/torque/generator/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/pom.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/generator/trunk/pom.xml (original)
+++ db/torque/generator/trunk/pom.xml Sat May 5 07:20:19 2007
@@ -22,14 +22,14 @@
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>org.apache.db.torque</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>generator</artifactId>
+ <artifactId>torque-generator</artifactId>
<packaging>jar</packaging>
<name>Torque Generator</name>
@@ -65,8 +65,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>templates</artifactId>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-templates</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
Modified: db/torque/maven2-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/pom.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/maven2-plugin/trunk/pom.xml (original)
+++ db/torque/maven2-plugin/trunk/pom.xml Sat May 5 07:20:19 2007
@@ -22,9 +22,9 @@
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>org.apache.db.torque</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,8 +62,8 @@
</dependency>
<dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>generator</artifactId>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-generator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: db/torque/runtime/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/pom.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/runtime/trunk/pom.xml (original)
+++ db/torque/runtime/trunk/pom.xml Sat May 5 07:20:19 2007
@@ -22,14 +22,14 @@
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>org.apache.db.torque</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>runtime</artifactId>
+ <artifactId>torque-runtime</artifactId>
<packaging>jar</packaging>
<name>Torque Runtime</name>
Modified: db/torque/site/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/changes.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/site/trunk/xdocs/changes.xml (original)
+++ db/torque/site/trunk/xdocs/changes.xml Sat May 5 07:20:19 2007
@@ -31,6 +31,26 @@
<body>
<release version="3.3-RC3" date="in SVN">
+ <action type="change" dev="tfischer">
+ changed the artifact id of some maven2 artifacts:
+ <ul>
+ <li>
+ runtime -> torque-runtime
+ </li>
+ <li>
+ generator -> torque-generator
+ </li>
+ <li>
+ templates -> torque-templates
+ </li>
+ </ul>
+ This change only affects maven2 users.
+ </action>
+ <action type="change" dev="tfischer">
+ changed the group id of the maven2 artifacts from
+ org.apache.db.torque to org.apache.torque.
+ This change only affects maven2 users.
+ </action>
<action type="fix" dev="tfischer" issue="TORQUE-93">
Fixed problem with somePeer.doDelete(Criteria) if criteria contains
a join.
Modified: db/torque/templates/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/templates/trunk/pom.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/templates/trunk/pom.xml (original)
+++ db/torque/templates/trunk/pom.xml Sat May 5 07:20:19 2007
@@ -22,14 +22,14 @@
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>org.apache.db.torque</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>templates</artifactId>
+ <artifactId>torque-templates</artifactId>
<packaging>jar</packaging>
<name>Torque Generator Templates</name>
Modified: db/torque/test/trunk/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/pom.xml?view=diff&rev=535529&r1=535528&r2=535529
==============================================================================
--- db/torque/test/trunk/test-project/pom.xml (original)
+++ db/torque/test/trunk/test-project/pom.xml Sat May 5 07:20:19 2007
@@ -22,9 +22,9 @@
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>org.apache.db.torque</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,14 +41,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>runtime</artifactId>
- <groupId>org.apache.db.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
+ <groupId>org.apache.torque</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- needed for SQLToAppDataRuntimeTest -->
- <artifactId>generator</artifactId>
- <groupId>org.apache.db.torque</groupId>
+ <artifactId>torque-generator</artifactId>
+ <groupId>org.apache.torque</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -74,7 +74,24 @@
<version>${torque.test.driver.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -118,8 +135,9 @@
</plugin>
<plugin>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>torque-maven-plugin</artifactId>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-maven-plugin</artifactId>
+ <version>${project.version}</version>
<configuration>
<schemaDir>target/torque/test/schema</schemaDir>
<targetDatabase>${torque.targetDatabase}</targetDatabase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
