You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/09 18:20:18 UTC
svn commit: r897496 - in /james/server/trunk: ./ stage/
stage/backport-util-concurrent/ stage/com.thoughtworks.xstream/
stage/dnsjava/ stage/javax.jcr/ stage/mstor/ stage/mx4j/
stage/net.sourceforge.serp/ stage/org.apache.james/poms/
stage/org.bouncyca...
Author: norman
Date: Sat Jan 9 17:20:17 2010
New Revision: 897496
URL: http://svn.apache.org/viewvc?rev=897496&view=rev
Log:
more cleanup of stage (JAMES-946)
Added:
james/server/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom
Removed:
james/server/trunk/stage/backport-util-concurrent/
james/server/trunk/stage/com.thoughtworks.xstream/
james/server/trunk/stage/dnsjava/
james/server/trunk/stage/javax.jcr/
james/server/trunk/stage/mstor/
james/server/trunk/stage/mx4j/
james/server/trunk/stage/net.sourceforge.serp/
james/server/trunk/stage/org.bouncycastle/
Modified:
james/server/trunk/pom.xml
james/server/trunk/stage/pom.xml
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=897496&r1=897495&r2=897496&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sat Jan 9 17:20:17 2010
@@ -22,7 +22,7 @@
<artifactId>james-server-root</artifactId>
<groupId>org.apache.james</groupId>
<version>1.3RC3-SNAPSHOT</version>
- <relativePath>stage/org.apache.org/poms/james-server-root-1.2.pom</relativePath>
+ <relativePath>stage/org.apache.james/poms/james-server-root-1.3RC3-SNAPSHOT.pom</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
@@ -571,6 +571,10 @@
<groupId>log4j</groupId>
</exclusion>
<exclusion>
+ <artifactId>dnsjava</artifactId>
+ <groupId>dnsjava</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
</exclusion>
@@ -868,7 +872,7 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.0.5</version>
+ <version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.excalibur.components</groupId>
Added: james/server/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom?rev=897496&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom Sat Jan 9 17:20:17 2010
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <!--
+ 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.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <name>Apache JAMES Project</name>
+ <version>1.4RC3-SNAPSHOT</version>
+ <description>
+ The Apache JAMES Project
+ </description>
+
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-parent</artifactId>
+ <version>1.3RC3-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>server</module>
+ </modules>
+
+ <url>http://james.apache.org/</url>
+ <inceptionYear>2006</inceptionYear>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ </dependencies>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/JAMES</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <!-- Each project must override this with their own -->
+ <site>
+ <id>james-website</id>
+ <url>scp://people.apache.org/www/james.apache.org/</url>
+ </site>
+ </distributionManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>Server Development (including components)</name>
+ <subscribe>server-dev-subscribe@james.apache.org</subscribe>
+ <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
+ <post>server-dev@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Server User</name>
+ <subscribe>server-user-subscribe@james.apache.org</subscribe>
+ <unsubscribe>server-user-unsubscribe@james.apache.org</unsubscribe>
+ <post>server-user@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Mime4J</name>
+ <subscribe>mime4j-dev-subscribe@james.apache.org</subscribe>
+ <unsubscribe>mime4j-dev-unsubscribe@james.apache.org</unsubscribe>
+ <post>mime4j-dev@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-mime4j-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>General</name>
+ <subscribe>general-subscribe@james.apache.org</subscribe>
+ <unsubscribe>general-unsubscribe@james.apache.org</unsubscribe>
+ <post>general@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-general/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Website Development</name>
+ <subscribe>site-dev-subscribe@james.apache.org</subscribe>
+ <unsubscribe>site-dev-unsubscribe@james.apache.org</unsubscribe>
+ <post>site-dev@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-site-dev/</archive>
+ </mailingList>
+ </mailingLists>
+</project>
Modified: james/server/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=897496&r1=897495&r2=897496&view=diff
==============================================================================
--- james/server/trunk/stage/pom.xml (original)
+++ james/server/trunk/stage/pom.xml Sat Jan 9 17:20:17 2010
@@ -131,25 +131,6 @@
</dependency>
<dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mstor</groupId>
- <artifactId>mstor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org