Author: tfischer
Date: Sun Sep 7 05:27:28 2008
New Revision: 692828
URL: http://svn.apache.org/viewvc?rev=692828&view=rev
Log:
- updated parent location
- removed "type" attributes from jars (jar is default)
- nailed village version to 3.3
Modified:
db/torque/torque4/trunk/torque-generator/pom.xml
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=692828&r1=692827&r2=692828&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Sun Sep 7 05:27:28 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
@@ -17,144 +17,134 @@
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";>
- <parent>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque</artifactId>
- <version>3.3.1-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>torque-generator</artifactId>
- <packaging>jar</packaging>
- <name>Torque Generator</name>
-
- <dependencies>
- <dependency>
- <artifactId>ant</artifactId>
- <type>jar</type>
- <groupId>org.apache.ant</groupId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <artifactId>commons-collections</artifactId>
- <type>jar</type>
- <groupId>commons-collections</groupId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <artifactId>commons-lang</artifactId>
- <type>jar</type>
- <groupId>commons-lang</groupId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- <groupId>commons-logging</groupId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-templates</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
+<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>org.apache.torque</groupId>
+ <artifactId>torque-maven-parent</artifactId>
+ <version>4.0-alpha1-SNAPSHOT</version>
+ <relativePath>../torque-maven-parent</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>torque-generator</artifactId>
+ <packaging>jar</packaging>
+ <name>Torque Generator</name>
+
+ <dependencies>
+ <dependency>
+ <artifactId>ant</artifactId>
+ <groupId>org.apache.ant</groupId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-templates</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <type>jar</type>
- <version>1.5</version>
- </dependency>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
<dependency>
<groupId>org.apache.texen</groupId>
<artifactId>texen</artifactId>
- <type>jar</type>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.torque</groupId>
<artifactId>village</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
+ <version>3.3</version>
+ </dependency>
+ <dependency>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ <version>2.0.2</version>
</dependency>
- <dependency>
- <artifactId>xercesImpl</artifactId>
- <type>jar</type>
- <groupId>xerces</groupId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <artifactId>xml-apis</artifactId>
- <type>jar</type>
- <groupId>xml-apis</groupId>
- <version>2.0.2</version>
- </dependency>
-
- <dependency>
- <artifactId>junit</artifactId>
- <type>jar</type>
- <groupId>junit</groupId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <!-- needed for velocity in the ant version -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
-
- <resources>
- <resource>
- <targetPath>org/apache/torque</targetPath>
- <filtering>false</filtering>
- <directory>src/conf</directory>
- <includes>
- <include>default.properties</include>
- </includes>
- </resource>
- <resource>
- <targetPath>org/apache/torque/engine/database/transform</targetPath>
- <filtering>false</filtering>
- <directory>src/dtd</directory>
- <includes>
- <include>database*.dtd</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/conf</directory>
- <includes>
- <include>commons-logging.properties</include>
- <include>log4j.properties</include>
- <include>simplelog.properties</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/BaseTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- needed for velocity in the ant version -->
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <targetPath>org/apache/torque</targetPath>
+ <filtering>false</filtering>
+ <directory>src/conf</directory>
+ <includes>
+ <include>default.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>org/apache/torque/engine/database/transform</targetPath>
+ <filtering>false</filtering>
+ <directory>src/dtd</directory>
+ <includes>
+ <include>database*.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/conf</directory>
+ <includes>
+ <include>commons-logging.properties</include>
+ <include>log4j.properties</include>
+ <include>simplelog.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/BaseTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
