You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by th...@apache.org on 2017/07/21 03:52:59 UTC
[01/14] commons-dbutils git commit: Set version for release
Repository: commons-dbutils
Updated Branches:
refs/heads/master 2b6f867a9 -> 008f75717
Set version for release
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/09fbd42a
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/09fbd42a
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/09fbd42a
Branch: refs/heads/master
Commit: 09fbd42a44690605c63f2ed67546cf199ccaa75f
Parents: 14b6be0
Author: Carl Hall <th...@apache.org>
Authored: Sat Jul 8 22:42:41 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sat Jul 8 22:42:41 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/09fbd42a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92e6653..31ed4e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,7 @@
<maven.compiler.target>1.6</maven.compiler.target>
<commons.componentid>dbutils</commons.componentid>
<commons.module.name>org.apache.commons.dbutils</commons.module.name>
- <commons.release.version>1.6</commons.release.version>
+ <commons.release.version>1.7</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
<commons.jira.id>DBUTILS</commons.jira.id>
<commons.jira.pid>12310470</commons.jira.pid>
[10/14] commons-dbutils git commit: Update commons-parent version to
42. Add version for checkstyle plugin.
Posted by th...@apache.org.
Update commons-parent version to 42.
Add version for checkstyle plugin.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/c0527277
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/c0527277
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/c0527277
Branch: refs/heads/master
Commit: c0527277a0360f190fdd127bc4e9ca718f45df25
Parents: 2b6f867
Author: Carl Hall <th...@apache.org>
Authored: Sun Jul 16 19:26:58 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sun Jul 16 19:26:58 2017 -0700
----------------------------------------------------------------------
pom.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/c0527277/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92e6653..72fdef3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>40</version>
+ <version>42</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-dbutils</groupId>
@@ -238,13 +238,16 @@
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
+
+ <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
+
<commons.componentid>dbutils</commons.componentid>
<commons.module.name>org.apache.commons.dbutils</commons.module.name>
<commons.release.version>1.6</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
<commons.jira.id>DBUTILS</commons.jira.id>
<commons.jira.pid>12310470</commons.jira.pid>
- </properties>
+ </properties>
<build>
<plugins>
@@ -304,7 +307,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
+ <version>${checkstyle.plugin.version}</version>
<configuration>
<configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
[13/14] commons-dbutils git commit: Setup checkstyle as a managed
plugin for easier use
Posted by th...@apache.org.
Setup checkstyle as a managed plugin for easier use
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/3d15cf80
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/3d15cf80
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/3d15cf80
Branch: refs/heads/master
Commit: 3d15cf80aa9c344c4e0f1e2e4dbe455d94cadecd
Parents: 3864117
Author: Carl Hall <th...@apache.org>
Authored: Thu Jul 20 20:48:33 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Thu Jul 20 20:48:33 2017 -0700
----------------------------------------------------------------------
pom.xml | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/3d15cf80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee5b93a..950d048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,6 +250,21 @@
</properties>
<build>
+ <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check findbugs:check javadoc:javadoc</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <headerLocation>${basedir}/license-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -307,12 +322,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <enableRulesSummary>false</enableRulesSummary>
- <headerLocation>${basedir}/license-header.txt</headerLocation>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
[04/14] commons-dbutils git commit: Update readme for 1.7 release
Posted by th...@apache.org.
Update readme for 1.7 release
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/cd4eb5f9
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/cd4eb5f9
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/cd4eb5f9
Branch: refs/heads/master
Commit: cd4eb5f90ca7982a68993de89c9069cad654d69c
Parents: ab593fd
Author: Carl Hall <th...@apache.org>
Authored: Sat Jul 8 23:33:10 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sat Jul 8 23:33:10 2017 -0700
----------------------------------------------------------------------
README.md | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/cd4eb5f9/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 3184a53..f843681 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,7 @@
Apache Commons DbUtils
===================
-The Apache Commons DbUtils package is a set of
- Java utility classes for easing JDBC development.
+The Apache Commons DbUtils package is a set of Java utility classes for easing JDBC development.
Documentation
-------------
@@ -63,7 +62,7 @@ Alternatively you can pull it from the central Maven repositories:
<dependency>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
</dependency>
```
[08/14] commons-dbutils git commit: Update the notice copyright year
and the RC version
Posted by th...@apache.org.
Update the notice copyright year and the RC version
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/e639004a
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/e639004a
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/e639004a
Branch: refs/heads/master
Commit: e639004a5887ada8a7cec21bdcd173faedf5c033
Parents: 35d1db2
Author: Carl Hall <th...@apache.org>
Authored: Sun Jul 16 14:38:55 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sun Jul 16 14:38:55 2017 -0700
----------------------------------------------------------------------
NOTICE.txt | 2 +-
pom.xml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e639004a/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 9dfcfdf..ee7cd7a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Commons DbUtils
-Copyright 2002-2016 The Apache Software Foundation
+Copyright 2002-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e639004a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca27ed8..fdf00c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,7 @@
<commons.componentid>dbutils</commons.componentid>
<commons.module.name>org.apache.commons.dbutils</commons.module.name>
<commons.release.version>1.7</commons.release.version>
- <commons.rc.version>RC1</commons.rc.version>
+ <commons.rc.version>RC2</commons.rc.version>
<commons.jira.id>DBUTILS</commons.jira.id>
<commons.jira.pid>12310470</commons.jira.pid>
</properties>
@@ -269,7 +269,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
<executions>
<execution>
<phase>verify</phase>
[06/14] commons-dbutils git commit: Remove pom versions to pick up
from parent and fix build issues. Remove deprecated checkstyle modules.
Posted by th...@apache.org.
Remove pom versions to pick up from parent and fix build issues.
Remove deprecated checkstyle modules.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/cf7498ed
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/cf7498ed
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/cf7498ed
Branch: refs/heads/master
Commit: cf7498ed4bb0aa909c73a8d95a9c013094e8c020
Parents: 33a1e30
Author: Carl Hall <th...@apache.org>
Authored: Sat Jul 15 22:04:05 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sat Jul 15 22:04:05 2017 -0700
----------------------------------------------------------------------
checkstyle.xml | 2 --
pom.xml | 3 ---
2 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/cf7498ed/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index 7268604..0156ad8 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -155,7 +155,6 @@
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!-- module name="AvoidInlineConditionals"/ -->
- <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<!-- module name="HiddenField"/ -->
@@ -163,7 +162,6 @@
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/cf7498ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3e84ac..ca27ed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,7 +303,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
<configuration>
<configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
@@ -313,7 +312,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.4</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
@@ -322,7 +320,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.3</version>
<configuration>
<targetJdk>${maven.compiler.source}</targetJdk>
<rulesets>
[03/14] commons-dbutils git commit: Update version in pom for 1.7
release Update release notes Cleanup description and template
Posted by th...@apache.org.
Update version in pom for 1.7 release
Update release notes
Cleanup description and template
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/ab593fd4
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/ab593fd4
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/ab593fd4
Branch: refs/heads/master
Commit: ab593fd40fd9e4177882a79e31e85a1afcd61cd4
Parents: 7ea0178
Author: Carl Hall <th...@apache.org>
Authored: Sat Jul 8 23:21:31 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sat Jul 8 23:21:31 2017 -0700
----------------------------------------------------------------------
RELEASE-NOTES.txt | 53 ++++++++++++++++-----------------------
pom.xml | 5 ++--
src/changes/changes.xml | 5 +++-
src/changes/release-notes.vm | 2 +-
4 files changed, 29 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/ab593fd4/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e5b9ef5..8105c5b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,46 +1,37 @@
Apache Commons DbUtils
- Version 1.6
+ Version 1.7
RELEASE NOTES
-The Apache Commons DbUtils team is pleased to announce the release of Apache Commons DbUtils 1.6.
+The Apache Commons DbUtils team is pleased to announce the release of Apache Commons DbUtils 1.7
+
The Apache Commons DbUtils package is a set of Java utility classes for easing JDBC development.
+Bugfixes and separate column & property handlers using SPI
+
Changes in this version include:
-NEW FEATURES:
-=============
-o DBUTILS-113: Add support for conversion of ResultSet strings to enums in the BeanProcessor
- Thanks to Graylin Kim, Michael Osipov.
-o DBUTILS-108: Create functionality to return auto-generated keys in batches of SQL inserts
- Thanks to Micah Huff.
-o DBUTILS-107: Patch QueryLoader to also load from XML properties files
- Thanks to PB.
-o DBUTILS-98: Add missing JavaDoc to QueryRunner#insert
- Thanks to Moandji Ezana.
-o DBUTILS-97: Add an Abstract ResultSetHandler implementation in order to reduce redundant 'resultSet' variable invocation
-o DBUTILS-87: Added insert methods to QueryRunner and AsyncQueryRunner that return the generated key.
- Thanks to Moandji Ezana.
-
-FIXED BUGS:
-===========
-o DBUTILS-110: ArrayHandler should return an empty array when handle has no rows
-o DBUTILS-114: Order of columns not retained in BasicRowProcessor with HashMap
- Thanks to Michael Osipov.
-o DBUTILS-118: BeanProcessor not returning nanoseconds
- Thanks to Feysal Rujbally, Daniele Cremonini.
-o DBUTILS-106: DBUtils can't build using JDK 1.7 - DriverProxy needs to implement getParentLogger()
- Add dynamic invocation. Thanks to Niall Pemberton.
-o DBUTILS-100: Updated the use of getColumnName to try getColumnLabel first Thanks to xiaofei.xu.
-o DBUTILS-96: DbUtils#loadDriver(ClassLoader,String) makes DriverManager throwing "No suitable driver found for jdbc"
- if ClassLoader is not the System's one Thanks to yuyf.
+New features:
+o DBUTILS-121: Add getWriteMethod to BeanProcessor to allow subclasses to influence which write method is used
+o DBUTILS-50: Support CallableStatement "out" parameters Thanks to Dan Fabulich.
+o DBUTILS-124: Implement column and property handlers using Java's service interfaces.
+
+Fixed Bugs:
+o DBUTILS-82: Change method contracts to allow extended class types when returning a bean populated from a query Thanks to Kenshi Toriumi.
+o DBUTILS-89: Add method in BeanProcessor to populate an existing bean Thanks to Adam Dyga.
+o DBUTILS-70: Add ability to configure statements used in QueryRunner Thanks to Michael Akerman.
Changes:
-o DBUTILS-85: In BeanProcessor#isCompatibleType, can Integer.class.isInstance(value) be replaced by value instanceof Integer (etc)?
- Simplified code by using instanceof.
+o DBUTILS-117: Error handling possible getParameterMetaData() results
+ - allow for null return
+ - handle SQLFeatureNotSupportedException Thanks to Vadim Smirnov.
+o DBUTILS-119: Correct errors in BeanMapHandler JavaDoc Thanks to Michael Akerman.
+o PR/1: Created some Unit Tests to increase code coverage. Thanks to Michael Hausegger.
For complete information on Apache Commons DbUtils, including instructions on how to submit bug reports,
patches, or suggestions for improvement, see the Apache Apache Commons DbUtils website:
-http://commons.apache.org/proper/commons-dbutils/
+https://commons.apache.org/proper/commons-dbutils/
+
+
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/ab593fd4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 31ed4e5..b3e84ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
<name>Apache Commons DbUtils</name>
<inceptionYear>2002</inceptionYear>
- <description>The Apache Commons DbUtils package is a set of
- Java utility classes for easing JDBC development.</description>
+ <description>The Apache Commons DbUtils package is a set of Java utility classes for easing JDBC development.</description>
<url>https://commons.apache.org/proper/commons-dbutils/</url>
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/ab593fd4/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5139fc7..1affdf4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -44,7 +44,7 @@ The <action> type attribute can be add,update,fix,remove.
</properties>
<body>
- <release version="1.7" date="TBA" description="TBD">
+ <release version="1.7" date="TBA" description="Bugfixes and separate column & property handlers using SPI">
<action dev="sebb" type="update" issue="DBUTILS-117" due-to="Vadim Smirnov">
Error handling possible getParameterMetaData() results
- allow for null return
@@ -71,6 +71,9 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="thecarlhall" type="add" issue="DBUTILS-124">
Implement column and property handlers using Java's service interfaces.
</action>
+ <action dev="thecarlhall" type="update" issue="PR/1" due-to="Michael Hausegger">
+ Created some Unit Tests to increase code coverage.
+ </action>
</release>
<release version="1.6" date="2014-07-20" description="Bugfixes and addition of insert methods">
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/ab593fd4/src/changes/release-notes.vm
----------------------------------------------------------------------
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index b060584..6944be0 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -16,7 +16,7 @@
## under the License.
${project.name}
- Version ${version}
+ Version ${version}
RELEASE NOTES
The ${developmentTeam} is pleased to announce the release of ${project.name} ${version}
[14/14] commons-dbutils git commit: Merge branch 'release'
Posted by th...@apache.org.
Merge branch 'release'
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/008f7571
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/008f7571
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/008f7571
Branch: refs/heads/master
Commit: 008f75717b3bb4172edd662837402e1a87712f59
Parents: 3d15cf8 77faa3c
Author: Carl Hall <th...@apache.org>
Authored: Thu Jul 20 20:52:48 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Thu Jul 20 20:52:48 2017 -0700
----------------------------------------------------------------------
NOTICE.txt | 2 +-
README.md | 5 +-
RELEASE-NOTES.txt | 53 +++++++----------
checkstyle.xml | 2 -
pom.xml | 10 +---
src/changes/changes.xml | 5 +-
src/changes/release-notes.vm | 2 +-
.../commons/dbutils/AbstractQueryRunner.java | 2 +-
.../commons/dbutils/AsyncQueryRunner.java | 33 +++++++++++
.../commons/dbutils/BaseResultSetHandler.java | 2 +-
.../apache/commons/dbutils/BeanProcessor.java | 34 +++++------
.../apache/commons/dbutils/OutParameter.java | 2 +-
.../commons/dbutils/ResultSetIterator.java | 2 +-
.../dbutils/handlers/BeanMapHandler.java | 4 +-
.../commons/dbutils/handlers/KeyedHandler.java | 2 +-
.../wrappers/SqlNullCheckedResultSet.java | 2 +-
src/site/xdoc/download_dbutils.xml | 60 +++++++++++++-------
src/site/xdoc/issue-tracking.xml | 30 +++++-----
src/site/xdoc/mail-lists.xml | 31 +++++-----
19 files changed, 161 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/008f7571/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 950d048,fdf00c7..7d072d2
--- a/pom.xml
+++ b/pom.xml
@@@ -238,33 -237,15 +237,33 @@@
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
+
+ <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
+
<commons.componentid>dbutils</commons.componentid>
<commons.module.name>org.apache.commons.dbutils</commons.module.name>
- <commons.release.version>1.6</commons.release.version>
- <commons.rc.version>RC1</commons.rc.version>
+ <commons.release.version>1.7</commons.release.version>
+ <commons.rc.version>RC2</commons.rc.version>
<commons.jira.id>DBUTILS</commons.jira.id>
<commons.jira.pid>12310470</commons.jira.pid>
- </properties>
+ </properties>
<build>
+ <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check findbugs:check javadoc:javadoc</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <headerLocation>${basedir}/license-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[12/14] commons-dbutils git commit: Bump to next release version
2.0-SNAPSHOT
Posted by th...@apache.org.
Bump to next release version 2.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/3864117a
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/3864117a
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/3864117a
Branch: refs/heads/master
Commit: 3864117aef5ab16450459da568b18203e791d225
Parents: 60b61ac
Author: Carl Hall <th...@apache.org>
Authored: Thu Jul 20 20:48:20 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Thu Jul 20 20:48:20 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/3864117a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72fdef3..ee5b93a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<name>Apache Commons DbUtils</name>
<inceptionYear>2002</inceptionYear>
[09/14] commons-dbutils git commit: Update issue tracking and mail
list site docs
Posted by th...@apache.org.
Update issue tracking and mail list site docs
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/77faa3ca
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/77faa3ca
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/77faa3ca
Branch: refs/heads/master
Commit: 77faa3caefc24697b00bf370111f7307dae339b0
Parents: e639004
Author: Carl Hall <th...@apache.org>
Authored: Sun Jul 16 14:40:55 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sun Jul 16 14:40:55 2017 -0700
----------------------------------------------------------------------
src/site/xdoc/issue-tracking.xml | 30 +++++++++++++++---------------
src/site/xdoc/mail-lists.xml | 31 +++++++++++++++++--------------
2 files changed, 32 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/77faa3ca/src/site/xdoc/issue-tracking.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 369b988..0d623b7 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -43,35 +43,35 @@ limitations under the License.
-->
<document>
<properties>
- <title>Commons DbUtils Issue tracking</title>
- <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ <title>Apache Commons DbUtils Issue tracking</title>
+ <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
</properties>
<body>
- <section name="Commons DbUtils Issue tracking">
+ <section name="Apache Commons DbUtils Issue tracking">
<p>
- Commons DbUtils uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
- See the <a href="http://issues.apache.org/jira/browse/DBUTILS">Commons DbUtils JIRA project page</a>.
+ Apache Commons DbUtils uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+ See the <a href="https://issues.apache.org/jira/browse/DBUTILS">Apache Commons DbUtils JIRA project page</a>.
</p>
<p>
- To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+ To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
(if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
- created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+ created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
page to get a new password).
</p>
<p>
If you would like to report a bug, or raise an enhancement request with
- Commons DbUtils please do the following:
+ Apache Commons DbUtils please do the following:
<ol>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>.
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>.
If you find your issue listed then please add a comment with your details.</li>
<li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
You may find your issue or idea has already been discussed.</li>
<li>Decide if your issue is a bug or an enhancement.</li>
- <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310470&issuetype=1&priority=4&assignee=-1">bug report</a>
- or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310470&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li>
+ <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310470&issuetype=1&priority=4&assignee=-1">bug report</a>
+ or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310470&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li>
</ol>
</p>
@@ -80,7 +80,7 @@ limitations under the License.
<ul>
<li>the more information you provide, the better we can help you</li>
<li>test cases are vital, particularly for any proposed enhancements</li>
- <li>the developers of Commons DbUtils are all unpaid volunteers</li>
+ <li>the developers of Apache Commons DbUtils are all unpaid volunteers</li>
</ul>
</p>
@@ -92,9 +92,9 @@ limitations under the License.
<p>
You may also find these links useful:
<ul>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Commons DbUtils bugs</a></li>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Commons DbUtils bugs</a></li>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC">All Commons DbUtils bugs</a></li>
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Apache Commons DbUtils bugs</a></li>
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Apache Commons DbUtils bugs</a></li>
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310470&sorter/field=issuekey&sorter/order=DESC">All Apache Commons DbUtils bugs</a></li>
</ul>
</p>
</section>
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/77faa3ca/src/site/xdoc/mail-lists.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 5133881..cdb0c80 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -41,14 +41,14 @@ limitations under the License.
-->
<document>
<properties>
- <title>Commons DbUtils Mailing Lists</title>
- <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ <title>Apache Commons DbUtils Mailing Lists</title>
+ <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
</properties>
<body>
<section name="Overview">
<p>
- <a href="index.html">Commons DbUtils</a> shares mailing lists with all the other
+ <a href="index.html">Apache Commons DbUtils</a> shares mailing lists with all the other
<a href="http://commons.apache.org/components.html">Commons Components</a>.
To make it easier for people to only read messages related to components they are interested in,
the convention in Commons is to prefix the subject line of messages with the component's name,
@@ -58,24 +58,27 @@ limitations under the License.
</ul>
</p>
<p>
- Questions related to the usage of Commons DbUtils should be posted to the
+ Questions related to the usage of Apache Commons DbUtils should be posted to the
<a href="http://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
<br />
The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
- is for questions and discussion related to the development of Commons DbUtils.
+ is for questions and discussion related to the development of Apache Commons DbUtils.
<br />
Please do not cross-post; developers are also subscribed to the user list.
+ <br />
+ You must be subscribed to post to the mailing lists. Follow the Subscribe links below
+ to subscribe.
</p>
<p>
<strong>Note:</strong> please don't send patches or attachments to any of the mailing lists.
- Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.
- Otherwise, please upload the file to a public server and include the URL in the mail.
+ Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.
+ Otherwise, please upload the file to a public server and include the URL in the mail.
</p>
</section>
- <section name="Commons DbUtils Mailing Lists">
+ <section name="Apache Commons DbUtils Mailing Lists">
<p>
- <strong>Please prefix the subject line of any messages for <a href="index.html">Commons DbUtils</a>
+ <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons DbUtils</a>
with <i>[dbutils]</i></strong> - <i>thanks!</i>
<br />
<br />
@@ -96,7 +99,7 @@ limitations under the License.
<td>
<strong>Commons User List</strong>
<br /><br />
- Questions on using Commons DbUtils.
+ Questions on using Apache Commons DbUtils.
<br /><br />
</td>
<td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
@@ -114,7 +117,7 @@ limitations under the License.
<td>
<strong>Commons Developer List</strong>
<br /><br />
- Discussion of development of Commons DbUtils.
+ Discussion of development of Apache Commons DbUtils.
<br /><br />
</td>
<td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
@@ -185,10 +188,10 @@ limitations under the License.
General announcements of Apache project releases.
<br /><br />
</td>
- <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
- <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
+ <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
+ <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
<td><i>read only</i></td>
- <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
+ <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
<td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/">markmail.org</a><br />
<a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />
<a class="externalLink" href="http://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />
[02/14] commons-dbutils git commit: Update download page for 1.7
release
Posted by th...@apache.org.
Update download page for 1.7 release
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/7ea01787
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/7ea01787
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/7ea01787
Branch: refs/heads/master
Commit: 7ea01787aed522ad89091535b987c9108553406a
Parents: 09fbd42
Author: Carl Hall <th...@apache.org>
Authored: Sat Jul 8 22:42:50 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sat Jul 8 22:42:50 2017 -0700
----------------------------------------------------------------------
src/site/xdoc/download_dbutils.xml | 60 +++++++++++++++++++++------------
1 file changed, 38 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/7ea01787/src/site/xdoc/download_dbutils.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_dbutils.xml b/src/site/xdoc/download_dbutils.xml
index a49cc10..0c4b464 100644
--- a/src/site/xdoc/download_dbutils.xml
+++ b/src/site/xdoc/download_dbutils.xml
@@ -31,10 +31,21 @@ limitations under the License.
| 2) Set the following properties in the component's pom: |
| - commons.componentid (required, alphabetic, lower case) |
| - commons.release.version (required) |
- | - commons.binary.suffix (optional) |
+ | - commons.release.name (required) |
+ | - commons.binary.suffix (optional) |
| (defaults to "-bin", set to "" for pre-maven2 releases) |
+ | - commons.release.desc (optional) |
+ | - commons.release.subdir (optional) |
+ | |
+ | - commons.release.2/3.version (conditional) |
+ | - commons.release.2/3.name (conditional) |
+ | - commons.release.2/3.binary.suffix (optional) |
+ | - commons.release.2/3.desc (optional) |
+ | - commons.release.2/3.subdir (optional) |
| |
| 3) Example Properties |
+ | (commons.release.name inherited by parent: |
+ | ${project.artifactId}-${commons.release.version} |
| |
| <properties> |
| <commons.componentid>math</commons.componentid> |
@@ -46,17 +57,17 @@ limitations under the License.
<document>
<properties>
<title>Download Apache Commons DbUtils</title>
- <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
</properties>
<body>
<section name="Download Apache Commons DbUtils">
<subsection name="Using a Mirror">
<p>
We recommend you use a mirror to download our release
- builds, but you <strong>must</strong> verify the integrity of
+ builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
the downloaded files using signatures downloaded from our main
distribution directories. Recent releases (48 hours) may not yet
- be available from the mirrors.
+ be available from all the mirrors.
</p>
<p>
@@ -88,39 +99,44 @@ limitations under the License.
</form>
<p>
- The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
- link links to the code signing keys used to sign the product.
- The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
- The <code>MD5</code> link downloads the checksum from the main site.
+ It is essential that you
+ <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+ of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+ failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
+ </p>
+ <p>
+ The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+ file contains the public PGP keys used by Apache Commons developers
+ to sign releases.
</p>
</subsection>
</section>
- <section name="Apache Commons DbUtils 1.6 ">
+ <section name="Apache Commons DbUtils 1.7 ">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/dbutils/binaries/commons-dbutils-1.6-bin.tar.gz">commons-dbutils-1.6-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.6-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.6-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbutils/binaries/commons-dbutils-1.7-bin.tar.gz">commons-dbutils-1.7-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.7-bin.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.7-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/dbutils/binaries/commons-dbutils-1.6-bin.zip">commons-dbutils-1.6-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.6-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.6-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbutils/binaries/commons-dbutils-1.7-bin.zip">commons-dbutils-1.7-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.7-bin.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.7-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz">commons-dbutils-1.6-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbutils/source/commons-dbutils-1.7-src.tar.gz">commons-dbutils-1.7-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.7-src.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.7-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/dbutils/source/commons-dbutils-1.6-src.zip">commons-dbutils-1.6-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.6-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.6-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/dbutils/source/commons-dbutils-1.7-src.zip">commons-dbutils-1.7-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.7-src.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.7-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -131,7 +147,7 @@ limitations under the License.
</p>
<ul>
<li class="download"><a href="[preferred]/commons/dbutils/">browse download area</a></li>
- <li><a href="http://archive.apache.org/dist/commons/dbutils/">archives...</a></li>
+ <li><a href="https://archive.apache.org/dist/commons/dbutils/">archives...</a></li>
</ul>
</section>
</body>
[11/14] commons-dbutils git commit: Update ruleset paths to latest
known path
Posted by th...@apache.org.
Update ruleset paths to latest known path
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/60b61acb
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/60b61acb
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/60b61acb
Branch: refs/heads/master
Commit: 60b61acbf2ea2fc360063074320c275cd09845c7
Parents: c052727
Author: Carl Hall <th...@apache.org>
Authored: Sun Jul 16 19:39:22 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sun Jul 16 19:39:22 2017 -0700
----------------------------------------------------------------------
pmd-ruleset.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/60b61acb/pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/pmd-ruleset.xml b/pmd-ruleset.xml
index 10ede41..bec37b4 100644
--- a/pmd-ruleset.xml
+++ b/pmd-ruleset.xml
@@ -22,15 +22,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
- <description>Standard Ruleset but excluding the "no octal
- constants" rule</description>
- <rule ref="rulesets/basic.xml">
+ <description>Standard Ruleset but excluding the "no octal constants" rule</description>
+ <rule ref="rulesets/java/basic.xml">
<exclude name="AvoidUsingOctalValues"/>
<!-- Rule seems to be broken; it's triggered by "new java.sql.Date(time)" -->
<exclude name="AvoidThreadGroup"/>
</rule>
- <rule ref="rulesets/finalizers.xml"/>
- <rule ref="rulesets/imports.xml"/>
- <rule ref="rulesets/unusedcode.xml"/>
- <rule ref="rulesets/braces.xml"/>
+ <rule ref="rulesets/java/finalizers.xml"/>
+ <rule ref="rulesets/java/imports.xml"/>
+ <rule ref="rulesets/java/unusedcode.xml"/>
+ <rule ref="rulesets/java/braces.xml"/>
</ruleset>
[05/14] commons-dbutils git commit: Update javadoc based on results
of mvn javadoc:javadoc
Posted by th...@apache.org.
Update javadoc based on results of mvn javadoc:javadoc
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/33a1e302
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/33a1e302
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/33a1e302
Branch: refs/heads/master
Commit: 33a1e302891eb1b5dae60c2e105a329364a7e4f1
Parents: cd4eb5f
Author: Carl Hall <th...@apache.org>
Authored: Sun Jul 9 00:25:18 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sun Jul 9 00:25:18 2017 -0700
----------------------------------------------------------------------
.../commons/dbutils/AbstractQueryRunner.java | 2 +-
.../commons/dbutils/AsyncQueryRunner.java | 33 +++++++++++++++++++
.../commons/dbutils/BaseResultSetHandler.java | 2 +-
.../apache/commons/dbutils/BeanProcessor.java | 34 ++++++++++----------
.../apache/commons/dbutils/OutParameter.java | 2 +-
.../commons/dbutils/ResultSetIterator.java | 2 +-
.../dbutils/handlers/BeanMapHandler.java | 4 +--
.../commons/dbutils/handlers/KeyedHandler.java | 2 +-
.../wrappers/SqlNullCheckedResultSet.java | 2 +-
9 files changed, 58 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
index de735d9..d6b9f2b 100644
--- a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
+++ b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
@@ -35,7 +35,7 @@ import java.util.Arrays;
import javax.sql.DataSource;
/**
- * The base class for QueryRunner & AsyncQueryRunner. This class is thread safe.
+ * The base class for QueryRunner & AsyncQueryRunner. This class is thread safe.
*
* @since 1.4 (mostly extracted from QueryRunner)
*/
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java b/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java
index ce140b5..4625695 100644
--- a/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java
+++ b/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java
@@ -555,6 +555,10 @@ public class AsyncQueryRunner extends AbstractQueryRunner {
/**
* Executes {@link QueryRunner#insert(String, ResultSetHandler)} asynchronously.
*
+ * @param <T> Return type expected
+ * @param sql SQL insert statement to execute
+ * @param rsh {@link ResultSetHandler} for handling the results
+ * @return {@link Future} that executes a query runner insert
* @see QueryRunner#insert(String, ResultSetHandler)
* @throws SQLException if a database access error occurs
* @since 1.6
@@ -573,6 +577,11 @@ public class AsyncQueryRunner extends AbstractQueryRunner {
/**
* Executes {@link QueryRunner#insert(String, ResultSetHandler, Object...)} asynchronously.
*
+ * @param <T> Return type expected
+ * @param sql SQL insert statement to execute
+ * @param rsh {@link ResultSetHandler} for handling the results
+ * @param params Parameter values for substitution in the SQL statement
+ * @return {@link Future} that executes a query runner insert
* @see QueryRunner#insert(String, ResultSetHandler, Object...)
* @throws SQLException if a database access error occurs
* @since 1.6
@@ -590,6 +599,11 @@ public class AsyncQueryRunner extends AbstractQueryRunner {
/**
* Executes {@link QueryRunner#insert(Connection, String, ResultSetHandler)} asynchronously.
*
+ * @param <T> Return type expected
+ * @param conn {@link Connection} to use to execute the SQL statement
+ * @param sql SQL insert statement to execute
+ * @param rsh {@link ResultSetHandler} for handling the results
+ * @return {@link Future} that executes a query runner insert
* @see QueryRunner#insert(Connection, String, ResultSetHandler)
* @throws SQLException if a database access error occurs
* @since 1.6
@@ -607,6 +621,12 @@ public class AsyncQueryRunner extends AbstractQueryRunner {
/**
* Executes {@link QueryRunner#insert(Connection, String, ResultSetHandler, Object...)} asynchronously.
*
+ * @param <T> Return type expected
+ * @param conn {@link Connection} to use to execute the SQL statement
+ * @param sql SQL insert statement to execute
+ * @param rsh {@link ResultSetHandler} for handling the results
+ * @param params Parameter values for substitution in the SQL statement
+ * @return {@link Future} that executes a query runner insert
* @see QueryRunner#insert(Connection, String, ResultSetHandler, Object...)
* @throws SQLException if a database access error occurs
* @since 1.6
@@ -624,6 +644,12 @@ public class AsyncQueryRunner extends AbstractQueryRunner {
/**
* {@link QueryRunner#insertBatch(String, ResultSetHandler, Object[][])} asynchronously.
*
+ * @param <T> Return type expected
+ * @param sql SQL insert statement to execute
+ * @param rsh {@link ResultSetHandler} for handling the results
+ * @param params An array of query replacement parameters. Each row in
+ * this array is one set of batch replacement values.
+ * @return {@link Future} that executes a query runner batch insert
* @see QueryRunner#insertBatch(String, ResultSetHandler, Object[][])
* @throws SQLException if a database access error occurs
* @since 1.6
@@ -641,6 +667,13 @@ public class AsyncQueryRunner extends AbstractQueryRunner {
/**
* {@link QueryRunner#insertBatch(Connection, String, ResultSetHandler, Object[][])} asynchronously.
*
+ * @param <T> Return type expected
+ * @param conn {@link Connection} to use to execute the SQL statement
+ * @param sql SQL insert statement to execute
+ * @param rsh {@link ResultSetHandler} for handling the results
+ * @param params An array of query replacement parameters. Each row in
+ * this array is one set of batch replacement values.
+ * @return {@link Future} that executes a query runner batch insert
* @see QueryRunner#insertBatch(Connection, String, ResultSetHandler, Object[][])
* @throws SQLException if a database access error occurs
* @since 1.6
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java b/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
index 853a117..7cbf131 100644
--- a/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
@@ -81,7 +81,7 @@ public abstract class BaseResultSetHandler<T> implements ResultSetHandler<T> {
*
* @return An Object initialized with <code>ResultSet</code> data
* @throws SQLException if a database access error occurs
- * @see {@link ResultSetHandler#handle(ResultSet)}
+ * @see ResultSetHandler#handle(ResultSet)
*/
protected abstract T handle() throws SQLException;
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index ce1098a..74de18a 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -121,28 +121,28 @@ public class BeanProcessor {
* implementation uses reflection and <code>BeanInfo</code> classes to
* match column names to bean property names. Properties are matched to
* columns based on several factors:
- * <br/>
- * <ol>
- * <li>
+ * <br/>
+ * <ol>
+ * <li>
* The class has a writable property with the same name as a column.
* The name comparison is case insensitive.
- * </li>
+ * </li>
*
- * <li>
+ * <li>
* The column type can be converted to the property's set method
* parameter type with a ResultSet.get* method. If the conversion fails
* (ie. the property was an int and the column was a Timestamp) an
* SQLException is thrown.
- * </li>
- * </ol>
+ * </li>
+ * </ol>
*
- * <p>
+ * <p>
* Primitive bean properties are set to their defaults when SQL NULL is
* returned from the <code>ResultSet</code>. Numeric fields are set to 0
* and booleans are set to false. Object bean properties are set to
* <code>null</code> when SQL NULL is returned. This is the same behavior
* as the <code>ResultSet</code> get* methods.
- * </p>
+ * </p>
* @param <T> The type of bean to create
* @param rs ResultSet that supplies the bean data
* @param type Class from which to create the bean instance
@@ -159,20 +159,20 @@ public class BeanProcessor {
* This implementation uses reflection and <code>BeanInfo</code> classes to
* match column names to bean property names. Properties are matched to
* columns based on several factors:
- * <br/>
- * <ol>
- * <li>
+ * <br/>
+ * <ol>
+ * <li>
* The class has a writable property with the same name as a column.
* The name comparison is case insensitive.
- * </li>
+ * </li>
*
- * <li>
+ * <li>
* The column type can be converted to the property's set method
* parameter type with a ResultSet.get* method. If the conversion fails
* (ie. the property was an int and the column was a Timestamp) an
* SQLException is thrown.
- * </li>
- * </ol>
+ * </li>
+ * </ol>
*
* <p>
* Primitive bean properties are set to their defaults when SQL NULL is
@@ -180,7 +180,7 @@ public class BeanProcessor {
* and booleans are set to false. Object bean properties are set to
* <code>null</code> when SQL NULL is returned. This is the same behavior
* as the <code>ResultSet</code> get* methods.
- * </p>
+ * </p>
* @param <T> The type of bean to create
* @param rs ResultSet that supplies the bean data
* @param type Class from which to create the bean instance
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/OutParameter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/OutParameter.java b/src/main/java/org/apache/commons/dbutils/OutParameter.java
index 0abf84d..d49b474 100644
--- a/src/main/java/org/apache/commons/dbutils/OutParameter.java
+++ b/src/main/java/org/apache/commons/dbutils/OutParameter.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
/**
* Represents an OUT parameter for a stored procedure. When running a stored
- * procedure with {@link ProcedureRunner}, pass an instance of
+ * procedure with {@link QueryRunner}, pass an instance of
* <code>OutParameter</code> to indicate that the parameter at that index is an
* OUT parameter. The value of the parameter may be obtained from the
* <code>OutParameter</code> instance via {@link #getValue() }.
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
index 0eeda4a..50e2a12 100644
--- a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
/**
* <p>
- * Wraps a <code>ResultSet</code> in an <code>Iterator<Object[]></code>. This is useful
+ * Wraps a <code>ResultSet</code> in an <code>Iterator<Object[]></code>. This is useful
* when you want to present a non-database application layer with domain
* neutral data.
* </p>
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java
index 4f5ba48..79cfbb4 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java
@@ -43,10 +43,10 @@ import org.apache.commons.dbutils.RowProcessor;
* returned for id is dependent upon how your JDBC driver converts SQL column
* types from the Person table into Java types. The "name" and "age" columns are
* converted according to their property descriptors by DbUtils.
- * </p>
+ * </p>
* <p>
* This class is thread safe.
- * </p>
+ * </p>
*
* @param <K>
* the type of keys maintained by the returned map
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
index 6ef9bbe..ed79290 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
@@ -42,7 +42,7 @@ import org.apache.commons.dbutils.RowProcessor;
* returned Map's get() method can be in any case. The data types returned for
* name and age are dependent upon how your JDBC driver converts SQL column
* types from the Person table into Java types.
- * </p>
+ * </p>
* <p>This class is thread safe.</p>
*
* @param <K> The type of the key
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/33a1e302/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java b/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
index f8d1d3f..85f273c 100644
--- a/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
+++ b/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
@@ -65,7 +65,7 @@ import org.apache.commons.dbutils.ProxyFactory;
* rs.close();
* </pre>
* </blockquote>
- * </p>
+ * </p>
* <p>Unlike some other classes in DbUtils, this class is NOT thread-safe.</p>
*/
public class SqlNullCheckedResultSet implements InvocationHandler {
[07/14] commons-dbutils git commit: [DBUTILS-70] Add statement
configuration for setting parameters on sql statements. Fix resource leak
when a SQLException is thrown configuring a statement.
Posted by th...@apache.org.
[DBUTILS-70] Add statement configuration for setting parameters on sql
statements. Fix resource leak when a SQLException is thrown configuring
a statement.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/35d1db26
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/35d1db26
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/35d1db26
Branch: refs/heads/master
Commit: 35d1db263c01b2d051f68c89e25103c0fcfd0afd
Parents: cf7498e
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Jul 16 12:43:02 2017 -0700
Committer: Carl Hall <th...@apache.org>
Committed: Sun Jul 16 13:02:12 2017 -0700
----------------------------------------------------------------------
.../apache/commons/dbutils/AbstractQueryRunner.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/35d1db26/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
index d6b9f2b..961aa68 100644
--- a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
+++ b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
@@ -205,7 +205,12 @@ public abstract class AbstractQueryRunner {
throws SQLException {
PreparedStatement ps = conn.prepareStatement(sql);
- configureStatement(ps);
+ try {
+ configureStatement(ps);
+ } catch (SQLException e) {
+ ps.close();
+ throw e;
+ }
return ps;
}
@@ -236,7 +241,12 @@ public abstract class AbstractQueryRunner {
throws SQLException {
PreparedStatement ps = conn.prepareStatement(sql, returnedKeys);
- configureStatement(ps);
+ try {
+ configureStatement(ps);
+ } catch (SQLException e) {
+ ps.close();
+ throw e;
+ }
return ps;
}