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 <[email protected]> Authored: Thu Jul 20 20:52:48 2017 -0700 Committer: Carl Hall <[email protected]> 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>
