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 ba...@apache.org on 2008/08/14 13:52:34 UTC
svn commit: r685866 - in /james/mime4j/trunk: pom.xml src/assemble/bin.xml
Author: bago
Date: Thu Aug 14 04:52:32 2008
New Revision: 685866
URL: http://svn.apache.org/viewvc?rev=685866&view=rev
Log:
Updated/FIxed versions for maven plugins. Moved assembly plugin at the end.
Updated assembly plugin required changes to the bin.xml descriptor, too.
Modified:
james/mime4j/trunk/pom.xml
james/mime4j/trunk/src/assemble/bin.xml
Modified: james/mime4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/pom.xml?rev=685866&r1=685865&r2=685866&view=diff
==============================================================================
--- james/mime4j/trunk/pom.xml (original)
+++ james/mime4j/trunk/pom.xml Thu Aug 14 04:52:32 2008
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
<executions>
<execution>
<id>generate-jjtree</id>
@@ -96,7 +96,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -115,7 +115,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<executions>
<execution>
<id>create-javadocs</id> <!-- this is used for inheritance merges -->
@@ -127,26 +127,10 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <configuration>
- <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- append to the packaging phase. -->
- <goals>
- <goal>attached</goal> <!-- goals == mojos -->
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -154,20 +138,9 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
<properties>
- <!-- <preProjectText>PRE PROCESS TEXT</preProjectText> -->
- <!-- Our src distribution includes also the test dependencies and
- maven remote resources doen't take this into account, so we
- manualy add the junit disclaimer -->
- <postProjectText>
- This product includes/uses software, JUnit (http://www.junit.org/),
-developed by Kent Beck, Erich Gamma, and David Saff
-License: Common Public License Version 1.0 (http://www.opensource.org/licenses/cpl.php)
-
-This file is automatically generated by dependencies declared in pom.xml
- </postProjectText>
<addLicense>true</addLicense>
</properties>
</configuration>
@@ -177,6 +150,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -196,7 +170,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -214,6 +188,22 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- append to the packaging phase. -->
+ <goals>
+ <goal>attached</goal> <!-- goals == mojos -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<repositories>
@@ -302,15 +292,15 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -320,7 +310,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<configuration>
<targetjdk>1.4</targetjdk>
<rulesets>
@@ -336,7 +326,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.0-beta-7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -366,7 +356,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
</plugin>
</plugins>
</reporting>
Modified: james/mime4j/trunk/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/assemble/bin.xml?rev=685866&r1=685865&r2=685866&view=diff
==============================================================================
--- james/mime4j/trunk/src/assemble/bin.xml (original)
+++ james/mime4j/trunk/src/assemble/bin.xml Thu Aug 14 04:52:32 2008
@@ -31,8 +31,7 @@
<directory>target/maven-shared-archive-resources/META-INF/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
+ <include>*</include>
</includes>
</fileSet>
<fileSet>
@@ -45,20 +44,20 @@
</fileSet>
<fileSet>
<directory>target</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>${artifactId}-${version}.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>target/site/apidocs</directory>
+ <directory>target/apidocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>/lib/</outputDirectory>
- <!-- <outputFileNameMapping></outputFileNameMapping> -->
+ <useProjectArtifact>false</useProjectArtifact>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org