You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by jo...@apache.org on 2009/03/19 13:28:45 UTC
svn commit: r755973 - in /incubator/rat/main/trunk/apache-rat: pom.xml
src/assemble/bin.xml
Author: jochen
Date: Thu Mar 19 12:28:44 2009
New Revision: 755973
URL: http://svn.apache.org/viewvc?rev=755973&view=rev
Log:
- Making sure, that the LICENSE and NOTICE files from the
remote-resources-plugin aren't overwritten when unpacking
dependencies.
- Changing tar file mode to GNU in order to avoid warnings.
- Removing the empty apache-rat-<version>-sources.jar from
the distribution.
Modified:
incubator/rat/main/trunk/apache-rat/pom.xml
incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml
Modified: incubator/rat/main/trunk/apache-rat/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat/pom.xml?rev=755973&r1=755972&r2=755973&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat/pom.xml Thu Mar 19 12:28:44 2009
@@ -61,6 +61,12 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -72,26 +78,7 @@
<includeScope>runtime</includeScope>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<overWriteIfNewer>false</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
+ <excludes>META-INF/LICENSE,META-INF/NOTICE,META-INF/LICENSE.*,META-INF/NOTICE.*</excludes>
</configuration>
</execution>
</executions>
@@ -100,8 +87,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
- <exclude>**/LICENSE</exclude>
- <exclude>**/NOTICE</exclude>
<exclude>META-INF/maven</exclude>
</excludes>
<archive>
@@ -129,16 +114,17 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <version>2.2-beta-3</version>
<configuration>
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
Modified: incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml?rev=755973&r1=755972&r2=755973&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml (original)
+++ incubator/rat/main/trunk/apache-rat/src/assemble/bin.xml Thu Mar 19 12:28:44 2009
@@ -31,7 +31,9 @@
<directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>LICENSE</include>
<include>LICENSE.*</include>
+ <include>NOTICE</include>
<include>NOTICE.*</include>
<include>RELEASE_NOTES.txt</include>
<include>DISCLAIMER.txt</include>
@@ -57,6 +59,9 @@
<includes>
<include>apache-rat*.jar</include>
</includes>
+ <excludes>
+ <exclude>apache-rat-*-source.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>target</directory>