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/11 22:42:27 UTC
svn commit: r898076 - in /james/imap/trunk: parent/ stage/ stage/biz.aQute/
stage/com.h2database/ stage/commons-beanutils/ stage/commons-collections/
stage/commons-configuration/ stage/commons-dbcp/ stage/commons-io/
stage/commons-lang/ stage/commons-l...
Author: norman
Date: Mon Jan 11 21:42:26 2010
New Revision: 898076
URL: http://svn.apache.org/viewvc?rev=898076&view=rev
Log:
Cleanup stage (IMAP-112)
Added:
james/imap/trunk/stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom
james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom
Removed:
james/imap/trunk/stage/biz.aQute/
james/imap/trunk/stage/com.h2database/
james/imap/trunk/stage/commons-beanutils/
james/imap/trunk/stage/commons-collections/
james/imap/trunk/stage/commons-configuration/
james/imap/trunk/stage/commons-dbcp/
james/imap/trunk/stage/commons-io/
james/imap/trunk/stage/commons-lang/
james/imap/trunk/stage/commons-logging/
james/imap/trunk/stage/commons-pool/
james/imap/trunk/stage/junit/
james/imap/trunk/stage/log4j/
james/imap/trunk/stage/net.sourceforge.serp/
james/imap/trunk/stage/org.apache.derby/
james/imap/trunk/stage/org.apache.geronimo.genesis.config/
james/imap/trunk/stage/org.apache.geronimo.javamail/
james/imap/trunk/stage/org.apache.geronimo.specs/
james/imap/trunk/stage/org.apache.james/poms/apache-jspf-0.9.5.pom
james/imap/trunk/stage/org.apache.james/poms/apache-mime4j-0.4-SNAPSHOT.pom
james/imap/trunk/stage/org.apache.james/poms/james-parent-1.2.pom
james/imap/trunk/stage/org.apache.james/poms/james-project-1.3.pom
james/imap/trunk/stage/org.apache.openjpa/
james/imap/trunk/stage/org.apache.torque/
james/imap/trunk/stage/org.hamcrest/
james/imap/trunk/stage/org.jmock/
Modified:
james/imap/trunk/parent/pom.xml
james/imap/trunk/stage/pom.xml
Modified: james/imap/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=898076&r1=898075&r2=898076&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Mon Jan 11 21:42:26 2010
@@ -21,7 +21,8 @@
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.3</version>
+ <version>1.4RC3-SNAPSHOT</version>
+ <relativePath>../stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
@@ -134,19 +135,6 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>apache-m2-archived</id>
- <name>Apache Main M2 Repository</name>
- <url>http://people.apache.org/repo/m2-ibiblio-archived</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Added: james/imap/trunk/stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom?rev=898076&view=auto
==============================================================================
--- james/imap/trunk/stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom (added)
+++ james/imap/trunk/stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom Mon Jan 11 21:42:26 2010
@@ -0,0 +1,284 @@
+<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-parent</artifactId>
+ <name>Apache JAMES Parent POM</name>
+ <version>1.3RC3-SNAPSHOT</version>
+ <description>
+ The Apache JAMES Parent POM
+ </description>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>6</version>
+ </parent>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <prerequisites>
+ <maven>2.0.6</maven>
+ </prerequisites>
+
+ <modules>
+ <module>maven-skin</module>
+ <module>project</module>
+ </modules>
+
+ <url>http://james.apache.org/</url>
+ <inceptionYear>2006</inceptionYear>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ </dependencies>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://hudson.zones.apache.org/hudson/view/James/</url>
+ </ciManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/JAMES</url>
+ </issueManagement>
+
+ <developers>
+ <developer>
+ <id>bago</id>
+ <name>Stefano Bagnara</name>
+ <email>bago at apache.org</email>
+ <timezone>2</timezone>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>norman</id>
+ <name>Norman Maurer</name>
+ <email>norman at apache.org</email>
+ <timezone>2</timezone>
+ <roles>
+ <role>PMC Chair</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>serge</id>
+ <name>Serge Knystautas</name>
+ <email>sergek at lokitech.com</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>benrdf</id>
+ <name>Bernd Fondermann</name>
+ <email>bf_jak at brainlounge.de</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>sbrewin</id>
+ <name>Steve Brewin</name>
+ <email>sbrewin at synsys.com</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>hilmer</id>
+ <!-- This is not correctly handled by maven release plugin -->
+ <!-- <name>Søren Hilmer</name> -->
+ <name>Soren Hilmer</name>
+ <email>sh at widetrail.dk</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>noel</id>
+ <name>Noel J. Bergman</name>
+ <email>noel at devtech.com</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>danny</id>
+ <name>Danny Angus</name>
+ <email>danny at apache.org</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>adc</id>
+ <name>Alan D. Cabrera</name>
+ <email>list at toolazydogs.com</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>vincenzo</id>
+ <name>Vincenzo Gianferrari Pini</name>
+ <email>vincenzo.gianferraripini at praxis.it</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>rdonkin</id>
+ <name>Robert Burrell Donkin</name>
+ <email>rdonkin at apache.org</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>niklas</id>
+ <name>Niklas Therning</name>
+ <email>niklas(at)apache(dot)org</email>
+ <organization>Trillian AB</organization>
+ </developer>
+ <developer>
+ <id>jcheng</id>
+ <name>Joe Cheng</name>
+ <email>joe(at)joecheng(dot)com</email>
+ <properties>
+ <description>
+ Former author to the mime4j product
+ </description>
+ </properties>
+ </developer>
+ <developer>
+ <id>mwiederkehr</id>
+ <name>Markus Wiederkehr</name>
+ <email>mwiederkehr at apache.org</email>
+ <timezone />
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>olegk</id>
+ <name>Oleg Kalnichevski</name>
+ <email>olegk at apache.org</email>
+ <timezone />
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>manolo</id>
+ <name>Manuel Carrasco Monino</name>
+ <email>manolo at apache.org</email>
+ <timezone />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Rob Oxspring</name>
+ <properties>
+ <description>
+ Contributed to the mime4j product
+ </description>
+ </properties>
+ </contributor>
+ <contributor>
+ <name>Roger Fullerton</name>
+ <properties>
+ <description>
+ Wrote spfjava, the first spf implementation in java
+ </description>
+ </properties>
+ </contributor>
+ </contributors>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/tags/james-parent-1.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/tags/james-parent-1.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/james/project/tags/james-parent-1.2</url>
+ </scm>
+
+ <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>
+ <!-- Each project must override this with their own -->
+ <site>
+ <id>james-parent-website</id>
+ <url>scp://people.apache.org/www/james.apache.org/parent/</url>
+ </site>
+ </distributionManagement>
+
+ <profiles>
+ <!-- Use inherited apache release profile -->
+ </profiles>
+
+</project>
Added: james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom?rev=898076&view=auto
==============================================================================
--- james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom (added)
+++ james/imap/trunk/stage/org.apache.james/poms/james-project-1.4RC3-SNAPSHOT.pom Mon Jan 11 21:42:26 2010
@@ -0,0 +1,98 @@
+<?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>
+ <artifactId>james-parent</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>1.3RC3-SNAPSHOT</version>
+ <relativePath>../stage/org.apache.james/poms/james-parent-1.3RC3-SNAPSHOT.pom</relativePath>
+ </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/imap/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/stage/pom.xml?rev=898076&r1=898075&r2=898076&view=diff
==============================================================================
--- james/imap/trunk/stage/pom.xml (original)
+++ james/imap/trunk/stage/pom.xml Mon Jan 11 21:42:26 2010
@@ -50,6 +50,12 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
@@ -59,93 +65,11 @@
<groupId>${javax.activation.groupId}</groupId>
<artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <!-- used by torque -->
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>village</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
- </dependency>
+
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
- <!--
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org