Return-Path: 
 <commits-return-22312-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0CCFF9057
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Wed, 21 Sep 2011 20:12:02 +0000 (UTC)
Received: (qmail 49092 invoked by uid 500); 21 Sep 2011 20:12:01 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 49038 invoked by uid 500); 21 Sep 2011 20:12:01 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 49030 invoked by uid 99); 21 Sep 2011 20:12:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Sep 2011 20:12:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Sep 2011 20:11:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D31422388A02
	for <commits@commons.apache.org>; Wed, 21 Sep 2011 20:11:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1173822 - /commons/proper/configuration/trunk/pom.xml
Date: Wed, 21 Sep 2011 20:11:36 -0000
To: commits@commons.apache.org
From: oheger@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110921201136.D31422388A02@eris.apache.org>

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>