Author: niallp
Date: Sun Mar 2 17:01:28 2008
New Revision: 632894
URL: http://svn.apache.org/viewvc?rev=632894&view=rev
Log:
Remove redundant <resource> configuration for NOTICE/LICENSE - these are
configured in commons-parent (NOTE: seems that components which define other
<resource> elements need to include these - so only removing from components
where NOTICE/LICENSE are the only resources configured)
Modified:
commons/proper/codec/trunk/pom.xml
commons/proper/collections/trunk/pom.xml
commons/proper/daemon/trunk/pom.xml
commons/proper/dbutils/trunk/pom.xml
commons/proper/discovery/trunk/pom.xml
commons/proper/el/trunk/pom.xml
commons/proper/jexl/trunk/pom.xml
commons/proper/jxpath/trunk/pom.xml
commons/proper/launcher/trunk/pom.xml
commons/proper/net/trunk/pom.xml
commons/proper/pool/trunk/pom.xml
commons/proper/primitives/trunk/pom.xml
commons/proper/proxy/trunk/pom.xml
commons/proper/scxml/trunk/pom.xml
commons/proper/transaction/trunk/pom.xml
Modified: commons/proper/codec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -167,16 +167,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/collections/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/collections/trunk/pom.xml (original)
+++ commons/proper/collections/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -389,16 +389,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/daemon/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/daemon/trunk/pom.xml (original)
+++ commons/proper/daemon/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -93,16 +93,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<!--
<plugin>
Modified: commons/proper/dbutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/pom.xml (original)
+++ commons/proper/dbutils/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -184,16 +184,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/discovery/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/discovery/trunk/pom.xml (original)
+++ commons/proper/discovery/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -119,17 +119,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
-
<testResources>
<testResource>
<directory>${basedir}/src</directory>
Modified: commons/proper/el/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/el/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/el/trunk/pom.xml (original)
+++ commons/proper/el/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -117,16 +117,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: commons/proper/jexl/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -111,16 +111,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/jxpath/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/pom.xml (original)
+++ commons/proper/jxpath/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -84,16 +84,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>src/test</directory>
Modified: commons/proper/launcher/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/launcher/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/launcher/trunk/pom.xml (original)
+++ commons/proper/launcher/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -107,16 +107,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: commons/proper/net/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -129,16 +129,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/pool/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/pool/trunk/pom.xml (original)
+++ commons/proper/pool/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -132,16 +132,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/primitives/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/primitives/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/primitives/trunk/pom.xml (original)
+++ commons/proper/primitives/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -108,16 +108,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/proxy/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/proxy/trunk/pom.xml (original)
+++ commons/proper/proxy/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -102,16 +102,6 @@
</scm>
<build>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: commons/proper/scxml/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/scxml/trunk/pom.xml (original)
+++ commons/proper/scxml/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -176,16 +176,6 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>src/test/java</directory>
Modified: commons/proper/transaction/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/trunk/pom.xml?rev=632894&r1=632893&r2=632894&view=diff
==============================================================================
--- commons/proper/transaction/trunk/pom.xml (original)
+++ commons/proper/transaction/trunk/pom.xml Sun Mar 2 17:01:28 2008
@@ -180,16 +180,6 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
