Author: bago
Date: Wed Jan 17 05:32:57 2007
New Revision: 497017
URL: http://svn.apache.org/viewvc?view=rev&rev=497017
Log:
Updated torque to 3.3-RC1 and commons-digester to 1.8.
Also updated pom.xml for the new dependencies.
Added:
james/server/trunk/lib/commons-digester-1.8.jar (with props)
james/server/trunk/lib/torque-3.3-RC1.jar (with props)
Removed:
james/server/trunk/lib/commons-digester-1.5.modified.jar
james/server/trunk/lib/torque-3.2.jar
Modified:
james/server/trunk/include.properties
james/server/trunk/pom.xml
Modified: james/server/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/include.properties?view=diff&rev=497017&r1=497016&r2=497017
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Wed Jan 17 05:32:57 2007
@@ -98,7 +98,7 @@
# ----- torque -----
-torque.jar=torque-3.2.jar
+torque.jar=torque-3.3-RC1.jar
village.jar=village-2.0.jar
commons-lang.jar=commons-lang-2.1.jar
commons-configuration.jar=commons-configuration-1.1.jar
@@ -110,4 +110,4 @@
# ----- sieve-----
jsieve.jar=jsieve-0.2-SNAPSHOT.jar
-commons-digester.jar=commons-digester-1.5.modified.jar
+commons-digester.jar=commons-digester-1.8.jar
Added: james/server/trunk/lib/commons-digester-1.8.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/lib/commons-digester-1.8.jar?view=auto&rev=497017
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/lib/commons-digester-1.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/lib/torque-3.3-RC1.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/lib/torque-3.3-RC1.jar?view=auto&rev=497017
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/lib/torque-3.3-RC1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?view=diff&rev=497017&r1=497016&r2=497017
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Jan 17 05:32:57 2007
@@ -1,134 +1,86 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
- 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.
--->
-<!--
- | DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER
- |
- | This file is only intended to be used to build the james-server
- | website. It must not be used to build packages for james-server
- | application.
- |
- | DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER
- -->
-<project>
+<?xml version="1.0" encoding="ISO-8859-15"?><project>
+ <parent>
+ <artifactId>james-server-root</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
<name>Apache JAMES Server</name>
<version>3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <description>
- The Apache Java Enterprise Mail Server (a.k.a. JAMES Server)
- </description>
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-root</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+ <description>The Apache Java Enterprise Mail Server (a.k.a. JAMES
Server)</description>
<url>http://james.apache.org/server/2.3.0/</url>
<inceptionYear>2002</inceptionYear>
-
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/james/server/trunk
- </connection>
- <developerConnection>
- scm:svn:https://[EMAIL PROTECTED]/repos/asf/james/server/trunk
- </developerConnection>
- <url>
- http://svn.apache.org/viewcvs.cgi/james/server/trunk?root=Apache-SVN
- </url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/james/server/trunk</connection>
+ <developerConnection>scm:svn:https://[EMAIL
PROTECTED]/repos/asf/james/server/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/james/server/trunk?root=Apache-SVN</url>
</scm>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.zone</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<repositories>
-
<repository>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
<id>bago-dist-m1</id>
<name>Temporary Repository</name>
<url>http://people.apache.org/~bago/maven/dist-m1</url>
<layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
</repository>
-
<repository>
+ <releases />
+ <snapshots />
<id>central</id>
<name>Apache Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
</repository>
-
<repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
<releases>
<enabled>false</enabled>
</releases>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
</repository>
-
-<!--
- <repository>
- <id>local-server-3rd-party-m1</id>
- <name>Local Server third party repository</name>
- <url>file://${basedir}/repos/third-party-m1</url>
- <layout>legacy</layout>
- <releases>
- <enabled>true</enabled>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- </repository>
- -->
-
<repository>
+ <snapshots />
<id>java.net</id>
<name>Java Net main repository</name>
<url>https://maven-repository.dev.java.net/nonav/repository/</url>
- <snapshots><enabled>true</enabled></snapshots>
<layout>legacy</layout>
</repository>
-
<repository>
- <id>ibiblio</id>
- <name>Main maven repo</name>
- <url>http://repo1.maven.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
+ <id>ibiblio</id>
+ <name>Main maven repo</name>
+ <url>http://repo1.maven.org/maven2</url>
</repository>
-
</repositories>
-
- <dependencies verbose="true">
-
- <!-- NEED TO DEAL WITH THESE JARS -->
+ <dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk14</artifactId>
@@ -139,207 +91,190 @@
<artifactId>bcmail-jdk14-workaround</artifactId>
<version>129</version>
</dependency>
- <!-- NEED TO DEAL WITH THESE JARS -->
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>jspf</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>jsieve</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.1ea-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3</version>
</dependency>
-
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
<version>4.3</version>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
<exclusion>
- <groupId>jmock</groupId>
<artifactId>jmock</artifactId>
+ <groupId>jmock</groupId>
</exclusion>
<exclusion>
- <groupId>xalan</groupId>
<artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
</exclusion>
<exclusion>
- <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId>
+ <groupId>xml-apis</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
<exclusions>
<exclusion>
- <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-connection</groupId>
<artifactId>cornerstone-connection-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-connection</groupId>
<artifactId>cornerstone-connection-impl</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-impl</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
- <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>cornerstone-datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>excalibur-datasource</groupId>
<artifactId>excalibur-datasource</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
- <groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-instrumented</artifactId>
+ <groupId>excalibur-pool</groupId>
</exclusion>
<exclusion>
- <groupId>excalibur-component</groupId>
<artifactId>excalibur-component</artifactId>
+ <groupId>excalibur-component</groupId>
</exclusion>
<exclusion>
- <groupId>excalibur-component</groupId>
<artifactId>excalibur-testcase</artifactId>
+ <groupId>excalibur-component</groupId>
</exclusion>
<exclusion>
- <groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress</artifactId>
+ <groupId>excalibur-fortress</groupId>
</exclusion>
<exclusion>
- <groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-container-api</artifactId>
+ <groupId>excalibur-fortress</groupId>
</exclusion>
<exclusion>
- <groupId>excalibur-logger</groupId>
<artifactId>excalibur-logger</artifactId>
+ <groupId>excalibur-logger</groupId>
</exclusion>
<exclusion>
- <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <groupId>hsqldb</groupId>
</exclusion>
<exclusion>
- <groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-meta</artifactId>
+ <groupId>excalibur-fortress</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>cornerstone-datasources</groupId>
<artifactId>cornerstone-datasources-impl</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
- <groupId>d-haven-managed-pool</groupId>
<artifactId>d-haven-managed-pool</artifactId>
+ <groupId>d-haven-managed-pool</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>cornerstone-scheduler</groupId>
<artifactId>cornerstone-scheduler-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-scheduler</groupId>
<artifactId>cornerstone-scheduler-impl</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-store</groupId>
<artifactId>cornerstone-store-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>cornerstone-store</groupId>
<artifactId>cornerstone-store-impl</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.0.1</version>
+ <version>2.0.3</version>
</dependency>
-
<dependency>
<groupId>excalibur-thread</groupId>
<artifactId>excalibur-thread-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>excalibur-thread</groupId>
<artifactId>excalibur-thread-impl</artifactId>
<version>2.1</version>
<exclusions>
<exclusion>
- <groupId>junitperf</groupId>
<artifactId>junitperf</artifactId>
+ <groupId>junitperf</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -349,130 +284,81 @@
<version>2.1</version>
<exclusions>
<exclusion>
- <groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-javamail</artifactId>
+ <groupId>geronimo-spec</groupId>
</exclusion>
<exclusion>
- <groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
+ <groupId>geronimo-spec</groupId>
</exclusion>
<exclusion>
- <groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
+ <groupId>servletapi</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.1.0</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.3.1</version>
- <scope>test</scope>
+ <version>10.2.2.0</version>
</dependency>
-
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
</dependency>
-
<dependency>
<groupId>mstor</groupId>
<artifactId>mstor</artifactId>
<version>0.9.9</version>
</dependency>
-
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2</version>
</dependency>
-
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>1.1.1</version>
</dependency>
-
<dependency>
<groupId>torque</groupId>
<artifactId>torque</artifactId>
- <version>3.2</version>
+ <version>3.3-RC1</version>
<exclusions>
<exclusion>
- <groupId>jndi</groupId>
<artifactId>jndi</artifactId>
+ <groupId>jndi</groupId>
</exclusion>
- <!-- this would require an older version of avalon and james would not
build -->
<exclusion>
- <groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
</exclusion>
<exclusion>
- <groupId>javax.sql</groupId>
<artifactId>jdbc-stdext</artifactId>
+ <groupId>javax.sql</groupId>
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
-
- <distributionManagement>
- <site>
- <id>server-trunk-website</id>
- <url>scp://people.apache.org/www/james.apache.org/server/trunk/</url>
- </site>
- </distributionManagement>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
-
- <testResources>
- <testResource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.zone</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<reporting>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <!-- Removed because it seems to have bugs.
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
@@ -494,16 +380,15 @@
<minimumTokens>100</minimumTokens>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
</plugin>
</plugins>
</reporting>
-
+ <distributionManagement>
+ <site>
+ <id>server-trunk-website</id>
+ <url>scp://people.apache.org/www/james.apache.org/server/trunk/</url>
+ </site>
+ </distributionManagement>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
