You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2013/12/28 22:47:07 UTC
svn commit: r1553934 - in /commons/proper/dbcp/trunk: checkstyle.xml pom.xml
Author: psteitz
Date: Sat Dec 28 21:47:07 2013
New Revision: 1553934
URL: http://svn.apache.org/r1553934
Log:
Update to cp 32, jdk 7.
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=1553934&r1=1553933&r2=1553934&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/checkstyle.xml (original)
+++ commons/proper/dbcp/trunk/checkstyle.xml Sat Dec 28 21:47:07 2013
@@ -25,7 +25,7 @@
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <module name="PackageHtml"/>
+ <module name="JavadocPackage"/>
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -34,6 +34,13 @@
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
<module name="Translation"/>
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength"/>
+
+ <!-- No tabs allowed! -->
+ <module name="FileTabCharacter"/>
<module name="TreeWalker">
@@ -110,10 +117,6 @@
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<module name="UnusedImports"/>
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="FileLength"/>
<!-- Suspend, for now
<module name="ParameterNumber"/>
@@ -126,9 +129,6 @@
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
- -->
- <module name="TabCharacter"/>
- <!--
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
-->
Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=1553934&r1=1553933&r2=1553934&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Sat Dec 28 21:47:07 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>24</version>
+ <version>32</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.commons</groupId>
@@ -202,11 +202,20 @@
</dependencies>
<properties>
- <maven.compile.source>1.7</maven.compile.source>
- <maven.compile.target>1.7</maven.compile.target>
- <commons.componentid>dbcp</commons.componentid>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <commons.componentid>dbdp2</commons.componentid>
<commons.release.version>2.0</commons.release.version>
- <commons.release.desc>for JDBC 4.1 (JDK 1.7)</commons.release.desc>
+ <commons.release.desc>(Java 7.0+)</commons.release.desc>
+ <commons.release.2.version>1.5</commons.release.2.version>
+ <commons.release.2.desc>(Java 5.0+)</commons.release.2.desc>
+ <!-- override parent name, because 1.x uses different artifactId -->
+ <commons.release.2.name>commons-dbcp-${commons.release.2.version}</commons.release.2.name>
+ <commons.site.path>dbcp</commons.site.path>
+ <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-dbcp</commons.scmPubUrl>
+ <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
<commons.jira.id>DBCP</commons.jira.id>
<commons.jira.pid>12310469</commons.jira.pid>
</properties>
@@ -341,7 +350,7 @@
<rulesets>
<ruleset>checkstyle.xml</ruleset>
</rulesets>
- <targetJdk>${maven.compile.target}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
<plugin>