Return-Path: 
 <commits-return-25838-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 CA12598C8
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Thu,  8 Mar 2012 19:55:10 +0000 (UTC)
Received: (qmail 30976 invoked by uid 500); 8 Mar 2012 19:55:10 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 30907 invoked by uid 500); 8 Mar 2012 19:55:10 -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 30900 invoked by uid 99); 8 Mar 2012 19:55:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Mar 2012 19:55:10 +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; Thu, 08 Mar 2012 19:55:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 17D562388860
	for <commits@commons.apache.org>; Thu,  8 Mar 2012 19:54:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1298538 - /commons/proper/collections/trunk/pom.xml
Date: Thu, 08 Mar 2012 19:54:49 -0000
To: commits@commons.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120308195449.17D562388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sebb
Date: Thu Mar  8 19:54:48 2012
New Revision: 1298538

URL: http://svn.apache.org/viewvc?rev=1298538&view=rev
Log:
Update to CP23; can now remove quite a few local overrides

Modified:
    commons/proper/collections/trunk/pom.xml

Modified: commons/proper/collections/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=1298538&r1=1298537&r2=1298538&view=diff
==============================================================================
--- commons/proper/collections/trunk/pom.xml (original)
+++ commons/proper/collections/trunk/pom.xml Thu Mar  8 19:54:48 2012
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>15</version>
+    <version>23</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-collections</groupId>
@@ -361,7 +361,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -372,6 +372,14 @@
     </dependency>
   </dependencies>
 
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <name>Apache Commons Site</name>
+      <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}</url>
+    </site>
+  </distributionManagement>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -453,17 +461,6 @@
   <reporting>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <linksource>true</linksource>
-          <links>
-            <link>http://download.oracle.com/javase/6/docs/api</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.1</version>
         <configuration>
@@ -488,18 +485,6 @@
         <artifactId>cobertura-maven-plugin</artifactId>
         <version>2.2</version>
       </plugin>
-      <!-- Fails with Exception -->
-      <!--
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <version>2.2.2</version>
-        <configuration>
-          <comparisonVersion>3.2</comparisonVersion>
-          <minSeverity>info</minSeverity>
-        </configuration>
-      </plugin>
-      -->
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
         <version>2.3</version>
@@ -515,42 +500,7 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <!-- Override Javadoc config in parent pom to add default manifest entries -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration> 
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-          <aggregate>false</aggregate>
-          <source>${maven.compile.source}</source>
-          <encoding>${commons.encoding}</encoding>
-          <docEncoding>${commons.docEncoding}</docEncoding>
-          <linksource>true</linksource>
-          <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
-          </links>
-        </configuration> 
-      </plugin>
     </plugins>
   </reporting>
 
-  <profiles>
-    <profile>
-      <id>rc</id>
-      <distributionManagement>
-        <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
-        <site>
-          <id>apache.website</id>
-          <name>Apache Commons Release Candidate Staging Site</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
-        </site>
-      </distributionManagement>
-    </profile>
-  </profiles>
-
 </project>