commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1571824 - in /commons/proper/dbcp/trunk: checkstyle.xml pom.xml
Date Tue, 25 Feb 2014 21:13:39 GMT
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>



Mime
View raw message