Return-Path: 
 <commits-return-40022-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 8D06E101DE
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Tue, 25 Feb 2014 21:14:08 +0000 (UTC)
Received: (qmail 59108 invoked by uid 500); 25 Feb 2014 21:14:04 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 58963 invoked by uid 500); 25 Feb 2014 21:14:04 -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 58956 invoked by uid 99); 25 Feb 2014 21:14:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Feb 2014 21:14:04 +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; Tue, 25 Feb 2014 21:14:01 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id EDCC423888D7;
	Tue, 25 Feb 2014 21:13:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1571824 - in /commons/proper/dbcp/trunk: checkstyle.xml
 pom.xml
Date: Tue, 25 Feb 2014 21:13:39 -0000
To: commits@commons.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140225211339.EDCC423888D7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sebb
Date: Tue Feb 25 21:13:39 2014
New Revision: 1571824

URL: http://svn.apache.org/r1571824
Log:
Update to latest versions of plugins
Remove DoubleCheckedLocking check as latest checkstyle does not support it

Modified:
    commons/proper/dbcp/trunk/checkstyle.xml
    commons/proper/dbcp/trunk/pom.xml

Modified: commons/proper/dbcp/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/checkstyle.xml?rev=1571824&r1=1571823&r2=1571824&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/checkstyle.xml (original)
+++ commons/proper/dbcp/trunk/checkstyle.xml Tue Feb 25 21:13:39 2014
@@ -153,7 +153,6 @@
         <!--
         <module name="AvoidInlineConditionals"/>
         -->
-        <module name="DoubleCheckedLocking"/>
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <!--

Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=1571824&r1=1571823&r2=1571824&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Tue Feb 25 21:13:39 2014
@@ -34,6 +34,11 @@
   <description>Apache Commons DBCP software implements Database Connection Pooling</description>
   <url>http://commons.apache.org/proper/commons-dbcp/</url>
 
+  <!-- Maven 3.0 needed for scmpublish 1.0 -->
+  <prerequisites>
+      <maven>3.0</maven>
+  </prerequisites>
+
   <distributionManagement>
     <site>
       <id>people.apache.org</id>
@@ -186,6 +191,11 @@
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
+       <!-- 
+       Cannot update this currently; anything later causes failures:
+       java.lang.NoClassDefFoundError: 
+       Could not initialize class org.apache.geronimo.transaction.manager.TransactionManagerImpl
+        -->
        <version>1.2-beta</version>
        <scope>test</scope>
        <exclusions>
@@ -218,6 +228,9 @@
     <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
     <commons.jira.id>DBCP</commons.jira.id>
     <commons.jira.pid>12310469</commons.jira.pid>
+    <!-- Override CP version until that is updated -->
+    <!-- Version 1.0 requires Maven 3.0 or later -->
+    <commons.scm-publish.version>1.0</commons.scm-publish.version>
   </properties> 
 
   <build>
@@ -226,6 +239,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
+          <version>${commons.scm-publish.version}</version>
           <configuration>
             <ignorePathsToDelete>
               <ignorePathToDelete>javadocs</ignorePathToDelete>
@@ -274,7 +288,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>2.4.0</version>
+          <version>2.5.3</version>
           <configuration>
             <threshold>Normal</threshold>
             <effort>Default</effort>
@@ -314,7 +328,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.9.1</version>
+          <version>2.11</version>
           <configuration>
             <configLocation>${basedir}/checkstyle.xml</configLocation>
             <enableRulesSummary>false</enableRulesSummary>
@@ -323,7 +337,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>2.7.1</version>
+          <version>3.0.1</version>
           <configuration>
             <rulesets>
               <ruleset>checkstyle.xml</ruleset>