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 fe...@apache.org on 2011/10/20 06:49:26 UTC
svn commit: r1186613 - in /james/trunk/sandbox/felixk/server: ./ cli/
container-spring/ core/ data-api/ data-library/ dnsservice-api/
dnsservice-dnsjava/ dnsservice-library/ fetchmail/ file/ filesystem-api/
hbase/ imapserver/ jcr/ jdbc/ jpa/ ldap/ life...
Author: felixk
Date: Thu Oct 20 04:49:25 2011
New Revision: 1186613
URL: http://svn.apache.org/viewvc?rev=1186613&view=rev
Log:
Use new parent pom
Added:
james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml (with props)
Modified:
james/trunk/sandbox/felixk/server/cli/pom.xml
james/trunk/sandbox/felixk/server/container-spring/pom.xml
james/trunk/sandbox/felixk/server/core/pom.xml
james/trunk/sandbox/felixk/server/data-api/pom.xml
james/trunk/sandbox/felixk/server/data-library/pom.xml
james/trunk/sandbox/felixk/server/dnsservice-api/pom.xml
james/trunk/sandbox/felixk/server/dnsservice-dnsjava/pom.xml
james/trunk/sandbox/felixk/server/dnsservice-library/pom.xml
james/trunk/sandbox/felixk/server/fetchmail/pom.xml
james/trunk/sandbox/felixk/server/file/pom.xml
james/trunk/sandbox/felixk/server/filesystem-api/pom.xml
james/trunk/sandbox/felixk/server/hbase/pom.xml
james/trunk/sandbox/felixk/server/imapserver/pom.xml
james/trunk/sandbox/felixk/server/jcr/pom.xml
james/trunk/sandbox/felixk/server/jdbc/pom.xml
james/trunk/sandbox/felixk/server/jpa/pom.xml
james/trunk/sandbox/felixk/server/ldap/pom.xml
james/trunk/sandbox/felixk/server/lifecycle-api/pom.xml
james/trunk/sandbox/felixk/server/lifecycle-spring/pom.xml
james/trunk/sandbox/felixk/server/lmtpserver/pom.xml
james/trunk/sandbox/felixk/server/mailbox-adapter/pom.xml
james/trunk/sandbox/felixk/server/mailetcontainer-api/pom.xml
james/trunk/sandbox/felixk/server/mailetcontainer-camel/pom.xml
james/trunk/sandbox/felixk/server/mailets/pom.xml
james/trunk/sandbox/felixk/server/pom.xml
james/trunk/sandbox/felixk/server/pop3server/pom.xml
james/trunk/sandbox/felixk/server/protocols-library/pom.xml
james/trunk/sandbox/felixk/server/queue-activemq/pom.xml
james/trunk/sandbox/felixk/server/queue-api/pom.xml
james/trunk/sandbox/felixk/server/queue-file/pom.xml
james/trunk/sandbox/felixk/server/queue-jms/pom.xml
james/trunk/sandbox/felixk/server/smtpserver/pom.xml
james/trunk/sandbox/felixk/server/src/reporting-site/site.xml
james/trunk/sandbox/felixk/server/src/site/site.xml
james/trunk/sandbox/felixk/server/util/pom.xml
Modified: james/trunk/sandbox/felixk/server/cli/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/cli/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/cli/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/cli/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-cli</artifactId>
<name>Apache James Server Client</name>
Modified: james/trunk/sandbox/felixk/server/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/container-spring/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/container-spring/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/container-spring/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-container-spring</artifactId>
<name>Apache James Server Container Spring</name>
@@ -149,14 +148,10 @@
<build>
<plugins>
- <!-- use version 2.4 of the plugin. This is needed as workaround for
- http://jira.codehaus.org/browse/MAPPASM-96 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
</plugin>
-
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -179,5 +174,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: james/trunk/sandbox/felixk/server/core/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/core/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/core/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/core/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-core</artifactId>
<name>Apache James Server Core</name>
Modified: james/trunk/sandbox/felixk/server/data-api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/data-api/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/data-api/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/data-api/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-data-api</artifactId>
<name>Apache James Server Data API</name>
Modified: james/trunk/sandbox/felixk/server/data-library/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/data-library/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/data-library/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/data-library/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-data-library</artifactId>
<name>Apache James Server Data Library</name>
Modified: james/trunk/sandbox/felixk/server/dnsservice-api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/dnsservice-api/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/dnsservice-api/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/dnsservice-api/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<name>Apache James Server DNS Server API</name>
Modified: james/trunk/sandbox/felixk/server/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/dnsservice-dnsjava/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/dnsservice-dnsjava/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/dnsservice-dnsjava/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<name>Apache James Server DNSService Implementation</name>
Modified: james/trunk/sandbox/felixk/server/dnsservice-library/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/dnsservice-library/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/dnsservice-library/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/dnsservice-library/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<name>Apache James Server DNSService Library</name>
Modified: james/trunk/sandbox/felixk/server/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/fetchmail/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/fetchmail/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/fetchmail/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-fetchmail</artifactId>
<name>Apache James Server FetchMail</name>
@@ -115,5 +114,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: james/trunk/sandbox/felixk/server/file/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/file/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/file/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/file/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-file</artifactId>
<name>Apache James Server File Data Persistence</name>
Modified: james/trunk/sandbox/felixk/server/filesystem-api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/filesystem-api/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/filesystem-api/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/filesystem-api/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<name>Apache James Server Filesystem API</name>
Modified: james/trunk/sandbox/felixk/server/hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/hbase/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/hbase/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/hbase/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-hbase</artifactId>
<name>Apache James Server HBase Data Persistence</name>
Modified: james/trunk/sandbox/felixk/server/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/imapserver/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/imapserver/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/imapserver/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-imapserver</artifactId>
<name>Apache James Server IMAP</name>
Modified: james/trunk/sandbox/felixk/server/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/jcr/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/jcr/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/jcr/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-jcr</artifactId>
<name>Apache James Server JCR Data Persistence</name>
Modified: james/trunk/sandbox/felixk/server/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/jdbc/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/jdbc/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/jdbc/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-jdbc</artifactId>
<name>Apache James Server JDBC Data Persistence</name>
Modified: james/trunk/sandbox/felixk/server/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/jpa/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/jpa/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/jpa/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-jpa</artifactId>
<name>Apache James Server JPA Data Persistence</name>
@@ -125,7 +124,6 @@
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified: james/trunk/sandbox/felixk/server/ldap/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/ldap/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/ldap/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/ldap/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-ldap</artifactId>
<name>Apache James Server LDAP Data Implementation</name>
Modified: james/trunk/sandbox/felixk/server/lifecycle-api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/lifecycle-api/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/lifecycle-api/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/lifecycle-api/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<name>Apache James Server Lifecycle API</name>
Modified: james/trunk/sandbox/felixk/server/lifecycle-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/lifecycle-spring/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/lifecycle-spring/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/lifecycle-spring/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-lifecycle-spring</artifactId>
<name>Apache James Server Lifecycle Spring</name>
@@ -103,12 +102,9 @@
<build>
<plugins>
- <!-- use version 2.4 of the plugin. This is needed as workaround for
- http://jira.codehaus.org/browse/MAPPASM-96 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
Modified: james/trunk/sandbox/felixk/server/lmtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/lmtpserver/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/lmtpserver/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/lmtpserver/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-lmtpserver</artifactId>
<name>Apache James Server LMTP</name>
Modified: james/trunk/sandbox/felixk/server/mailbox-adapter/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/mailbox-adapter/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/mailbox-adapter/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/mailbox-adapter/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
<name>Apache James Server Mailbox Adapter</name>
Modified: james/trunk/sandbox/felixk/server/mailetcontainer-api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/mailetcontainer-api/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/mailetcontainer-api/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/mailetcontainer-api/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<name>Apache James Server Mailetcontainer API</name>
Modified: james/trunk/sandbox/felixk/server/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/mailetcontainer-camel/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/mailetcontainer-camel/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/mailetcontainer-camel/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
<name>Apache James Server Mailetcontainer Camel implementation</name>
Modified: james/trunk/sandbox/felixk/server/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/mailets/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/mailets/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/mailets/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mailets</artifactId>
<packaging>jar</packaging>
Modified: james/trunk/sandbox/felixk/server/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/pom.xml Thu Oct 20 04:49:25 2011
@@ -26,11 +26,10 @@
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.6</version>
+ <version>1.7-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
<version>3.0-beta4-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,10 +39,6 @@
<url>http://james.apache.org/server/head/</url>
<inceptionYear>2002</inceptionYear>
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
-
<modules>
<module>container-spring</module>
<module>core</module>
@@ -84,20 +79,14 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/server/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/james/server/trunk?root=Apache-SVN</url>
</scm>
- <ciManagement>
- <system>hudson</system>
- <url>http://hudson.zones.apache.org/hudson/view/James/job/james-server-trunk/</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- </notifier>
- </notifiers>
- </ciManagement>
<distributionManagement>
<site>
<id>server-trunk-website</id>
- <url>scp://people.apache.org/www/james.apache.org/server/3/</url>
+ <!--
+ <url>scp://people.apache.org/www/james.apache.org/server/3/${deployTechnicalSiteDirectory}</url>
+ -->
+ <url>scpexe://localhost/tmp/james.apache.org/server/3/${deployTechnicalSiteDirectory}</url>
</site>
</distributionManagement>
@@ -119,8 +108,6 @@
<jackrabbit.version>2.2.5</jackrabbit.version>
<hbase.version>0.90.3</hbase.version>
<hadoop.version>0.20-append-r1057313</hadoop.version>
-
- <target.jdk>1.6</target.jdk>
</properties>
<dependencyManagement>
@@ -1038,7 +1025,6 @@
</dependencyManagement>
<repositories>
-
<!-- needed for javamail -->
<repository>
<id>maven2-repository.dev.java.net</id>
@@ -1073,105 +1059,10 @@
</pluginRepositories>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.7.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <optimize>true</optimize>
- <source>${target.jdk}</source>
- <target>${target.jdk}</target>
- </configuration>
</plugin>
<!-- Use maven deploy plugin version 2.4 as workaround -->
<!-- See: http://jira.codehaus.org/browse/MAPPASM-96 -->
@@ -1233,168 +1124,9 @@
</instructions>
</configuration>
</plugin>
-
- <!-- Site generation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <executions>
- <!-- Attach non-reporting site-descriptor when installing -->
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- <configuration>
- <siteDirectory>${basedir}/src/site</siteDirectory>
- <generateReports>false</generateReports>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
- <generateReports>${maven-site-plugin.generateReports}</generateReports>
- <generateSitemap>true</generateSitemap>
- <reportPlugins>
- <!-- Order matters. First project-info-reports, second jxr. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reports>
- <report>index</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- <report>dependencies</report>
- </reports>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <!-- disable this till we released a new version with javamail 1.4.3 as dependency -->
- <!--
- <plugin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-mailetdocs-plugin</artifactId>
- <version>0.1</version>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <minmemory>256m</minmemory>
- <maxmemory>1g</maxmemory>
- <linksource>true</linksource>
- <tags>
- <tag>
- <name>note</name>
- <placement>a</placement>
- <head>NOTE</head>
- </tag>
- <tag>
- <name>todo</name>
- <placement>a</placement>
- <head>TODO</head>
- </tag>
- <tag>
- <name>warning</name>
- <placement>a</placement>
- <head>WARNING</head>
- </tag>
- </tags>
- <source>${target.jdk}</source>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>aggregate</report>
- <report>test-aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <aggregate>true</aggregate>
- <targetJdk>${target.jdk}</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <format>xml</format>
- <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation>
- <xrefTestLocation>${project.reporting.outputDirectory}/xref-test</xrefTestLocation>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <!-- required by dashboard plugin and hudson -->
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <onlyCurrentVersion>true</onlyCurrentVersion>
- <resolutionIds>Closed</resolutionIds>
- <maxEntries>1000</maxEntries>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>
- <aggregate>true</aggregate>
- <linkXref>true</linkXref>
- <xrefLocation>${project.reporting.outputDirectory}</xrefLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependency-updates-report</report>
- <report>plugin-updates-report</report>
- <report>property-updates-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </reportPlugins>
- </configuration>
</plugin>
</plugins>
</build>
@@ -1409,53 +1141,5 @@
<javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
</properties>
</profile>
-
- <!-- TODO: Move this to james parent pom -->
- <!-- This take care of generate a zip and tar.gz file for the source -->
- <profile>
- <id>apache-release</id>
- <activation>
- <property>
- <name>apache-release</name>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- waiting for release -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>source-release</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <!-- apache version not yet released -->
- <!--<groupId>org.apache</groupId> -->
- <groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <!-- apache version not yet known -->
- <version>2.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
-
-
-
</project>
Modified: james/trunk/sandbox/felixk/server/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/pop3server/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/pop3server/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/pop3server/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-pop3server</artifactId>
<name>Apache James Server POP3</name>
Modified: james/trunk/sandbox/felixk/server/protocols-library/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/protocols-library/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/protocols-library/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/protocols-library/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-protocols-library</artifactId>
<name>Apache James Server Protocols Library</name>
Modified: james/trunk/sandbox/felixk/server/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/queue-activemq/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/queue-activemq/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/queue-activemq/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-queue-activemq</artifactId>
<name>Apache James Server ActiveMQ Queue</name>
Modified: james/trunk/sandbox/felixk/server/queue-api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/queue-api/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/queue-api/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/queue-api/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-queue-api</artifactId>
<name>Apache James Server Queue API</name>
Modified: james/trunk/sandbox/felixk/server/queue-file/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/queue-file/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/queue-file/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/queue-file/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-queue-file</artifactId>
<name>Apache James Server File Mail Queue</name>
Modified: james/trunk/sandbox/felixk/server/queue-jms/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/queue-jms/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/queue-jms/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/queue-jms/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-queue-jms</artifactId>
<name>Apache James Server JMS Mail Queue</name>
Modified: james/trunk/sandbox/felixk/server/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/smtpserver/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/smtpserver/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/smtpserver/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-smtpserver</artifactId>
<name>Apache James Server SMTP</name>
Modified: james/trunk/sandbox/felixk/server/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/src/reporting-site/site.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/src/reporting-site/site.xml (original)
+++ james/trunk/sandbox/felixk/server/src/reporting-site/site.xml Thu Oct 20 04:49:25 2011
@@ -19,12 +19,6 @@
-->
<project name="${project.name}">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>James Server</name>
<src>images/logos/james-server-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-server-logo.gif</alt>
</bannerLeft>
- <bannerRight>
- <name>The Apache Software Foundation</name>
- <src>images/logos/asf-logo-reduced.gif</src>
- <href>http://www.apache.org/index.html</href>
- </bannerRight>
-
<body>
<menu ref="reports" />
Modified: james/trunk/sandbox/felixk/server/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/src/site/site.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/src/site/site.xml (original)
+++ james/trunk/sandbox/felixk/server/src/site/site.xml Thu Oct 20 04:49:25 2011
@@ -19,24 +19,12 @@
-->
<project name="Apache James Server 3.0">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>Apache James Server 3.0</name>
<src>images/logos/james-server-logo.gif</src>
<href>http://james.apache.org/server/index.html</href>
<alt>james-server-logo.gif</alt>
</bannerLeft>
-
- <bannerRight>
- <name>The Apache Software Foundation</name>
- <src>images/logos/asf-logo-reduced.gif</src>
- <href>http://www.apache.org/index.html</href>
- </bannerRight>
<body>
@@ -46,7 +34,7 @@
<item name="Sitemap" href="/sitemap.html"/>
<!-- <item name="JIRA Report" href="/jira-report.html"/>-->
</menu>
-
+
<menu name="Features">
<item name="Servers" href="/feature-servers.html" />
<item name="Persistence" href="/feature-persistence.html" />
@@ -91,10 +79,12 @@ Removed from trunk for now.
<item name="JMX" href="/monitor-jmx.html" />
<item name="Folders" href="/monitor-folders.html" />
</item>
- <item name="6. Upgrade" collapse="true" >
+
+ <item name="6. Upgrade" href="upgrade.html" collapse="true" >
<item name="Upgrade from 2.3" href="/upgrade-2.3.html" />
<item name="Upgrade database" href="/upgrade-database.html" />
</item>
+
</menu>
<menu name="Developers Corner">
@@ -118,7 +108,6 @@ Removed from trunk for now.
<item name="Javadoc" href="/apidocs/index.html" />
<item name="Issue Tracker" href="https://issues.apache.org/jira/browse/JAMES" />
</menu>
-
</body>
</project>
Added: james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml?rev=1186613&view=auto
==============================================================================
--- james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml (added)
+++ james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml Thu Oct 20 04:49:25 2011
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<document>
+
+ <properties>
+ <title>Upgrading from Apache James Server 2.3</title>
+ </properties>
+
+ <body>
+
+ <section name="Upgrade">
+
+ <p>Howto upgrade from previous versions.</p>
+
+ </section>
+
+ </body>
+</document>
\ No newline at end of file
Propchange: james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/trunk/sandbox/felixk/server/src/site/xdoc/upgrade.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: james/trunk/sandbox/felixk/server/util/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/server/util/pom.xml?rev=1186613&r1=1186612&r2=1186613&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/server/util/pom.xml (original)
+++ james/trunk/sandbox/felixk/server/util/pom.xml Thu Oct 20 04:49:25 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-util</artifactId>
<name>Apache James Server Common Utilities</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org