You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2011/09/21 22:11:36 UTC
svn commit: r1173822 - /commons/proper/configuration/trunk/pom.xml
Author: oheger
Date: Wed Sep 21 20:11:36 2011
New Revision: 1173822
URL: http://svn.apache.org/viewvc?rev=1173822&view=rev
Log:
Updated to commons-parent 22.
Modified:
commons/proper/configuration/trunk/pom.xml
Modified: commons/proper/configuration/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1173822&r1=1173821&r2=1173822&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Wed Sep 21 20:11:36 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>21</version>
+ <version>22</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-configuration</groupId>
@@ -436,19 +436,6 @@
</properties>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
@@ -459,6 +446,15 @@
<include>*.dtd</include>
</includes>
</testResource>
+ <!-- hack to ensure the N&L appear in jars -->
+ <testResource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -641,8 +637,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<exclude>conf/**/*</exclude>