Author: rgoers
Date: Tue Aug 16 07:01:02 2011
New Revision: 1158133
URL: http://svn.apache.org/viewvc?rev=1158133&view=rev
Log:
Add notice and license to all test jars
Modified:
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/examples/pom.xml
commons/proper/vfs/trunk/pom.xml
commons/proper/vfs/trunk/sandbox/pom.xml
Modified: commons/proper/vfs/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=1158133&r1=1158132&r2=1158133&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Tue Aug 16 07:01:02 2011
@@ -98,13 +98,7 @@
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>${vfs.parent.dir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
+ <include>LICENSE.txt</include>
</includes>
</resource>
</resources>
@@ -119,17 +113,10 @@
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </testResource>
- <testResource>
- <directory>${vfs.parent.dir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
<include>LICENSE.txt</include>
</includes>
</testResource>
</testResources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/vfs/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/examples/pom.xml?rev=1158133&r1=1158132&r2=1158133&view=diff
==============================================================================
--- commons/proper/vfs/trunk/examples/pom.xml (original)
+++ commons/proper/vfs/trunk/examples/pom.xml Tue Aug 16 07:01:02 2011
@@ -75,16 +75,10 @@
<build>
<resources>
<resource>
- <directory>..</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
<include>LICENSE.txt</include>
</includes>
</resource>
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1158133&r1=1158132&r2=1158133&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Tue Aug 16 07:01:02 2011
@@ -153,7 +153,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>jar-manifest</id>
+ <id>vfs-jar-manifest</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
@@ -165,16 +165,6 @@
</target>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- - Copy LICENSE.txt and NOTICE.txt so that they are included
- - in the -javadoc jar file for the component.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
<execution>
<id>javadoc.resources</id>
<phase>generate-sources</phase>
@@ -478,5 +468,6 @@
<build>
</build>
</profile>
+
</profiles>
</project>
Modified: commons/proper/vfs/trunk/sandbox/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/pom.xml?rev=1158133&r1=1158132&r2=1158133&view=diff
==============================================================================
--- commons/proper/vfs/trunk/sandbox/pom.xml (original)
+++ commons/proper/vfs/trunk/sandbox/pom.xml Tue Aug 16 07:01:02 2011
@@ -78,26 +78,25 @@
<build>
<resources>
<resource>
- <directory>..</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
</includes>
</resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- <resource>
- <directory>..</directory>
+ </resources>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResources>
+ <testResource>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
+ <include>NOTICE.txt</include>
<include>LICENSE.txt</include>
</includes>
- </resource>
- </resources>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
