Author: norman
Date: Fri Jun 4 05:52:42 2010
New Revision: 951288
URL: http://svn.apache.org/viewvc?rev=951288&view=rev
Log:
Cleanup poms to remove duplicate entries, replace deprecated stuff and add
version tags to plugins. This makes the new m2eclipse plugin happy again
Modified:
james/server/trunk/core-library/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=951288&r1=951287&r2=951288&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Fri Jun 4 05:52:42 2010
@@ -104,7 +104,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <replace file="src/main/java/org/apache/james/Constants.java"
token="@@VERSION@@" value="${version}"/>
+ <replace file="src/main/java/org/apache/james/Constants.java"
token="@@VERSION@@" value="${project.version}"/>
<replace file="src/main/java/org/apache/james/Constants.java"
token="@@NAME@@" value="${productName}"/>
</tasks>
</configuration>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=951288&r1=951287&r2=951288&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Jun 4 05:52:42 2010
@@ -73,19 +73,6 @@
</scm>
<repositories>
- <!-- local repos -->
- <repository>
- <id>module-local</id>
- <name>Local Repository</name>
- <url>file://stage</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
<!-- needed for javamail -->
<repository>
@@ -157,6 +144,7 @@
-->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -169,12 +157,14 @@
-->
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<aggregate>true</aggregate>
<targetjdk>1.5</targetjdk>
@@ -190,10 +180,12 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<onlyCurrentVersion>true</onlyCurrentVersion>
<resolutionIds>Closed</resolutionIds>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=951288&r1=951287&r2=951288&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Fri Jun 4 05:52:42 2010
@@ -78,10 +78,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/smtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=951288&r1=951287&r2=951288&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Fri Jun 4 05:52:42 2010
@@ -122,11 +122,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<scope>test</scope>
Modified: james/server/trunk/user-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=951288&r1=951287&r2=951288&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Fri Jun 4 05:52:42 2010
@@ -50,10 +50,6 @@
<artifactId>james-server-domain-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
- </dependency>
- <dependency>
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
