Author: felixk
Date: Fri Nov 25 21:00:00 2011
New Revision: 1206319
URL: http://svn.apache.org/viewvc?rev=1206319&view=rev
Log:
Update to james-project 1.8
Modified:
james/jsieve/trunk/assemble/pom.xml
james/jsieve/trunk/mailet/pom.xml
james/jsieve/trunk/main/pom.xml
james/jsieve/trunk/pom.xml
james/jsieve/trunk/util/pom.xml
Modified: james/jsieve/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/assemble/pom.xml?rev=1206319&r1=1206318&r2=1206319&view=diff
==============================================================================
--- james/jsieve/trunk/assemble/pom.xml (original)
+++ james/jsieve/trunk/assemble/pom.xml Fri Nov 25 21:00:00 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-jsieve</artifactId>
<packaging>pom</packaging>
@@ -122,4 +121,31 @@
</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/jsieve/trunk/mailet/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/pom.xml?rev=1206319&r1=1206318&r2=1206319&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/pom.xml (original)
+++ james/jsieve/trunk/mailet/pom.xml Fri Nov 25 21:00:00 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
<packaging>jar</packaging>
@@ -121,19 +120,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</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>
@@ -170,7 +156,7 @@
</plugin>
</reportPlugins>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
Modified: james/jsieve/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/pom.xml?rev=1206319&r1=1206318&r2=1206319&view=diff
==============================================================================
--- james/jsieve/trunk/main/pom.xml (original)
+++ james/jsieve/trunk/main/pom.xml Fri Nov 25 21:00:00 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
<packaging>jar</packaging>
@@ -122,19 +121,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</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>
Modified: james/jsieve/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=1206319&r1=1206318&r2=1206319&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Fri Nov 25 21:00:00 2011
@@ -26,11 +26,10 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<relativePath></relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>jsieve-project</artifactId>
<version>0.5-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -291,21 +290,5 @@
</plugin>
</plugins>
</pluginManagement>
-
- <plugins>
- <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/jsieve/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/pom.xml?rev=1206319&r1=1206318&r2=1206319&view=diff
==============================================================================
--- james/jsieve/trunk/util/pom.xml (original)
+++ james/jsieve/trunk/util/pom.xml Fri Nov 25 21:00:00 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-util</artifactId>
<packaging>jar</packaging>
@@ -106,19 +105,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</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]
