Author: seade
Date: Tue Feb 5 21:08:39 2008
New Revision: 618896
URL: http://svn.apache.org/viewvc?rev=618896&view=rev
Log:
Use the most recent release of some test resources.
Modified:
db/torque/runtime/trunk/pom.xml
db/torque/runtime/trunk/project.xml
db/torque/test/trunk/test-project/pom.xml
Modified: db/torque/runtime/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/pom.xml?rev=618896&r1=618895&r2=618896&view=diff
==============================================================================
--- db/torque/runtime/trunk/pom.xml (original)
+++ db/torque/runtime/trunk/pom.xml Tue Feb 5 21:08:39 2008
@@ -116,12 +116,12 @@
<version>1.2.1</version>
</dependency-->
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>village</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>village</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
@@ -158,14 +158,14 @@
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.3</version>
+ <version>1.0.5</version>
<scope>test</scope>
</dependency>
Modified: db/torque/runtime/trunk/project.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/project.xml?rev=618896&r1=618895&r2=618896&view=diff
==============================================================================
--- db/torque/runtime/trunk/project.xml (original)
+++ db/torque/runtime/trunk/project.xml Tue Feb 5 21:08:39 2008
@@ -8,7 +8,7 @@
"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
+ 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
@@ -17,122 +17,135 @@
specific language governing permissions and limitations
under the License.
-->
+
<project>
- <extend>common/project.xml</extend>
- <pomVersion>3</pomVersion>
+ <extend>common/project.xml</extend>
+ <pomVersion>3</pomVersion>
<artifactId>torque</artifactId>
<groupId>torque</groupId>
- <id>torque</id>
- <name>Torque</name>
- <description>Torque is a persistence layer.</description>
- <shortDescription>Persistence Layer</shortDescription>
- <url>http://db.apache.org/torque/releases/torque-3.3/runtime/</url>
-
<siteDirectory>/www/db.apache.org/torque/releases/torque-3.3/runtime/</siteDirectory>
- <repository>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc</url>
- </repository>
- <dependencies>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <type>jar</type>
- <url>http://avalon.apache.org/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- <version>2.1</version>
- <type>jar</type>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>1.7.0</version>
+ <id>torque</id>
+ <name>Torque</name>
+
+ <description>Torque is a persistence layer.</description>
+ <shortDescription>Persistence Layer</shortDescription>
+ <url>http://db.apache.org/torque/releases/torque-3.3/runtime/</url>
+
<siteDirectory>/www/db.apache.org/torque/releases/torque-3.3/runtime/</siteDirectory>
+
+ <repository>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc</url>
+ </repository>
+
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <type>jar</type>
+ <url>http://avalon.apache.org/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
<type>jar</type>
<url>http://commons.apache.org/beanutils/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
<type>jar</type>
<url>http://commons.apache.org/collections/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.4</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.4</version>
<type>jar</type>
<url>http://commons.apache.org/configuration/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
<type>jar</type>
<url>http://commons.apache.org/dbcp/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
<type>jar</type>
<url>http://commons.apache.org/lang/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
<type>jar</type>
<url>http://commons.apache.org/logging/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.3</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
<type>jar</type>
<url>http://commons.apache.org/pool/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>jcs</groupId>
- <artifactId>jcs</artifactId>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>jcs</groupId>
+ <artifactId>jcs</artifactId>
<version>1.3</version>
<type>jar</type>
- <url>http://jakarta.apache.org/jcs/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
+ <url>http://jakarta.apache.org/jcs/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
@@ -143,90 +156,99 @@
<dist.bundle>true</dist.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>jdbc</groupId>
- <artifactId>jdbc</artifactId>
- <version>2.0</version>
+ <dependency>
+ <groupId>jdbc</groupId>
+ <artifactId>jdbc</artifactId>
+ <version>2.0</version>
<type>jar</type>
- <url>http://java.sun.com/products/jdbc/download.html#spec</url>
- </dependency>
- <dependency>
- <groupId>jndi</groupId>
- <artifactId>jndi</artifactId>
- <version>1.2.1</version>
+ <url>http://java.sun.com/products/jdbc/download.html#spec</url>
+ </dependency>
+
+ <dependency>
+ <groupId>jndi</groupId>
+ <artifactId>jndi</artifactId>
+ <version>1.2.1</version>
<type>jar</type>
- <url>http://java.sun.com/products/jndi/</url>
- </dependency>
- <dependency>
+ <url>http://java.sun.com/products/jndi/</url>
+ </dependency>
+
+ <dependency>
<groupId>torque</groupId>
- <artifactId>village</artifactId>
+ <artifactId>village</artifactId>
<version>${pom.currentVersion}</version>
<type>jar</type>
<url>http://db.apache.org/torque/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- <type>jar</type>
- <url>http://xerces.apache.org/xerces2-j/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- <type>jar</type>
- <url>http://xml.apache.org/commons/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
- <!-- Needed only for testing -->
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.4</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.3</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <type>jar</type>
- <url>http://www.junit.org</url>
- </dependency>
- </dependencies>
- <build>
- <nagEmailAddress>[email protected]</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/BaseTestCase.java</exclude>
- </excludes>
- </unitTest>
- <defaultGoal>jar:jar</defaultGoal>
- </build>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <type>jar</type>
+ <url>http://xerces.apache.org/xerces2-j/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ <type>jar</type>
+ <url>http://xml.apache.org/commons/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+
+ <!-- Needed only for testing -->
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.5</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.5</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <type>jar</type>
+ <url>http://www.junit.org</url>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <nagEmailAddress>[email protected]</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/BaseTestCase.java</exclude>
+ </excludes>
+ </unitTest>
+ <defaultGoal>jar:jar</defaultGoal>
+ </build>
</project>
Modified: db/torque/test/trunk/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/pom.xml?rev=618896&r1=618895&r2=618896&view=diff
==============================================================================
--- db/torque/test/trunk/test-project/pom.xml (original)
+++ db/torque/test/trunk/test-project/pom.xml Tue Feb 5 21:08:39 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -74,23 +74,23 @@
<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>
+ <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.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.5</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.torque</groupId>
- <artifactId>torque-maven-plugin</artifactId>
+ <artifactId>torque-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<schemaDir>target/torque/test/schema</schemaDir>
@@ -145,38 +145,38 @@
<useManagers>${torque.useManagers}</useManagers>
<generateBeans>${torque.generateBeans}</generateBeans>
<runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
- <driver>${torque.driver}</driver>
+ <driver>${torque.driver}</driver>
<url>${torque.database.url}</url>
<user>${torque.database.user}</user>
- <password>${torque.database.password}</password>
- <projectName>bookstore</projectName>
+ <password>${torque.database.password}</password>
+ <projectName>bookstore</projectName>
</configuration>
<executions>
<execution>
- <phase>generate-sources</phase>
+ <phase>generate-sources</phase>
<id>om</id>
<goals>
<goal>om</goal>
<goal>sql</goal>
- <goal>id-table-init-sql</goal>
+ <goal>id-table-init-sql</goal>
<goal>sqlExec</goal>
<goal>documentation</goal>
</goals>
</execution>
- <execution>
- <phase>test</phase>
- <id>data</id>
- <goals>
- <goal>datadtd</goal>
- <goal>datadump</goal>
- <goal>datasql</goal>
- </goals>
- <configuration>
- <xmlFile>target/torque/test/schema/bookstore-schema.xml</xmlFile>
-
<dataXmlFile>target/data/torque/bookstore-bookstore-all-data.xml</dataXmlFile>
- <dataDtd>target/data/torque/bookstore-data.dtd</dataDtd>
- </configuration>
- </execution>
+ <execution>
+ <phase>test</phase>
+ <id>data</id>
+ <goals>
+ <goal>datadtd</goal>
+ <goal>datadump</goal>
+ <goal>datasql</goal>
+ </goals>
+ <configuration>
+ <xmlFile>target/torque/test/schema/bookstore-schema.xml</xmlFile>
+
<dataXmlFile>target/data/torque/bookstore-bookstore-all-data.xml</dataXmlFile>
+ <dataDtd>target/data/torque/bookstore-data.dtd</dataDtd>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
