Author: rdonkin
Date: Fri Jun 5 07:59:13 2009
New Revision: 781937
URL: http://svn.apache.org/viewvc?rev=781937&view=rev
Log:
IMAP-98 Upgrade jars, Ant and Maven builds
https://issues.apache.org/jira/browse/IMAP-98
Added:
james/imap/trunk/stage/org.apache.torque/
james/imap/trunk/stage/org.apache.torque/jars/
james/imap/trunk/stage/org.apache.torque/jars/torque-runtime-3.3.jar
(with props)
james/imap/trunk/stage/org.apache.torque/jars/village-3.3.jar (with props)
james/imap/trunk/stage/org.apache.torque/poms/
james/imap/trunk/stage/org.apache.torque/poms/torque-3.3.pom
james/imap/trunk/stage/org.apache.torque/poms/torque-runtime-3.3.pom
(with props)
james/imap/trunk/stage/org.apache.torque/poms/village-3.3.pom (with props)
Removed:
james/imap/trunk/stage/org.apache.db.torque/
james/imap/trunk/stage/village/
Modified:
james/imap/trunk/deployment/pom.xml
james/imap/trunk/include.properties
james/imap/trunk/parent/pom.xml
james/imap/trunk/torque/pom.xml
Modified: james/imap/trunk/deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/pom.xml?rev=781937&r1=781936&r2=781937&view=diff
==============================================================================
--- james/imap/trunk/deployment/pom.xml (original)
+++ james/imap/trunk/deployment/pom.xml Fri Jun 5 07:59:13 2009
@@ -108,8 +108,8 @@
</dependency>
<dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
</dependency>
<dependency>
Modified: james/imap/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/imap/trunk/include.properties?rev=781937&r1=781936&r2=781937&view=diff
==============================================================================
--- james/imap/trunk/include.properties (original)
+++ james/imap/trunk/include.properties Fri Jun 5 07:59:13 2009
@@ -56,10 +56,10 @@
path.lib.commonscollections=commons-collections/jars
path.lib.commonsio=commons-io/jars
path.lib.derby=org.apache.derby/jars
-path.lib.torque=org.apache.db.torque/jars
+path.lib.torque=org.apache.torque/jars
path.lib.concurrent=concurrent/jars
path.lib.commonslogging=commons-logging/jars
-path.lib.village=village/jars
+path.lib.village=org.apache.torque/jars
path.lib.commonsconfiguration=commons-configuration/jars
path.lib.commonsbeanutils=commons-beanutils/jars
path.lib.commonsdigester=commons-digester/jars
@@ -120,9 +120,9 @@
# ----- torque -----
-jarname.torque.jar=runtime-3.3-RC2.jar
+jarname.torque.jar=torque-runtime-3.3.jar
torque.jar=${path.lib.torque}/${jarname.torque.jar}
-jarname.village.jar=village-2.0.jar
+jarname.village.jar=village-3.3.jar
village.jar=${path.lib.village}/${jarname.village.jar}
jarname.commons-lang.jar=commons-lang-2.1.jar
commons-lang.jar=${path.lib.commonslang}/${jarname.commons-lang.jar}
Modified: james/imap/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=781937&r1=781936&r2=781937&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Fri Jun 5 07:59:13 2009
@@ -459,11 +459,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>village</groupId>
- <artifactId>village</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
@@ -538,11 +533,20 @@
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
- -->
+ -->
+
+ <!--
+ START Torque
+ -->
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>village</artifactId>
+ <version>${version.torque}</version>
+ </dependency>
<dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>runtime</artifactId>
- <version>3.3-RC2</version>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
+ <version>${version.torque}</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
@@ -557,7 +561,11 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
+ <!--
+ END Torque
+ -->
+
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -597,7 +605,8 @@
<version.commons-logging>1.1</version.commons-logging>
<version.apache-mime4j>0.6</version.apache-mime4j>
<version.javax.mail>1.4.1</version.javax.mail>
- <version.activation>1.1.1</version.activation>
+ <version.activation>1.1.1</version.activation>
+ <version.torque>3.3</version.torque>
</properties>
</project>
Added: james/imap/trunk/stage/org.apache.torque/jars/torque-runtime-3.3.jar
URL:
http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.torque/jars/torque-runtime-3.3.jar?rev=781937&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/imap/trunk/stage/org.apache.torque/jars/torque-runtime-3.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/imap/trunk/stage/org.apache.torque/jars/village-3.3.jar
URL:
http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.torque/jars/village-3.3.jar?rev=781937&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/imap/trunk/stage/org.apache.torque/jars/village-3.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/imap/trunk/stage/org.apache.torque/poms/torque-3.3.pom
URL:
http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.torque/poms/torque-3.3.pom?rev=781937&view=auto
==============================================================================
--- james/imap/trunk/stage/org.apache.torque/poms/torque-3.3.pom (added)
+++ james/imap/trunk/stage/org.apache.torque/poms/torque-3.3.pom Fri Jun 5
07:59:13 2009
@@ -0,0 +1,446 @@
+<?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
+ 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";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque</artifactId>
+ <packaging>pom</packaging>
+ <name>Torque</name>
+ <version>3.3</version>
+ <description>Common project descriptor for the Torque project</description>
+ <url>http://db.apache.org/torque</url>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/TORQUE</url>
+ </issueManagement>
+
+ <!-- is this necessary/correct ? -->
+ <!--ciManagement>
+ <system>gump</system>
+ <url>http://vmgump.apache.org/</url>
+ <notifiers>
+ <notifier>
+ <type>email</type>
+ <sendOnError>true</sendOnError>
+ <sendOnFailure>true</sendOnFailure>
+ <configuration>
+ <gumpRepositoryId>db</gumpRepositoryId>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement-->
+
+ <inceptionYear>2000</inceptionYear>
+
+ <mailingLists>
+ <mailingList>
+ <name>Torque User List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/db-torque-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Torque Developer List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/db-torque-dev/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <developers>
+ <developer>
+ <name>Jeffrey D. Brekke</name>
+ <id>brekke</id>
+ <email>[email protected]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Eric Dobbs</name>
+ <id>dobbs</id>
+ <email>[email protected]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Scott Eade</name>
+ <id>seade</id>
+ <email>[email protected]</email>
+ <organization>Backstage Technologies Pty. Ltd.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+10</timezone>
+ </developer>
+ <developer>
+ <name>Thomas Fischer</name>
+ <id>tfischer</id>
+ <email>[email protected]</email>
+ <organization>Seitenbau GmbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Stephen Haberman</name>
+ <id>stephenh</id>
+ <email>[email protected]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Humberto Hernandez</name>
+ <id>hhernandez</id>
+ <email>[email protected]</email>
+ <organization>Integrated Technology S.C.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Fedor Karpelevitch</name>
+ <id>fedor</id>
+ <email>[email protected]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Quinton McCombs</name>
+ <id>quintonm</id>
+ <email>[email protected]</email>
+ <organization>NEqualsOne</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email>[email protected]</email>
+ <organization>CollabNet</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Greg Monroe</name>
+ <id>gmonroe</id>
+ <email>[email protected]</email>
+ <organization>Duke Corporate Education</organization>
+ <timezone>-5</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Martin Poeschl</name>
+ <id>mpoeschl</id>
+ <email>[email protected]</email>
+ <organization>Tucana.at</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+18</timezone>
+ </developer>
+ <developer>
+ <name>Daniel Rall</name>
+ <id>dlr</id>
+ <email>[email protected]</email>
+ <organization>CollabNet, Inc.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Henning P. Schmiedehausen</name>
+ <id>henning</id>
+ <email>[email protected]</email>
+ <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste
mbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+2</timezone>
+ </developer>
+ <developer>
+ <name>Kurt Schrader</name>
+ <id>kschrader</id>
+ <email>[email protected]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jon Scott Stevens</name>
+ <id>jon</id>
+ <email>[email protected]</email>
+ <organization>CollabNet, Inc.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>James Taylor</name>
+ <id>jtaylor</id>
+ <email>[email protected]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Thomas Vandahl</name>
+ <id>tv</id>
+ <email>[email protected]</email>
+ <organization>TeWiSoft GmbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Patrick Carl</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Roger A. Caron</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Martin Goulet</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>M. Sean Gilligan</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>James Hillyerd</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Thierry Lach</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Johnny Macchione</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Markus M. May</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Raphael Pieroni</name>
+ <email>rafale_at_codehaus.org</email>
+ </contributor>
+ <contributor>
+ <name>Jonathan Purvis</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Thoralf Rickert</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>J. Russell Smyth</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Tarlika Elisabeth Schmitz</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Hilco Wijbenga</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Christoph Zenger</name>
+ <email>[email protected]</email>
+ </contributor>
+ </contributors>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>http://svn.apache.org/repos/asf/db/torque</connection>
+
<developerConnection>https://svn.apache.org/repos/asf/db/torque</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/db/torque</url>
+ </scm>
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <!--module>../runtime</module-->
+ <!--module>../generator</module-->
+ <!--module>../templates</module-->
+ <!--module>../maven2-plugin</module-->
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>apache-maven2</id>
+ <name>Apache Maven2 Repository</name>
+ <url>http://svn.apache.org/maven-snapshot-repository</url>
+ </repository>
+ <repository>
+ <id>apache-svn</id>
+ <name>Apache SVN Repository</name>
+ <url>http://svn.apache.org/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>maven-snapshot</id>
+ <name>Maven snapshot Repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2/</url>
+ </repository>
+ </repositories>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>common/turbine-checkstyle.xml</configLocation>
+ <headerLocation>common/checkstyle-license.txt</headerLocation>
+ </configuration>
+ </plugin>
+ <!-- the changelog plugin does not seem to work at the moment -->
+ <!-- plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin-->
+ <!--report>maven-file-activity-plugin</report-->
+ <!--report>maven-developer-activity-plugin</report-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <!--report>maven-simian-plugin</report-->
+ <!--report>maven-jcoverage-plugin</report-->
+ <!--report>maven-findbugs-plugin</report-->
+ <!--report>maven-linkcheck-plugin</report-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <distributionManagement>
+ <repository>
+ <id>apache.releases</id>
+ <name>Apache Release Distribution Repository</name>
+
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Added: james/imap/trunk/stage/org.apache.torque/poms/torque-runtime-3.3.pom
URL:
http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.torque/poms/torque-runtime-3.3.pom?rev=781937&view=auto
==============================================================================
--- james/imap/trunk/stage/org.apache.torque/poms/torque-runtime-3.3.pom (added)
+++ james/imap/trunk/stage/org.apache.torque/poms/torque-runtime-3.3.pom Fri
Jun 5 07:59:13 2009
@@ -0,0 +1,193 @@
+<?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
+ 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";>
+ <parent>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque</artifactId>
+ <version>3.3</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>torque-runtime</artifactId>
+ <packaging>jar</packaging>
+ <name>Torque Runtime</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jcs</groupId>
+ <artifactId>jcs</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <!--dependency>
+ <groupId>javax.sql</groupId>
+ <artifactId>jdbc-stdext</artifactId>
+ <version>2.0</version>
+ </dependency-->
+
+ <!--dependency>
+ <groupId>javax.naming</groupId>
+ <artifactId>jndi</artifactId>
+ <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>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</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>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </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>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- forkMode pertest is necessary for TorqueInstanceTest -->
+ <!-- to get a not-initialized TorqueInstance singleton -->
+ <forkMode>pertest</forkMode>
+ <excludes>
+ <exclude>**/BaseTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: james/imap/trunk/stage/org.apache.torque/poms/torque-runtime-3.3.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: james/imap/trunk/stage/org.apache.torque/poms/village-3.3.pom
URL:
http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.torque/poms/village-3.3.pom?rev=781937&view=auto
==============================================================================
--- james/imap/trunk/stage/org.apache.torque/poms/village-3.3.pom (added)
+++ james/imap/trunk/stage/org.apache.torque/poms/village-3.3.pom Fri Jun 5
07:59:13 2009
@@ -0,0 +1,59 @@
+<?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
+ 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";>
+ <parent>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque</artifactId>
+ <version>3.3</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>village</artifactId>
+ <packaging>jar</packaging>
+ <name>Village</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: james/imap/trunk/stage/org.apache.torque/poms/village-3.3.pom
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/imap/trunk/torque/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/pom.xml?rev=781937&r1=781936&r2=781937&view=diff
==============================================================================
--- james/imap/trunk/torque/pom.xml (original)
+++ james/imap/trunk/torque/pom.xml Fri Jun 5 07:59:13 2009
@@ -48,8 +48,8 @@
</dependency>
<dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
</dependency>
<dependency>
@@ -61,7 +61,7 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>village</groupId>
+ <groupId>org.apache.torque</groupId>
<artifactId>village</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
