Author: dennisl
Date: Wed Nov 7 14:17:03 2007
New Revision: 592922
URL: http://svn.apache.org/viewvc?rev=592922&view=rev
Log:
Replace local resources (license and notice files) with
maven-remote-resources-plugin. This makes sure that all artifacts contain the
proper license and notice files.
Bump maven-source-plugin to 2.0.4-SNAPSHOT to make sure that -sources jars also
include license and notice files.
Modified:
commons/proper/commons-parent/trunk/pom.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=592922&r1=592921&r2=592922&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Wed Nov 7 14:17:03 2007
@@ -95,16 +95,6 @@
</mailingList>
</mailingLists>
<build>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<pluginManagement>
<plugins>
<plugin>
@@ -119,8 +109,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -282,6 +277,23 @@
</execution>
</executions>
</plugin>
+ <!-- We want to package license resources into the JARs -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -339,6 +351,23 @@
</goals>
<configuration>
<source>${maven.compile.source}</source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- We want to package license resources into the JARs -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ </resourceBundles>
</configuration>
</execution>
</executions>
