Author: felixk
Date: Fri Nov 25 20:44:19 2011
New Revision: 1206312
URL: http://svn.apache.org/viewvc?rev=1206312&view=rev
Log:
Update to james-project 1.8
Modified:
james/mpt/trunk/antlib/pom.xml
james/mpt/trunk/app/pom.xml
james/mpt/trunk/assemble/pom.xml
james/mpt/trunk/main/pom.xml
james/mpt/trunk/mavenplugin/pom.xml
james/mpt/trunk/pom.xml
Modified: james/mpt/trunk/antlib/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/antlib/pom.xml?rev=1206312&r1=1206311&r2=1206312&view=diff
==============================================================================
--- james/mpt/trunk/antlib/pom.xml (original)
+++ james/mpt/trunk/antlib/pom.xml Fri Nov 25 20:44:19 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mpt-antlib</artifactId>
<name>Apache JAMES MPT AntLib</name>
@@ -188,19 +187,6 @@ to the library requiring no extra coding
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: james/mpt/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/app/pom.xml?rev=1206312&r1=1206311&r2=1206312&view=diff
==============================================================================
--- james/mpt/trunk/app/pom.xml (original)
+++ james/mpt/trunk/app/pom.xml Fri Nov 25 20:44:19 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mpt-app</artifactId>
<name>Apache JAMES MPT Application</name>
Modified: james/mpt/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/assemble/pom.xml?rev=1206312&r1=1206311&r2=1206312&view=diff
==============================================================================
--- james/mpt/trunk/assemble/pom.xml (original)
+++ james/mpt/trunk/assemble/pom.xml Fri Nov 25 20:44:19 2011
@@ -30,9 +30,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mpt</artifactId>
- <version>0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache JAMES MPT Assembly</name>
@@ -90,4 +88,31 @@ MPT is a functional test framework speci
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>site-reports</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--
+ Disable generation of technical reports for 'pom'
project, because
+ of following problems:
+ - site-plugin configuration can't be overwritten
yet
+ (https://jira.codehaus.org/browse/MSITE-484)
+ - cobertura-plugin fails with NPE
+ (http://jira.codehaus.org/browse/MCOBERTURA-148)
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: james/mpt/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/main/pom.xml?rev=1206312&r1=1206311&r2=1206312&view=diff
==============================================================================
--- james/mpt/trunk/main/pom.xml (original)
+++ james/mpt/trunk/main/pom.xml Fri Nov 25 20:44:19 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mpt-main</artifactId>
<name>Apache JAMES MPT Main</name>
@@ -122,19 +121,6 @@ scritable functional testing of ASCII ba
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: james/mpt/trunk/mavenplugin/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/pom.xml?rev=1206312&r1=1206311&r2=1206312&view=diff
==============================================================================
--- james/mpt/trunk/mavenplugin/pom.xml (original)
+++ james/mpt/trunk/mavenplugin/pom.xml Fri Nov 25 20:44:19 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>maven-mpt-plugin</artifactId>
<packaging>maven-plugin</packaging>
@@ -179,4 +178,31 @@ to the library requiring no extra coding
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>site-reports</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--
+ Disable generation of technical reports for 'pom'
project, because
+ of following problems:
+ - site-plugin configuration can't be overwritten
yet
+ (https://jira.codehaus.org/browse/MSITE-484)
+ - cobertura-plugin fails with NPE
+ (http://jira.codehaus.org/browse/MCOBERTURA-148)
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: james/mpt/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/pom.xml?rev=1206312&r1=1206311&r2=1206312&view=diff
==============================================================================
--- james/mpt/trunk/pom.xml (original)
+++ james/mpt/trunk/pom.xml Fri Nov 25 20:44:19 2011
@@ -26,11 +26,10 @@
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.7</version>
+ <version>1.8</version>
<relativePath></relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mpt-project</artifactId>
<version>0.2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,23 +39,6 @@
<url>http://james.apache.org/mpt/</url>
<inceptionYear>2008</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache James Server User Lists</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
- </mailingList>
- <mailingList>
- <name>Apache James Server Developer Lists</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
<modules>
<module>main</module>
<module>antlib</module>
@@ -266,19 +248,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
