[text] Update for 1.4.
Repository: commons-text Updated Branches: refs/heads/master 37a6fb67b -> 606cdfb84 Update for 1.4. Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/606cdfb8 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/606cdfb8 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/606cdfb8 Branch: refs/heads/master Commit: 606cdfb8441aa5cda56ead0394e1eef2f24321ef Parents: 37a6fb6 Author: Gary Gregory Authored: Wed Jun 13 08:55:53 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 08:55:53 2018 -0600 -- src/site/xdoc/release-history.xml | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-text/blob/606cdfb8/src/site/xdoc/release-history.xml -- diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml index f2d8678..e744cd0 100644 --- a/src/site/xdoc/release-history.xml +++ b/src/site/xdoc/release-history.xml @@ -27,19 +27,22 @@ limitations under the License. VersionRelease dateRequired Java VersionJavadocRelease notes - 1.303-16-20187.0api-1.3release notes for 1.3 + 1.406-12-20188api-1.3release notes for 1.4 - 1.212-12-20177.0api-1.2release notes for 1.2 + 1.303-16-20187api-1.3release notes for 1.3 - 1.15-23-20177.0api-1.1release notes for 1.1 + 1.212-12-20177api-1.2release notes for 1.2 - 1.03-11-20177.0api-1.0release notes for 1.0 + 1.15-23-20177api-1.1release notes for 1.1 - 1.0-beta-12-9-20177.0api-1.0-beta-1release notes for 1.0-beta-1 + 1.03-11-20177api-1.0release notes for 1.0 + + + 1.0-beta-12-9-20177api-1.0-beta-1release notes for 1.0-beta-1
[text] Update for 1.4.
Repository: commons-text Updated Branches: refs/heads/master 606cdfb84 -> f3c612bc9 Update for 1.4. Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/f3c612bc Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/f3c612bc Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/f3c612bc Branch: refs/heads/master Commit: f3c612bc9f98a3f5804d276f3e51ce4218e64716 Parents: 606cdfb Author: Gary Gregory Authored: Wed Jun 13 09:02:27 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 09:02:27 2018 -0600 -- src/site/xdoc/release-history.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-text/blob/f3c612bc/src/site/xdoc/release-history.xml -- diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml index e744cd0..886a794 100644 --- a/src/site/xdoc/release-history.xml +++ b/src/site/xdoc/release-history.xml @@ -27,7 +27,7 @@ limitations under the License. VersionRelease dateRequired Java VersionJavadocRelease notes - 1.406-12-20188api-1.3release notes for 1.4 + 1.406-12-20188api-1.4release notes for 1.4 1.303-16-20187api-1.3release notes for 1.3
[text] Key for that matches my @apache email as opposed to my @gmail.
Repository: commons-text Updated Branches: refs/heads/master f3c612bc9 -> 9a38e76f7 Key for that matches my @apache email as opposed to my @gmail. Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/9a38e76f Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/9a38e76f Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/9a38e76f Branch: refs/heads/master Commit: 9a38e76f7860b5b3e41f8c46896c0b02b3ec9740 Parents: f3c612b Author: Gary Gregory Authored: Wed Jun 13 09:13:05 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 09:13:05 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-text/blob/9a38e76f/pom.xml -- diff --git a/pom.xml b/pom.xml index ba3ab1b..f36deb5 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} Gary Gregory - 2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB +86fdc7e2a11262cb
svn commit: r27424 - /dev/commons/lang/3.8-SNAPSHOT-RC1/
Author: chtompki Date: Wed Jun 13 15:16:36 2018 New Revision: 27424 Log: Adding release directories: commons-lang3, version: 3.8-SNAPSHOT Added: dev/commons/lang/3.8-SNAPSHOT-RC1/
svn commit: r27426 - /dev/commons/lang/3.8-SNAPSHOT-RC1/site/
Author: chtompki Date: Wed Jun 13 15:16:41 2018 New Revision: 27426 Log: Adding release directories: commons-lang3, version: 3.8-SNAPSHOT Added: dev/commons/lang/3.8-SNAPSHOT-RC1/site/
svn commit: r27425 - /dev/commons/lang/3.8-SNAPSHOT-RC1/binaries/
Author: chtompki Date: Wed Jun 13 15:16:38 2018 New Revision: 27425 Log: Adding release directories: commons-lang3, version: 3.8-SNAPSHOT Added: dev/commons/lang/3.8-SNAPSHOT-RC1/binaries/
svn commit: r27427 - /dev/commons/lang/3.8-SNAPSHOT-RC1/site/apidocs/
Author: chtompki Date: Wed Jun 13 15:16:43 2018 New Revision: 27427 Log: Adding release directories: commons-lang3, version: 3.8-SNAPSHOT Added: dev/commons/lang/3.8-SNAPSHOT-RC1/site/apidocs/
svn commit: r27429 - /dev/commons/lang/3.8-SNAPSHOT-RC1/
Author: chtompki Date: Wed Jun 13 15:20:15 2018 New Revision: 27429 Log: Deleting testing staged directories Removed: dev/commons/lang/3.8-SNAPSHOT-RC1/
svn commit: r27430 - in /release/commons/text/binaries: commons-text-1.4-bin.tar.gz.sha1 commons-text-1.4-bin.tar.gz.sha256 commons-text-1.4-bin.zip.sha1 commons-text-1.4-bin.zip.sha256
Author: ggregory Date: Wed Jun 13 15:30:07 2018 New Revision: 27430 Log: Fix checksum files. Modified: release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha1 release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha256 release/commons/text/binaries/commons-text-1.4-bin.zip.sha1 release/commons/text/binaries/commons-text-1.4-bin.zip.sha256 Modified: release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha1 == --- release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha1 (original) +++ release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha1 Wed Jun 13 15:30:07 2018 @@ -1 +1 @@ -0dcee421c4e03d6bc098a61a5cdcc90656856611 +6f46fd82d5ccf9644a37bcec6f2158a52ebdbab8 Modified: release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha256 == --- release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha256 (original) +++ release/commons/text/binaries/commons-text-1.4-bin.tar.gz.sha256 Wed Jun 13 15:30:07 2018 @@ -1 +1 @@ -1cb8536c375c3cff66757fd40c2bf878998254ba0a247866a6536bd48ba2e88a +8b9393f7ddc2efb69d8c2b6f4d85d8711dddfe77009799cf21619fc9b8411897 Modified: release/commons/text/binaries/commons-text-1.4-bin.zip.sha1 == --- release/commons/text/binaries/commons-text-1.4-bin.zip.sha1 (original) +++ release/commons/text/binaries/commons-text-1.4-bin.zip.sha1 Wed Jun 13 15:30:07 2018 @@ -1 +1 @@ -ca1cc6fbb4e46b44f8bb09b70c9e3a2ae3c5fce8 +447a051d6c8292c7e4d7641ca6586b335ef13bd6 Modified: release/commons/text/binaries/commons-text-1.4-bin.zip.sha256 == --- release/commons/text/binaries/commons-text-1.4-bin.zip.sha256 (original) +++ release/commons/text/binaries/commons-text-1.4-bin.zip.sha256 Wed Jun 13 15:30:07 2018 @@ -1 +1 @@ -e4a6c992153faae4f7faff689b899073000364e376736b9746a5d0acb9d8b980 +ad3732dcb38e510b1dbb1544115d0eb797fab61afe0008fdb187cd4ef1706cd7
svn commit: r27431 - in /release/commons/text: binaries/commons-text-1.4-bin.tar.gz.md5 binaries/commons-text-1.4-bin.zip.md5 source/commons-text-1.4-src.tar.gz.md5 source/commons-text-1.4-src.zip.md5
Author: ggregory Date: Wed Jun 13 15:33:56 2018 New Revision: 27431 Log: MD5 files should not be published anymore. Removed: release/commons/text/binaries/commons-text-1.4-bin.tar.gz.md5 release/commons/text/binaries/commons-text-1.4-bin.zip.md5 release/commons/text/source/commons-text-1.4-src.tar.gz.md5 release/commons/text/source/commons-text-1.4-src.zip.md5
commons-release-plugin git commit: (fix) uniquely identify hashes in sha256 and sha1 artifact maps
Repository: commons-release-plugin Updated Branches: refs/heads/master 3b775f6f6 -> 812ea8f51 (fix) uniquely identify hashes in sha256 and sha1 artifact maps Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/812ea8f5 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/812ea8f5 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/812ea8f5 Branch: refs/heads/master Commit: 812ea8f5150124756c991632ead795202e72197d Parents: 3b775f6 Author: Rob Tompkins Authored: Wed Jun 13 12:38:57 2018 -0400 Committer: Rob Tompkins Committed: Wed Jun 13 12:38:57 2018 -0400 -- .../CommonsDistributionDetachmentMojo.java | 7 + .../CommonsDistributionDetachmentMojoTest.java | 62 ++- .../DistributionDetachmentProjectStub.java | 200 ++--- .../target/commons-text-1.4-bin.tar.gz | Bin 0 -> 1812152 bytes .../target/commons-text-1.4-bin.tar.gz.asc | 11 + .../target/commons-text-1.4-bin.zip | Bin 0 -> 2183252 bytes .../target/commons-text-1.4-bin.zip.asc | 11 + .../target/commons-text-1.4-javadoc.jar | Bin 0 -> 537451 bytes .../target/commons-text-1.4-javadoc.jar.asc | 16 + .../target/commons-text-1.4-sources.jar | Bin 0 -> 213808 bytes .../target/commons-text-1.4-sources.jar.asc | 16 + .../target/commons-text-1.4-src.tar.gz | Bin 0 -> 273552 bytes .../target/commons-text-1.4-src.tar.gz.asc | 11 + .../target/commons-text-1.4-src.zip | Bin 0 -> 434498 bytes .../target/commons-text-1.4-src.zip.asc | 11 + .../target/commons-text-1.4-test-sources.jar| Bin 0 -> 136486 bytes .../commons-text-1.4-test-sources.jar.asc | 16 + .../target/commons-text-1.4-tests.jar | Bin 0 -> 248578 bytes .../target/commons-text-1.4-tests.jar.asc | 16 + .../target/commons-text-1.4.jar | Bin 0 -> 183750 bytes .../target/commons-text-1.4.jar.asc | 16 + .../target/commons-text-1.4.pom | 442 +++ .../target/commons-text-1.4.pom.asc | 16 + .../target/mockAttachedFile.html| 24 - .../target/mockAttachedTar-bin.tar.gz | Bin 327 -> 0 bytes .../target/mockAttachedTar-bin.tar.gz.asc | Bin 566 -> 0 bytes .../target/mockAttachedTar-src.tar.gz | Bin 327 -> 0 bytes .../target/mockAttachedTar-src.tar.gz.asc | Bin 566 -> 0 bytes .../target/mockAttachedZip-bin.zip | Bin 1323 -> 0 bytes .../target/mockAttachedZip-bin.zip.asc | Bin 566 -> 0 bytes .../target/mockAttachedZip-src.zip | Bin 1323 -> 0 bytes .../target/mockAttachedZip-src.zip.asc | Bin 566 -> 0 bytes 32 files changed, 775 insertions(+), 100 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/812ea8f5/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java -- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java index fd5972d..9c95127 100755 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java @@ -163,6 +163,7 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo { artifactKey .append(artifact.getArtifactId()).append('-') .append(artifact.getVersion()).append('-') +.append(artifact.getClassifier()).append('-') .append(artifact.getType()); try (FileInputStream fis = new FileInputStream(artifact.getFile())) { artifactSha1s.put(artifactKey.toString(), DigestUtils.sha1Hex(fis)); @@ -172,6 +173,8 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo { "Could not find artifact signature for: " + artifact.getArtifactId() + "-" ++ artifact.getClassifier() ++ "-" + artifact.getVersion() + " type: " + artifact.getType(), @@ -191,6 +194,7 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo { artifactKey .append(artifact.getArtifactId()).append('-') .append(artifact.getVersion()).append('-') +.append(artifact.getClassifier()).append('-') .append(artifact.getType()); try
commons-release-plugin git commit: (fix) checkstyle and StagingMojoTest
Repository: commons-release-plugin Updated Branches: refs/heads/master 812ea8f51 -> 1900a67fb (fix) checkstyle and StagingMojoTest Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/1900a67f Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/1900a67f Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/1900a67f Branch: refs/heads/master Commit: 1900a67fb694c655542350cba444fef85aa2121e Parents: 812ea8f Author: Rob Tompkins Authored: Wed Jun 13 12:47:19 2018 -0400 Committer: Rob Tompkins Committed: Wed Jun 13 12:47:19 2018 -0400 -- .../CommonsDistributionStagingMojoTest.java | 40 +-- .../DistributionDetachmentProjectStub.java | 284 +-- 2 files changed, 162 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/1900a67f/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java -- diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java index 9b40cc7..e5d4734 100755 --- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java +++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java @@ -96,28 +96,28 @@ public class CommonsDistributionStagingMojoTest { File headerHtml = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/HEADER.html"); File binariesReadmeHtml = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/README.html"); File binariesHeaderHtml = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/HEADER.html"); -File binTar = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedTar-bin.tar.gz"); -File binTarASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedTar-bin.tar.gz.asc"); -File binTarMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedTar-bin.tar.gz.md5"); -File binTarSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedTar-bin.tar.gz.sha1"); -File binTarSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedTar-bin.tar.gz.sha256"); -File binZip = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedZip-bin.zip"); -File binZipASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedZip-bin.zip.asc"); -File binZipMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedZip-bin.zip.md5"); -File binZipSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedZip-bin.zip.sha1"); -File binZipSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/mockAttachedZip-bin.zip.sha256"); +File binTar = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz"); +File binTarASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.asc"); +File binTarMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.md5"); +File binTarSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.sha1"); +File binTarSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.sha256"); +File binZip = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip"); +File binZipASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.asc"); +File binZipMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.md5"); +File binZipSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.sha1"); +File binZipSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.sha256"); File sourcesReadmeHtml = new File(COM
commons-release-plugin git commit: (rat) update excludes for test artifacts
Repository: commons-release-plugin Updated Branches: refs/heads/master 1900a67fb -> d86ff62ce (rat) update excludes for test artifacts Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/d86ff62c Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/d86ff62c Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/d86ff62c Branch: refs/heads/master Commit: d86ff62ce4dcb2af0fa4b3e0fd8c2d23ba26a263 Parents: 1900a67 Author: Rob Tompkins Authored: Wed Jun 13 12:52:05 2018 -0400 Committer: Rob Tompkins Committed: Wed Jun 13 12:52:05 2018 -0400 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d86ff62c/pom.xml -- diff --git a/pom.xml b/pom.xml index 1e56a45..6e95e7f 100755 --- a/pom.xml +++ b/pom.xml @@ -242,8 +242,8 @@ site-content/** - src/site/resources/download_lang.cgi - src/test/resources/stringEscapeUtilsTestData.txt + src/site/resources/download_commons-release-plugin.cgi + src/test/resources/mojos/detach-distributions/commons-text* src/site/resources/release-notes/RELEASE-NOTES-*.txt
commons-release-plugin git commit: (rat) exclude test release artifact signature files
Repository: commons-release-plugin Updated Branches: refs/heads/master d86ff62ce -> 0692a619b (rat) exclude test release artifact signature files Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/0692a619 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/0692a619 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/0692a619 Branch: refs/heads/master Commit: 0692a619b684bdb4d63745ca47c4657338038ddd Parents: d86ff62 Author: Rob Tompkins Authored: Wed Jun 13 12:58:21 2018 -0400 Committer: Rob Tompkins Committed: Wed Jun 13 12:58:21 2018 -0400 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/0692a619/pom.xml -- diff --git a/pom.xml b/pom.xml index 6e95e7f..433057e 100755 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ site-content/** src/site/resources/download_commons-release-plugin.cgi - src/test/resources/mojos/detach-distributions/commons-text* + src/test/resources/mojos/detach-distributions/target/commons-text-1.4*.asc src/site/resources/release-notes/RELEASE-NOTES-*.txt
commons-release-plugin git commit: Update Apache Commons Compress from 1.16.1 to 1.17.
Repository: commons-release-plugin Updated Branches: refs/heads/master 0692a619b -> f6ac9dc8b Update Apache Commons Compress from 1.16.1 to 1.17. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/f6ac9dc8 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/f6ac9dc8 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/f6ac9dc8 Branch: refs/heads/master Commit: f6ac9dc8b4f3075edd809c69307db480ce150705 Parents: 0692a61 Author: Gary Gregory Authored: Wed Jun 13 11:04:40 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:04:40 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/f6ac9dc8/pom.xml -- diff --git a/pom.xml b/pom.xml index 433057e..8534ff1 100755 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ org.apache.commons commons-compress - 1.16.1 + 1.17 org.apache.maven.plugin-testing
commons-release-plugin git commit: Update maven-plugin-annotations 3.5.1 -> 3.5.2. OK: mvn clean install -Dskip.animal.sniffer
Repository: commons-release-plugin Updated Branches: refs/heads/master f6ac9dc8b -> 84d28b904 Update maven-plugin-annotations 3.5.1 -> 3.5.2. OK: mvn clean install -Dskip.animal.sniffer Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/84d28b90 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/84d28b90 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/84d28b90 Branch: refs/heads/master Commit: 84d28b9043347a0a99dc8dded9466420b3f4095e Parents: f6ac9dc Author: Gary Gregory Authored: Wed Jun 13 11:05:57 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:05:57 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/84d28b90/pom.xml -- diff --git a/pom.xml b/pom.xml index 8534ff1..32778b3 100755 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.5.1 + 3.5.2 org.apache.maven
commons-release-plugin git commit: Update maven-plugin-tools-ant 3.5.1 -> 3.5.2. OK: mvn clean install -Dskip.animal.sniffer
Repository: commons-release-plugin Updated Branches: refs/heads/master 84d28b904 -> e68e2595e Update maven-plugin-tools-ant 3.5.1 -> 3.5.2. OK: mvn clean install -Dskip.animal.sniffer Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/e68e2595 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/e68e2595 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/e68e2595 Branch: refs/heads/master Commit: e68e2595e5801050b5f4ee96c778efdf0cf181c5 Parents: 84d28b9 Author: Gary Gregory Authored: Wed Jun 13 11:07:28 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:07:28 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/e68e2595/pom.xml -- diff --git a/pom.xml b/pom.xml index 32778b3..cb96182 100755 --- a/pom.xml +++ b/pom.xml @@ -260,7 +260,7 @@ org.apache.maven.plugin-tools maven-plugin-tools-ant -3.5.1 +3.5.2
commons-release-plugin git commit: Update plexus-velocity 1.1.8 -> 1.2. OK: mvn clean install -Dskip.animal.sniffer
Repository: commons-release-plugin Updated Branches: refs/heads/master e68e2595e -> 97238d3ff Update plexus-velocity 1.1.8 -> 1.2. OK: mvn clean install -Dskip.animal.sniffer Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/97238d3f Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/97238d3f Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/97238d3f Branch: refs/heads/master Commit: 97238d3ff3c3fc0223724a96bd5a807976334b43 Parents: e68e259 Author: Gary Gregory Authored: Wed Jun 13 11:09:05 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:09:05 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/97238d3f/pom.xml -- diff --git a/pom.xml b/pom.xml index cb96182..72025b1 100755 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ org.codehaus.plexus plexus-velocity - 1.1.8 + 1.2 org.codehaus.plexus
commons-release-plugin git commit: Update Checkstyle 6.19 -> 8.10.1. OK: mvn clean site -Dskip.animal.sniffer (no Checkstykle errors, warnings, or infos with both versions.)
Repository: commons-release-plugin Updated Branches: refs/heads/master 97238d3ff -> 13210c797 Update Checkstyle 6.19 -> 8.10.1. OK: mvn clean site -Dskip.animal.sniffer (no Checkstykle errors, warnings, or infos with both versions.) Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/13210c79 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/13210c79 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/13210c79 Branch: refs/heads/master Commit: 13210c797d64213c6167010914391379a75f4076 Parents: 97238d3 Author: Gary Gregory Authored: Wed Jun 13 11:13:06 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:13:06 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/13210c79/pom.xml -- diff --git a/pom.xml b/pom.xml index 72025b1..2cb4d73 100755 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ site-content 3.0.0 -6.19 +8.10.1 1.10.0 0.8.0 0.1
commons-release-plugin git commit: Add .checkstyle file to git ignore file.
Repository: commons-release-plugin Updated Branches: refs/heads/master 13210c797 -> 2721e7c22 Add .checkstyle file to git ignore file. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/2721e7c2 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/2721e7c2 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/2721e7c2 Branch: refs/heads/master Commit: 2721e7c225fc3c493af5176675996dcfa3730dc9 Parents: 13210c7 Author: Gary Gregory Authored: Wed Jun 13 11:13:57 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:13:57 2018 -0600 -- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/2721e7c2/.gitignore -- diff --git a/.gitignore b/.gitignore index 6a02374..92a1b2a 100755 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ site-content .settings .classpath .project -.externalToolBuilders \ No newline at end of file +.externalToolBuilders +/.checkstyle
commons-dbcp git commit: Remove trailing white spaces on all lines.
Repository: commons-dbcp Updated Branches: refs/heads/master 518adf659 -> 411cf6223 Remove trailing white spaces on all lines. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/411cf622 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/411cf622 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/411cf622 Branch: refs/heads/master Commit: 411cf6223e17554a0cb1f2c7ea4113391ba437f1 Parents: 518adf6 Author: Gary Gregory Authored: Wed Jun 13 11:17:55 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:17:55 2018 -0600 -- .../java/org/apache/commons/dbcp2/BasicDataSourceFactory.java | 4 ++-- .../java/org/apache/commons/dbcp2/DelegatingConnection.java| 2 +- .../java/org/apache/commons/dbcp2/DelegatingStatement.java | 2 +- .../apache/commons/dbcp2/DriverManagerConnectionFactory.java | 6 +++--- .../org/apache/commons/dbcp2/PoolableConnectionFactory.java| 4 ++-- .../org/apache/commons/dbcp2/PoolableConnectionMXBean.java | 2 +- .../org/apache/commons/dbcp2/PoolablePreparedStatement.java| 2 +- src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java | 2 +- src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 2 +- .../org/apache/commons/dbcp2/SwallowedExceptionLogger.java | 2 +- src/main/java/org/apache/commons/dbcp2/package-info.java | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java index 46af519..69c2cb9 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java @@ -556,7 +556,7 @@ public class BasicDataSourceFactory implements ObjectFactory { * * Parse properties from the string. Format of the string must be [propertyName=property;]* * - * + * * @param propText * @return Properties * @throws Exception @@ -571,7 +571,7 @@ public class BasicDataSourceFactory implements ObjectFactory { /** * Parse list of property values from a delimited string - * + * * @param value *delimited list of values * @param delimiter http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index d6db252..1356efa 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -124,7 +124,7 @@ public class DelegatingConnection extends AbandonedTrace i /** * Returns my underlying {@link Connection}. - * + * * @return my underlying {@link Connection}. */ public C getDelegate() { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 098950d..7cce5e2 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -78,7 +78,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { * This method is useful when you may have nested {@code DelegatingStatement}s, and you want to make sure to obtain * a "genuine" {@link Statement}. * - * + * * @return The innermost delegate. * * @see #getDelegate http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java index 7c62ed5..00c7484 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java @@ -40,7 +40,7 @@ public class DriverManagerConnectionFactory im
commons-dbcp git commit: Key for that matches my @apache email.
Repository: commons-dbcp Updated Branches: refs/heads/master 411cf6223 -> e50c52284 Key for that matches my @apache email. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/e50c5228 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/e50c5228 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/e50c5228 Branch: refs/heads/master Commit: e50c52284e0d3fc47853e16ff9d2f30d10f3c5ee Parents: 411cf62 Author: Gary Gregory Authored: Wed Jun 13 11:18:34 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:18:34 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e50c5228/pom.xml -- diff --git a/pom.xml b/pom.xml index da1c7ed..4387356 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} Gary Gregory - 2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB +86fdc7e2a11262cb
commons-dbcp git commit: Fix project description.
Repository: commons-dbcp Updated Branches: refs/heads/master e50c52284 -> 4148549ee Fix project description. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/4148549e Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/4148549e Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/4148549e Branch: refs/heads/master Commit: 4148549ee5b704b4f1291167b9914b8109084132 Parents: e50c522 Author: Gary Gregory Authored: Wed Jun 13 11:21:08 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:21:08 2018 -0600 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4148549e/README.md -- diff --git a/README.md b/README.md index 0f55474..2e68dff 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Apache Commons DBCP [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/) [![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-dbcp2/2.4.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.4.0) -${project.description} +Apache Commons DBCP software implements Database Connection Pooling Documentation -
commons-dbcp git commit: Prepare for release 2.4.0.
Repository: commons-dbcp Updated Branches: refs/heads/master 4148549ee -> 8c42fb865 Prepare for release 2.4.0. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8c42fb86 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8c42fb86 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8c42fb86 Branch: refs/heads/master Commit: 8c42fb865dfb1a478d3c2d54f1741caaa10f3587 Parents: 4148549 Author: Gary Gregory Authored: Wed Jun 13 11:22:44 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:22:44 2018 -0600 -- RELEASE-NOTES.txt | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8c42fb86/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 8649b4f..acf3ef1 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,8 +1,8 @@ Apache Apache Commons DBCP - Version 2.4.0 - RELEASE NOTES + Version 2.4.0 + RELEASE NOTES -The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.4.0. +The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.4.0-SNAPSHOT. Apache Commons DBCP software implements Database Connection Pooling. @@ -10,6 +10,7 @@ This is a minor release, including bug fixes and enhancements. Changes in this version include: + Fixed Bugs: o DBCP-484: Connection leak during XATransaction in high load. Thanks to Emanuel Freitas. o DBCP-496: Add support for pooling CallableStatements to the org.apache.commons.dbcp2.cpdsadapter package. Thanks to Gary Gregory. @@ -20,6 +21,12 @@ o DBCP-491: Ensure DBCP ConnectionListener can deal with transaction managers w o DBCP-494: org.apache.commons.dbcp2.PStmtKey should make copies of given arrays in constructors. Thanks to Gary Gregory. o DBCP-495: Remove duplicate code in org.apache.commons.dbcp2.cpdsadapter.PStmtKeyCPDS. Thanks to Gary Gregory. o DBCP-497: Deprecate use of PStmtKeyCPDS in favor of PStmtKey. Thanks to Gary Gregory. +o DBCP-498: org.apache.commons.dbcp2.DataSourceConnectionFactory should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-499: org.apache.commons.dbcp2.managed.DataSourceXAConnectionFactory should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-500: org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-501: org.apache.commons.dbcp2.datasources.CPDSConnectionFactory should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-502: org.apache.commons.dbcp2.datasources internals should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-503: org.apache.commons.dbcp2.datasources.InstanceKeyDataSourceFactory.closeAll() does not close all. Thanks to Gary Gregory. For complete information on Apache Commons DBCP, including instructions on how to submit bug reports, @@ -27,6 +34,7 @@ patches, or suggestions for improvement, see the Apache Apache Commons DBCP webs http://commons.apache.org/dbcp/ + - Apache Apache Commons DBCP
[13/50] [abbrv] commons-dbcp git commit: Comment empty block.
Comment empty block. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/437d4d65 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/437d4d65 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/437d4d65 Branch: refs/heads/release Commit: 437d4d653a1eb5e4a7261998f1bbd0bbc558a6fa Parents: f433a99 Author: Gary Gregory Authored: Mon Jun 11 17:46:15 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:46:15 2018 -0600 -- .../org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/437d4d65/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java index 79fbd73..00a6992 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java @@ -273,6 +273,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory { try { connection.setAutoCommit(originalAutoCommit); } catch (final SQLException e) { +// Ignore. } this.currentXid = null; }
[31/50] [abbrv] commons-dbcp git commit: Remove trailing white spaces on all lines.
Remove trailing white spaces on all lines. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/91dc9948 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/91dc9948 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/91dc9948 Branch: refs/heads/release Commit: 91dc9948fcd4d6b2c5e5223d6030c4855d337b60 Parents: 16626a9 Author: Gary Gregory Authored: Mon Jun 11 18:43:18 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:43:18 2018 -0600 -- .../org/apache/commons/dbcp2/Constants.java | 2 +- .../commons/dbcp2/DelegatingConnection.java | 10 ++--- .../commons/dbcp2/DelegatingResultSet.java | 8 ++-- .../commons/dbcp2/DriverConnectionFactory.java | 2 +- .../java/org/apache/commons/dbcp2/PStmtKey.java | 46 ++-- .../dbcp2/PoolableConnectionFactory.java| 2 +- .../apache/commons/dbcp2/PoolingConnection.java | 10 ++--- .../org/apache/commons/dbcp2/PoolingDriver.java | 8 ++-- .../java/org/apache/commons/dbcp2/Utils.java| 6 +-- .../dbcp2/managed/BasicManagedDataSource.java | 10 ++--- .../managed/DataSourceXAConnectionFactory.java | 4 +- .../dbcp2/managed/LocalXAConnectionFactory.java | 2 +- .../dbcp2/managed/ManagedConnection.java| 8 ++-- .../dbcp2/managed/ManagedDataSource.java| 2 +- .../dbcp2/managed/TransactionContext.java | 4 +- .../managed/TransactionContextListener.java | 2 +- .../dbcp2/managed/TransactionRegistry.java | 10 ++--- 17 files changed, 68 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/Constants.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/Constants.java b/src/main/java/org/apache/commons/dbcp2/Constants.java index 36fb0ec..4f09839 100644 --- a/src/main/java/org/apache/commons/dbcp2/Constants.java +++ b/src/main/java/org/apache/commons/dbcp2/Constants.java @@ -18,7 +18,7 @@ package org.apache.commons.dbcp2; /** * Constants for use with JMX. - * + * * @since 2.0 */ public class Constants { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index 08ef8c1..0fbc9ee 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -174,8 +174,8 @@ public class DelegatingConnection extends AbandonedTrace * {@code DelegatingConnection}s, and you want to make * sure to obtain a "genuine" {@link Connection}. * - * - * @return innermost delegate. + * + * @return innermost delegate. */ public Connection getInnermostDelegate() { return getInnermostDelegateInternal(); @@ -186,8 +186,8 @@ public class DelegatingConnection extends AbandonedTrace * Although this method is public, it is part of the internal API and should * not be used by clients. The signature of this method may change at any * time including in ways that break backwards compatibility. - * - * @return innermost delegate. + * + * @return innermost delegate. */ public final Connection getInnermostDelegateInternal() { Connection c = connection; @@ -202,7 +202,7 @@ public class DelegatingConnection extends AbandonedTrace /** * Sets my delegate. - * + * * @param connection *my delegate. */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index e50ee25..fbfef78 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -106,7 +106,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS /** * Wraps the given result set in a delegate. - * + * * @param statement *The Statement which created the ResultSet. * @param resultSet @@ -122,7 +122,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS /** * Wraps the given result set in a delegate. - * + * * @param connec
[05/50] [abbrv] commons-dbcp git commit: Add missing Javadoc HTML tags.
Add missing Javadoc HTML tags. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/15a5cf88 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/15a5cf88 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/15a5cf88 Branch: refs/heads/release Commit: 15a5cf8860bf16f2b7cb00ac06f3b57618e8fcc0 Parents: c2999df Author: Gary Gregory Authored: Mon Jun 11 17:14:26 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:14:26 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/15a5cf88/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index b41deea..6259bfc 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -48,6 +48,7 @@ import java.util.concurrent.Executor; * simply check to see that the {@link Connection} is active, * and call the corresponding method on the "delegate" * provided in my constructor. + * * * Extends AbandonedTrace to implement Connection tracking and * logging of code which created the Connection. Tracking the @@ -55,6 +56,7 @@ import java.util.concurrent.Executor; * this connection and recycle it if its pool of connections * is nearing exhaustion and this connection's last usage is * older than the removeAbandonedTimeout. + * * * @param the Connection type * @@ -77,7 +79,7 @@ public class DelegatingConnection extends AbandonedTrace private Integer defaultQueryTimeoutSeconds; /** - * Create a wrapper for the Connection which traces this + * Creates a wrapper for the Connection which traces this * Connection in the AbandonedObjectPool. * * @param c the {@link Connection} to delegate all calls to.
[43/50] [abbrv] commons-dbcp git commit: Specify the scale in the name of variable for the query timeout.
Specify the scale in the name of variable for the query timeout. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/f283f4c4 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/f283f4c4 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/f283f4c4 Branch: refs/heads/release Commit: f283f4c4b6183504135a98a3e0d77eb89f391bcf Parents: 7908328 Author: Gary Gregory Authored: Tue Jun 12 08:25:29 2018 -0600 Committer: Gary Gregory Committed: Tue Jun 12 08:25:29 2018 -0600 -- .../commons/dbcp2/DelegatingConnection.java | 4 ++-- .../commons/dbcp2/PoolableConnection.java | 20 ++-- .../datasources/CPDSConnectionFactory.java | 8 3 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f283f4c4/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index e4280b2..d6db252 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -854,12 +854,12 @@ public class DelegatingConnection extends AbandonedTrace i } @Override -public boolean isValid(final int timeout) throws SQLException { +public boolean isValid(final int timeoutSeconds) throws SQLException { if (isClosed()) { return false; } try { -return connection.isValid(timeout); +return connection.isValid(timeoutSeconds); } catch (final SQLException e) { handleException(e); return false; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f283f4c4/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java index 6658cae..a369f05 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java @@ -252,22 +252,22 @@ public class PoolableConnection extends DelegatingConnection impleme * * * @param sql - *validation query - * @param timeout - *validation timeout + *The validation SQL query. + * @param timeoutSeconds + *The validation timeout in seconds. * @throws SQLException - * if validation fails or an SQLException occurs during validation + * Thrown when validation fails or an SQLException occurs during validation */ -public void validate(final String sql, int timeout) throws SQLException { +public void validate(final String sql, int timeoutSeconds) throws SQLException { if (fastFailValidation && fatalSqlExceptionThrown) { throw new SQLException(Utils.getMessage("poolableConnection.validate.fastFail")); } if (sql == null || sql.length() == 0) { -if (timeout < 0) { -timeout = 0; +if (timeoutSeconds < 0) { +timeoutSeconds = 0; } -if (!isValid(timeout)) { +if (!isValid(timeoutSeconds)) { throw new SQLException("isValid() returned false"); } return; @@ -280,8 +280,8 @@ public class PoolableConnection extends DelegatingConnection impleme validationPreparedStatement = getInnermostDelegateInternal().prepareStatement(sql); } -if (timeout > 0) { -validationPreparedStatement.setQueryTimeout(timeout); +if (timeoutSeconds > 0) { +validationPreparedStatement.setQueryTimeout(timeoutSeconds); } try (ResultSet rs = validationPreparedStatement.executeQuery()) { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f283f4c4/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java index d6aa18a..f0ae74d 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -192,13 +192,13 @@ class CPDSConnectionFactory Connection conn = nul
[08/50] [abbrv] commons-dbcp git commit: Better lvar name and line length 120.
Better lvar name and line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/6a612f3c Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/6a612f3c Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/6a612f3c Branch: refs/heads/release Commit: 6a612f3c67cc92929c236c69e70b0131726c6808 Parents: 8e1b54f Author: Gary Gregory Authored: Mon Jun 11 17:40:32 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:40:32 2018 -0600 -- .../dbcp2/cpdsadapter/DriverAdapterCPDS.java| 22 +++- 1 file changed, 12 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6a612f3c/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index ebda000..49a20d6 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -157,27 +157,29 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl public PooledConnection getPooledConnection(final String pooledUserName, final String pooledUserPassword) throws SQLException { getConnectionCalled = true; -PooledConnectionImpl pci = null; +PooledConnectionImpl pooledConnection = null; // Workaround for buggy WebLogic 5.1 classloader - ignore the // exception upon first invocation. try { if (connectionProperties != null) { update(connectionProperties, KEY_USER, pooledUserName); update(connectionProperties, KEY_PASSWORD, pooledUserPassword); -pci = new PooledConnectionImpl(DriverManager.getConnection(getUrl(), connectionProperties)); +pooledConnection = new PooledConnectionImpl( +DriverManager.getConnection(getUrl(), connectionProperties)); } else { -pci = new PooledConnectionImpl( +pooledConnection = new PooledConnectionImpl( DriverManager.getConnection(getUrl(), pooledUserName, pooledUserPassword)); } - pci.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed()); + pooledConnection.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed()); } catch (final ClassCircularityError e) { if (connectionProperties != null) { -pci = new PooledConnectionImpl(DriverManager.getConnection(getUrl(), connectionProperties)); +pooledConnection = new PooledConnectionImpl( +DriverManager.getConnection(getUrl(), connectionProperties)); } else { -pci = new PooledConnectionImpl( +pooledConnection = new PooledConnectionImpl( DriverManager.getConnection(getUrl(), pooledUserName, pooledUserPassword)); } - pci.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed()); + pooledConnection.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed()); } KeyedObjectPool stmtPool = null; if (isPoolPreparedStatements()) { @@ -201,10 +203,10 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl config.setNumTestsPerEvictionRun(0); config.setMinEvictableIdleTimeMillis(0); } -stmtPool = new GenericKeyedObjectPool<>(pci, config); -pci.setStatementPool(stmtPool); +stmtPool = new GenericKeyedObjectPool<>(pooledConnection, config); +pooledConnection.setStatementPool(stmtPool); } -return pci; +return pooledConnection; } @Override
[47/50] [abbrv] commons-dbcp git commit: Key for that matches my @apache email.
Key for that matches my @apache email. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/e50c5228 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/e50c5228 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/e50c5228 Branch: refs/heads/release Commit: e50c52284e0d3fc47853e16ff9d2f30d10f3c5ee Parents: 411cf62 Author: Gary Gregory Authored: Wed Jun 13 11:18:34 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:18:34 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e50c5228/pom.xml -- diff --git a/pom.xml b/pom.xml index da1c7ed..4387356 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} Gary Gregory - 2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB +86fdc7e2a11262cb
[15/50] [abbrv] commons-dbcp git commit: Add missing Javadoc.
Add missing Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8ab7cc1b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8ab7cc1b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8ab7cc1b Branch: refs/heads/release Commit: 8ab7cc1b702075088fb4bc859302e77ee5d0d2fa Parents: 5cc5624 Author: Gary Gregory Authored: Mon Jun 11 17:51:22 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:51:22 2018 -0600 -- .../commons/dbcp2/managed/ManagedConnection.java | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8ab7cc1b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java index 3d0289f..91fed32 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java @@ -45,6 +45,7 @@ import java.util.concurrent.locks.ReentrantLock; * @since 2.0 */ public class ManagedConnection extends DelegatingConnection { + private final ObjectPool pool; private final TransactionRegistry transactionRegistry; private final boolean accessToUnderlyingConnectionAllowed; @@ -52,6 +53,18 @@ public class ManagedConnection extends DelegatingConnectio private boolean isSharedConnection; private final Lock lock; +/** + * Constructs a new instance responsible for managing a database connection in a transactional environment. + * + * @param pool + *The connection pool. + * @param transactionRegistry + *The transaction registry. + * @param accessToUnderlyingConnectionAllowed + *Whether or not to allow access to the underlying Connection. + * @throws SQLException + * Thrown when there is problem managing transactions. + */ public ManagedConnection(final ObjectPool pool, final TransactionRegistry transactionRegistry, final boolean accessToUnderlyingConnectionAllowed) throws SQLException { super(null);
[38/50] [abbrv] commons-dbcp git commit: Line length 120.
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d5a24430/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index fbfef78..ce44833 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -42,15 +42,12 @@ import java.util.Map; /** * A base delegating implementation of {@link ResultSet}. * - * All of the methods from the {@link ResultSet} interface - * simply call the corresponding method on the "delegate" + * All of the methods from the {@link ResultSet} interface simply call the corresponding method on the "delegate" * provided in my constructor. * * - * Extends AbandonedTrace to implement result set tracking and - * logging of code which created the ResultSet. Tracking the - * ResultSet ensures that the Statement which created it can - * close any open ResultSet's on Statement close. + * Extends AbandonedTrace to implement result set tracking and logging of code which created the ResultSet. Tracking the + * ResultSet ensures that the Statement which created it can close any open ResultSet's on Statement close. * * * @since 2.0 @@ -67,12 +64,10 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS private Connection connection; /** - * Creates a wrapper for the ResultSet which traces this - * ResultSet to the Statement which created it and the - * code which created it. + * Creates a wrapper for the ResultSet which traces this ResultSet to the Statement which created it and the code + * which created it. * - * Private to ensure all construction is - * {@link #wrapResultSet(Statement, ResultSet)} + * Private to ensure all construction is {@link #wrapResultSet(Statement, ResultSet)} * * * @param statement @@ -81,25 +76,25 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS *The ResultSet to wrap. */ private DelegatingResultSet(final Statement statement, final ResultSet resultSet) { -super((AbandonedTrace)statement); +super((AbandonedTrace) statement); this.statement = statement; this.resultSet = resultSet; } /** - * Creates a wrapper for the ResultSet which traces this - * ResultSet to the Connection which created it (via, for + * Creates a wrapper for the ResultSet which traces this ResultSet to the Connection which created it (via, for * example DatabaseMetadata, and the code which created it. * - * Private to ensure all construction is - * {@link #wrapResultSet(Connection, ResultSet)} + * Private to ensure all construction is {@link #wrapResultSet(Connection, ResultSet)} * * - * @param conn Connection which created this ResultSet - * @param res ResultSet to wrap + * @param conn + *Connection which created this ResultSet + * @param res + *ResultSet to wrap */ private DelegatingResultSet(final Connection conn, final ResultSet res) { -super((AbandonedTrace)conn); +super((AbandonedTrace) conn); this.connection = conn; this.resultSet = res; } @@ -146,29 +141,24 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS } /** - * If my underlying {@link ResultSet} is not a - * {@code DelegatingResultSet}, returns it, - * otherwise recursively invokes this method on - * my delegate. + * If my underlying {@link ResultSet} is not a {@code DelegatingResultSet}, returns it, otherwise recursively + * invokes this method on my delegate. * - * Hence this method will return the first - * delegate that is not a {@code DelegatingResultSet}, - * or {@code null} when no non-{@code DelegatingResultSet} - * delegate can be found by traversing this chain. + * Hence this method will return the first delegate that is not a {@code DelegatingResultSet}, or {@code null} when + * no non-{@code DelegatingResultSet} delegate can be found by traversing this chain. * * - * This method is useful when you may have nested - * {@code DelegatingResultSet}s, and you want to make - * sure to obtain a "genuine" {@link ResultSet}. + * This method is useful when you may have nested {@code DelegatingResultSet}s, and you want to make sure to obtain + * a "genuine" {@link ResultSet}. * * * @return the innermost delegate. */ public ResultSet getInnermostDelegate() { ResultSet r = resultSet; -while(r != null && r instanceof DelegatingResultSet) { -r = ((Delegati
[16/50] [abbrv] commons-dbcp git commit: Javadoc.
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/9a61dc02 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/9a61dc02 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/9a61dc02 Branch: refs/heads/release Commit: 9a61dc02faf30447bc37d45c79d846c61be5f462 Parents: 8ab7cc1 Author: Gary Gregory Authored: Mon Jun 11 17:54:08 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:54:08 2018 -0600 -- .../org/apache/commons/dbcp2/BasicDataSourceFactory.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9a61dc02/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java index a356e85..dfd27e9 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java @@ -326,11 +326,13 @@ public class BasicDataSourceFactory implements ObjectFactory { } /** - * Creates and configures a {@link BasicDataSource} instance based on the - * given properties. + * Creates and configures a {@link BasicDataSource} instance based on the given properties. * - * @param properties the datasource configuration properties - * @throws Exception if an error occurs creating the data source + * @param properties + *The data source configuration properties. + * @return A new a {@link BasicDataSource} instance based on the given properties. + * @throws Exception + * Thrown when an error occurs creating the data source. */ public static BasicDataSource createDataSource(final Properties properties) throws Exception { final BasicDataSource dataSource = new BasicDataSource();
[34/50] [abbrv] commons-dbcp git commit: Javadoc nits.
Javadoc nits. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/55cc86aa Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/55cc86aa Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/55cc86aa Branch: refs/heads/release Commit: 55cc86aad77dace617c745575e9fec173504a56f Parents: 18e6a97 Author: Gary Gregory Authored: Mon Jun 11 18:48:16 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:48:16 2018 -0600 -- .../apache/commons/dbcp2/AbandonedTrace.java| 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/55cc86aa/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java index 48101f2..77b5441 100644 --- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java +++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java @@ -34,14 +34,14 @@ import org.apache.commons.pool2.TrackedUse; */ public class AbandonedTrace implements TrackedUse { -/** A list of objects created by children of this object */ +/** A list of objects created by children of this object. */ private final List> traceList = new ArrayList<>(); -/** Last time this connection was used */ +/** Last time this connection was used. */ private volatile long lastUsedMillis = 0; /** - * Create a new AbandonedTrace without config and without doing abandoned tracing. + * Creates a new AbandonedTrace without config and without doing abandoned tracing. */ public AbandonedTrace() { init(null); @@ -50,7 +50,7 @@ public class AbandonedTrace implements TrackedUse { /** * Constructs a new AbandonedTrace with a parent object. * - * @param parent AbandonedTrace parent object + * @param parent AbandonedTrace parent object. */ public AbandonedTrace(final AbandonedTrace parent) { init(parent); @@ -59,7 +59,7 @@ public class AbandonedTrace implements TrackedUse { /** * Initializes abandoned tracing for this object. * - * @param parent AbandonedTrace parent object + * @param parent AbandonedTrace parent object. */ private void init(final AbandonedTrace parent) { if (parent != null) { @@ -70,7 +70,7 @@ public class AbandonedTrace implements TrackedUse { /** * Gets the last time this object was used in milliseconds. * - * @return long time in milliseconds + * @return long time in milliseconds. */ @Override public long getLastUsed() { @@ -88,7 +88,7 @@ public class AbandonedTrace implements TrackedUse { * Sets the time in milliseconds this object was last used. * * @param lastUsedMillis - *time in milliseconds + *time in milliseconds. */ protected void setLastUsed(final long lastUsedMillis) { this.lastUsedMillis = lastUsedMillis; @@ -98,7 +98,7 @@ public class AbandonedTrace implements TrackedUse { * Adds an object to the list of objects being traced. * * @param trace - *AbandonedTrace object to add + *AbandonedTrace object to add. */ protected void addTrace(final AbandonedTrace trace) { synchronized (this.traceList) { @@ -119,7 +119,7 @@ public class AbandonedTrace implements TrackedUse { /** * Gets a list of objects being traced by this object. * - * @return List of objects + * @return List of objects. */ protected List getTrace() { final int size = traceList.size(); @@ -146,7 +146,7 @@ public class AbandonedTrace implements TrackedUse { * Removes a child object this object is tracing. * * @param trace - *AbandonedTrace object to remove + *AbandonedTrace object to remove. */ protected void removeTrace(final AbandonedTrace trace) { synchronized(this.traceList) {
[28/50] [abbrv] commons-dbcp git commit: Javadoc and suppress a compiler warning.
Javadoc and suppress a compiler warning. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/9eb1e028 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/9eb1e028 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/9eb1e028 Branch: refs/heads/release Commit: 9eb1e02873e9b56c55ac6b0bd253d5193de15b9c Parents: 012b164 Author: Gary Gregory Authored: Mon Jun 11 18:18:11 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:18:11 2018 -0600 -- .../org/apache/commons/dbcp2/PoolingDriver.java | 34 1 file changed, 34 insertions(+) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9eb1e028/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java index 730d9ba..4272943 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java @@ -56,6 +56,9 @@ public class PoolingDriver implements Driver { /** Controls access to the underlying connection */ private final boolean accessToUnderlyingConnectionAllowed; +/** + * Constructs a new driver with accessToUnderlyingConnectionAllowed enabled. + */ public PoolingDriver() { this(true); } @@ -77,6 +80,15 @@ public class PoolingDriver implements Driver { return accessToUnderlyingConnectionAllowed; } +/** + * Gets the connection pool for the given name. + * + * @param name + *The pool name + * @return The pool + * @throws SQLException + * Thrown when the named pool is not registered. + */ public synchronized ObjectPool getConnectionPool(final String name) throws SQLException { final ObjectPool pool = pools.get(name); @@ -86,12 +98,29 @@ public class PoolingDriver implements Driver { return pool; } +/** + * Registers a named pool. + * + * @param name + *The pool name. + * @param pool + *The pool. + */ public synchronized void registerPool(final String name, final ObjectPool pool) { pools.put(name, pool); } +/** + * Closes a named pool. + * + * @param name + *The pool name. + * @throws SQLException + * Thrown when a problem is caught closing the pool. + */ public synchronized void closePool(final String name) throws SQLException { +@SuppressWarnings("resource") final ObjectPool pool = pools.get(name); if (pool != null) { pools.remove(name); @@ -104,6 +133,11 @@ public class PoolingDriver implements Driver { } } +/** + * Gets the pool names. + * + * @return the pool names. + */ public synchronized String[] getPoolNames(){ final Set names = pools.keySet(); return names.toArray(new String[names.size()]);
[12/50] [abbrv] commons-dbcp git commit: No need for an ivar here.
No need for an ivar here. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/f433a996 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/f433a996 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/f433a996 Branch: refs/heads/release Commit: f433a99608baf7ce378478ad212754e9a386d5b5 Parents: 0a928ca Author: Gary Gregory Authored: Mon Jun 11 17:45:26 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:45:26 2018 -0600 -- .../java/org/apache/commons/dbcp2/managed/ManagedDataSource.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f433a996/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java index a73db72..5e3b784 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java @@ -77,8 +77,6 @@ public class ManagedDataSource extends PoolingDataSource(getPool(), transactionRegistry, -isAccessToUnderlyingConnectionAllowed()); -return connection; +return new ManagedConnection<>(getPool(), transactionRegistry, isAccessToUnderlyingConnectionAllowed()); } }
[27/50] [abbrv] commons-dbcp git commit: Comment empty block.
Comment empty block. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/012b164d Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/012b164d Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/012b164d Branch: refs/heads/release Commit: 012b164d11282159f695c1af5e5f0ac27cbcfda3 Parents: 6aa057f Author: Gary Gregory Authored: Mon Jun 11 18:13:23 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:13:23 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/012b164d/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java index 5e65574..730d9ba 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java @@ -166,6 +166,7 @@ public class PoolingDriver implements Driver { pool.invalidateObject(pgconn.getDelegateInternal()); } catch (final Exception e) { +// Ignore. } } else {
[07/50] [abbrv] commons-dbcp git commit: Better param name.
Better param name. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8e1b54f2 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8e1b54f2 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8e1b54f2 Branch: refs/heads/release Commit: 8e1b54f21160ccfdac07039b05f6a4050114b965 Parents: e7ee948 Author: Gary Gregory Authored: Mon Jun 11 17:39:06 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:39:06 2018 -0600 -- .../apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8e1b54f2/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index 320b4f3..ebda000 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -561,14 +561,14 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl /** * Flag to toggle the pooling of PreparedStatements * - * @param v + * @param poolPreparedStatements *true to pool statements. * @throws IllegalStateException * if {@link #getPooledConnection()} has been called */ -public void setPoolPreparedStatements(final boolean v) { +public void setPoolPreparedStatements(final boolean poolPreparedStatements) { assertInitializationAllowed(); -this.poolPreparedStatements = v; +this.poolPreparedStatements = poolPreparedStatements; } /**
[26/50] [abbrv] commons-dbcp git commit: Javadoc, better param names, line length 120.
Javadoc, better param names, line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/6aa057ff Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/6aa057ff Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/6aa057ff Branch: refs/heads/release Commit: 6aa057ff95f0c14a7fcb562020d71bde571c2e87 Parents: f20a569 Author: Gary Gregory Authored: Mon Jun 11 18:12:19 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:12:19 2018 -0600 -- .../java/org/apache/commons/dbcp2/Utils.java| 70 1 file changed, 41 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6aa057ff/src/main/java/org/apache/commons/dbcp2/Utils.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java index 80c80ea..059f3d9 100644 --- a/src/main/java/org/apache/commons/dbcp2/Utils.java +++ b/src/main/java/org/apache/commons/dbcp2/Utils.java @@ -28,15 +28,18 @@ import java.util.Set; /** * Utility methods. + * * @since 2.0 */ public final class Utils { -private static final ResourceBundle messages = ResourceBundle.getBundle( -Utils.class.getPackage().getName() + ".LocalStrings"); +private static final ResourceBundle messages = ResourceBundle +.getBundle(Utils.class.getPackage().getName() + ".LocalStrings"); -public static final boolean IS_SECURITY_ENABLED = -System.getSecurityManager() != null; +/** + * Whether the security manager is enabled. + */ +public static final boolean IS_SECURITY_ENABLED = System.getSecurityManager() != null; /** Any SQL_STATE starting with this value is considered a fatal disconnect */ public static final String DISCONNECTION_SQL_CODE_PREFIX = "08"; @@ -44,12 +47,12 @@ public final class Utils { /** * SQL codes of fatal connection errors. * - * 57P01 (ADMIN SHUTDOWN) - * 57P02 (CRASH SHUTDOWN) - * 57P03 (CANNOT CONNECT NOW) - * 01002 (SQL92 disconnect error) - * JZ0C0 (Sybase disconnect error) - * JZ0C1 (Sybase disconnect error) + * 57P01 (ADMIN SHUTDOWN) + * 57P02 (CRASH SHUTDOWN) + * 57P03 (CANNOT CONNECT NOW) + * 01002 (SQL92 disconnect error) + * JZ0C0 (Sybase disconnect error) + * JZ0C1 (Sybase disconnect error) * */ public static final Set DISCONNECTION_SQL_CODES; @@ -71,12 +74,13 @@ public final class Utils { /** * Closes the ResultSet (which may be null). * - * @param rset a ResultSet, may be {@code null} + * @param resultSet + *a ResultSet, may be {@code null} */ -public static void closeQuietly(final ResultSet rset) { -if (rset != null) { +public static void closeQuietly(final ResultSet resultSet) { +if (resultSet != null) { try { -rset.close(); +resultSet.close(); } catch (final Exception e) { // ignored } @@ -86,12 +90,13 @@ public final class Utils { /** * Closes the Connection (which may be null). * - * @param conn a Connection, may be {@code null} + * @param connection + *a Connection, may be {@code null} */ -public static void closeQuietly(final Connection conn) { -if (conn != null) { +public static void closeQuietly(final Connection connection) { +if (connection != null) { try { -conn.close(); +connection.close(); } catch (final Exception e) { // ignored } @@ -101,33 +106,41 @@ public final class Utils { /** * Closes the Statement (which may be null). * - * @param stmt a Statement, may be {@code null} + * @param statement + *a Statement, may be {@code null}. */ -public static void closeQuietly(final Statement stmt) { -if (stmt != null) { +public static void closeQuietly(final Statement statement) { +if (statement != null) { try { -stmt.close(); +statement.close(); } catch (final Exception e) { // ignored } } } - /** - * Obtain the correct i18n message for the given key. + * Gets the correct i18n message for the given key. + * + * @param key + *The key to look up an i18n message. + * @return The i18n message. */ public static String getMessage(final String key) { return getMessage(key, (Object[]) null); } - /** - *
[45/50] [abbrv] commons-dbcp git commit: Format tweak.
Format tweak. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/518adf65 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/518adf65 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/518adf65 Branch: refs/heads/release Commit: 518adf6593ccd239f508254938824b93e95bc663 Parents: e183847 Author: Gary Gregory Authored: Tue Jun 12 09:22:16 2018 -0600 Committer: Gary Gregory Committed: Tue Jun 12 09:22:16 2018 -0600 -- src/changes/release-notes.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/518adf65/src/changes/release-notes.vm -- diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm index 6a5a727..7b784c6 100644 --- a/src/changes/release-notes.vm +++ b/src/changes/release-notes.vm @@ -15,7 +15,7 @@ ## specific language governing permissions and limitations ## under the License. Apache ${project.name} - Version ${version} + Version ${version} RELEASE NOTES The ${developmentTeam} is pleased to announce the release of Apache ${project.name} ${version}.
[17/50] [abbrv] commons-dbcp git commit: Add missing Javadoc.
Add missing Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/b572ad1e Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/b572ad1e Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/b572ad1e Branch: refs/heads/release Commit: b572ad1e3f956edc958b0142c0e6d296a9d24c6b Parents: 9a61dc0 Author: Gary Gregory Authored: Mon Jun 11 17:55:52 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:55:52 2018 -0600 -- .../apache/commons/dbcp2/DelegatingConnection.java | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/b572ad1e/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index 6259bfc..606ba94 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -172,6 +172,8 @@ public class DelegatingConnection extends AbandonedTrace * This method is useful when you may have nested * {@code DelegatingConnection}s, and you want to make * sure to obtain a "genuine" {@link Connection}. + * + * @return innermost delegate. */ public Connection getInnermostDelegate() { return getInnermostDelegateInternal(); @@ -182,6 +184,8 @@ public class DelegatingConnection extends AbandonedTrace * Although this method is public, it is part of the internal API and should * not be used by clients. The signature of this method may change at any * time including in ways that break backwards compatibility. + * + * @return innermost delegate. */ public final Connection getInnermostDelegateInternal() { Connection c = connection; @@ -194,9 +198,14 @@ public class DelegatingConnection extends AbandonedTrace return c; } -/** Sets my delegate. */ -public void setDelegate(final C c) { -connection = c; +/** + * Sets my delegate. + * + * @param connection + *my delegate. + */ +public void setDelegate(final C connection) { +this.connection = connection; } /**
[11/50] [abbrv] commons-dbcp git commit: Line length 120 and standard formatting.
Line length 120 and standard formatting. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/0a928ca2 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/0a928ca2 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/0a928ca2 Branch: refs/heads/release Commit: 0a928ca2b7a16fd49b49223bba4cd778207d0fcb Parents: cb48137 Author: Gary Gregory Authored: Mon Jun 11 17:44:46 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:44:46 2018 -0600 -- .../dbcp2/managed/BasicManagedDataSource.java | 82 -- .../managed/DataSourceXAConnectionFactory.java | 47 +--- .../dbcp2/managed/LocalXAConnectionFactory.java | 109 +++ .../dbcp2/managed/ManagedConnection.java| 15 +-- .../dbcp2/managed/ManagedDataSource.java| 40 +++ .../managed/PoolableManagedConnection.java | 38 --- .../PoolableManagedConnectionFactory.java | 1 + .../dbcp2/managed/TransactionContext.java | 51 + .../managed/TransactionContextListener.java | 7 +- .../dbcp2/managed/TransactionRegistry.java | 34 +++--- .../dbcp2/managed/XAConnectionFactory.java | 22 ++-- 11 files changed, 252 insertions(+), 194 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/0a928ca2/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java index 12fe740..c685134 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java @@ -30,22 +30,18 @@ import javax.transaction.TransactionManager; import java.sql.SQLException; /** - * BasicManagedDataSource is an extension of BasicDataSource which - * creates ManagedConnections. This data source can create either - * full two-phase-commit XA connections or one-phase-commit - * local connections. Both types of connections are committed or - * rolled back as part of the global transaction (a.k.a. XA - * transaction or JTA Transaction), but only XA connections can be - * recovered in the case of a system crash. + * + * BasicManagedDataSource is an extension of BasicDataSource which creates ManagedConnections. This data source can + * create either full two-phase-commit XA connections or one-phase-commit local connections. Both types of connections + * are committed or rolled back as part of the global transaction (a.k.a. XA transaction or JTA Transaction), but only + * XA connections can be recovered in the case of a system crash. * - * BasicManagedDataSource adds the TransactionManager and XADataSource - * properties. The TransactionManager property is required and is - * used to enlist connections in global transactions. The XADataSource - * is optional and if set is the class name of the XADataSource class - * for a two-phase-commit JDBC driver. If the XADataSource property - * is set, the driverClassName is ignored and a DataSourceXAConnectionFactory - * is created. Otherwise, a standard DriverConnectionFactory is created - * and wrapped with a LocalXAConnectionFactory. + * + * BasicManagedDataSource adds the TransactionManager and XADataSource properties. The TransactionManager property is + * required and is used to enlist connections in global transactions. The XADataSource is optional and if set is the + * class name of the XADataSource class for a two-phase-commit JDBC driver. If the XADataSource property is set, the + * driverClassName is ignored and a DataSourceXAConnectionFactory is created. Otherwise, a standard + * DriverConnectionFactory is created and wrapped with a LocalXAConnectionFactory. * * * @see BasicDataSource @@ -76,14 +72,17 @@ public class BasicManagedDataSource extends BasicDataSource { } /** - * Sets the XADataSource instance used by the XAConnectionFactory. * - * Note: this method currently has no effect once the pool has been - * initialized. The pool is initialized the first time one of the - * following methods is invoked: getConnection, setLogwriter, - * setLoginTimeout, getLoginTimeout, getLogWriter. + * Sets the XADataSource instance used by the XAConnectionFactory. + * + * + * Note: this method currently has no effect once the pool has been initialized. The pool is initialized the first + * time one of the following methods is invoked: getConnection, setLogwriter, + * setLoginTimeout, getLoginTimeout, getLogWriter. + * * - * @param xaDataSourceInstance XADataSou
[36/50] [abbrv] commons-dbcp git commit: Javadoc.
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/c43bd771 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/c43bd771 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/c43bd771 Branch: refs/heads/release Commit: c43bd771ac9af8cd23f7c6e4672e6d44523071b0 Parents: 9b7cc8b Author: Gary Gregory Authored: Mon Jun 11 18:54:43 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:54:43 2018 -0600 -- .../commons/dbcp2/PoolableConnectionFactory.java | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/c43bd771/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index 476b84e..a948d78 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -166,11 +166,24 @@ public class PoolableConnectionFactory implements PooledObjectFactory
[42/50] [abbrv] commons-dbcp git commit: Don't use deprecated API and better param name.
Don't use deprecated API and better param name. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/7908328f Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/7908328f Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/7908328f Branch: refs/heads/release Commit: 7908328f012778568c6da95f7081b8c4b9754009 Parents: 0047005 Author: Gary Gregory Authored: Tue Jun 12 08:23:05 2018 -0600 Committer: Gary Gregory Committed: Tue Jun 12 08:23:05 2018 -0600 -- .../datasources/KeyedCPDSConnectionFactory.java | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7908328f/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java index a755ebf..f802b8a 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java @@ -131,7 +131,7 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory(pci); @@ -153,29 +153,29 @@ class KeyedCPDSConnectionFactory implements KeyedPooledObjectFactory p) { +public boolean validateObject(final UserPassKey key, final PooledObject pooledObject) { try { -validateLifetime(p); +validateLifetime(pooledObject); } catch (final Exception e) { return false; } boolean valid = false; -final PooledConnection pconn = p.getObject().getPooledConnection(); +final PooledConnection pconn = pooledObject.getObject().getPooledConnection(); Connection conn = null; validatingSet.add(pconn); if (null == validationQuery) { -int timeout = validationQueryTimeoutSeconds; -if (timeout < 0) { -timeout = 0; +int timeoutSeconds = validationQueryTimeoutSeconds; +if (timeoutSeconds < 0) { +timeoutSeconds = 0; } try { conn = pconn.getConnection(); -valid = conn.isValid(timeout); +valid = conn.isValid(timeoutSeconds); } catch (final SQLException e) { valid = false; } finally {
[30/50] [abbrv] commons-dbcp git commit: Javadoc and line length 120.
Javadoc and line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/16626a9b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/16626a9b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/16626a9b Branch: refs/heads/release Commit: 16626a9b8fdecf3fa80876a244ff74dd171b06cd Parents: 3df2257 Author: Gary Gregory Authored: Mon Jun 11 18:42:14 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:42:14 2018 -0600 -- .../java/org/apache/commons/dbcp2/PStmtKey.java | 290 --- 1 file changed, 246 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/16626a9b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java index 36b3c09..6fc5f65 100644 --- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java +++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java @@ -26,6 +26,7 @@ import org.apache.commons.dbcp2.PoolingConnection.StatementType; /** * A key uniquely identifying {@link java.sql.PreparedStatement PreparedStatement}s. + * * @since 2.0 */ public class PStmtKey { @@ -60,18 +61,42 @@ public class PStmtKey { /** Statement builder */ private StatementBuilder builder; +/** + * Constructs a key to uniquely identify a prepared statement. + * + * @param sql + *The SQL statement. + */ public PStmtKey(final String sql) { this(sql, null, StatementType.PREPARED_STATEMENT); } +/** + * Constructs a key to uniquely identify a prepared statement. + * + * @param sql + *The SQL statement. + * @param catalog + *The catalog. + */ public PStmtKey(final String sql, final String catalog) { this(sql, catalog, StatementType.PREPARED_STATEMENT); } -public PStmtKey(final String sql, final String catalog, final StatementType stmtType) { +/** + * Constructs a key to uniquely identify a prepared statement. + * + * @param sql + *The SQL statement. + * @param catalog + *The catalog. + * @param statementType + *The SQL statement type, prepared or callable. + */ +public PStmtKey(final String sql, final String catalog, final StatementType statementType) { this.sql = sql; this.catalog = catalog; -this.statementType = stmtType; +this.statementType = statementType; this.autoGeneratedKeys = null; this.columnIndexes = null; this.columnNames = null; @@ -79,21 +104,46 @@ public class PStmtKey { this.resultSetConcurrency = null; this.resultSetHoldability = null; // create builder -if (stmtType == StatementType.PREPARED_STATEMENT) { +if (statementType == StatementType.PREPARED_STATEMENT) { this.builder = new PreparedStatementSQL(); -} else if (stmtType == StatementType.CALLABLE_STATEMENT) { +} else if (statementType == StatementType.CALLABLE_STATEMENT) { this.builder = new PreparedCallSQL(); } } +/** + * Constructs a key to uniquely identify a prepared statement. + * + * @param sql + *The SQL statement. + * @param catalog + *The catalog. + * @param autoGeneratedKeys + *A flag indicating whether auto-generated keys should be returned; one of + *Statement.RETURN_GENERATED_KEYS or Statement.NO_GENERATED_KEYS. + */ public PStmtKey(final String sql, final String catalog, final int autoGeneratedKeys) { this(sql, catalog, StatementType.PREPARED_STATEMENT, Integer.valueOf(autoGeneratedKeys)); } -public PStmtKey(final String sql, final String catalog, final StatementType stmtType, final Integer autoGeneratedKeys) { +/** + * Constructs a key to uniquely identify a prepared statement. + * + * @param sql + *The SQL statement. + * @param catalog + *The catalog. + * @param statementType + *The SQL statement type, prepared or callable. + * @param autoGeneratedKeys + *A flag indicating whether auto-generated keys should be returned; one of + *Statement.RETURN_GENERATED_KEYS or Statement.NO_GENERATED_KEYS. + */ +public PStmtKey(final String sql, final String catalog, final StatementType statementType, +final Integer autoGeneratedKeys) { this.sql = sql; this.catalog = catalog; -this.statem
[48/50] [abbrv] commons-dbcp git commit: Fix project description.
Fix project description. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/4148549e Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/4148549e Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/4148549e Branch: refs/heads/release Commit: 4148549ee5b704b4f1291167b9914b8109084132 Parents: e50c522 Author: Gary Gregory Authored: Wed Jun 13 11:21:08 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:21:08 2018 -0600 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/4148549e/README.md -- diff --git a/README.md b/README.md index 0f55474..2e68dff 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Apache Commons DBCP [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/) [![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-dbcp2/2.4.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.4.0) -${project.description} +Apache Commons DBCP software implements Database Connection Pooling Documentation -
[18/50] [abbrv] commons-dbcp git commit: Add missing Javadoc HTML tags.
Add missing Javadoc HTML tags. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/95b6b99a Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/95b6b99a Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/95b6b99a Branch: refs/heads/release Commit: 95b6b99a4828cdedd8b2dbed51b71eefa5d498e1 Parents: b572ad1 Author: Gary Gregory Authored: Mon Jun 11 17:56:50 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:56:50 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/95b6b99a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index 606ba94..08ef8c1 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -168,10 +168,12 @@ public class DelegatingConnection extends AbandonedTrace * delegate that is not a {@code DelegatingConnection}, * or {@code null} when no non-{@code DelegatingConnection} * delegate can be found by traversing this chain. + * * * This method is useful when you may have nested * {@code DelegatingConnection}s, and you want to make * sure to obtain a "genuine" {@link Connection}. + * * * @return innermost delegate. */
[24/50] [abbrv] commons-dbcp git commit: Add missing Javadoc.
Add missing Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/5ccf73a3 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/5ccf73a3 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/5ccf73a3 Branch: refs/heads/release Commit: 5ccf73a33230857f217a8e456301c2a0e59d148b Parents: 738aece Author: Gary Gregory Authored: Mon Jun 11 18:06:04 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:06:04 2018 -0600 -- .../commons/dbcp2/DelegatingResultSet.java | 51 +++- 1 file changed, 39 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5ccf73a3/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index 53beeab..e50ee25 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -75,13 +75,15 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS * {@link #wrapResultSet(Statement, ResultSet)} * * - * @param stmt Statement which created this ResultSet - * @param res ResultSet to wrap + * @param statement + *The Statement which created the ResultSet. + * @param resultSet + *The ResultSet to wrap. */ -private DelegatingResultSet(final Statement stmt, final ResultSet res) { -super((AbandonedTrace)stmt); -this.statement = stmt; -this.resultSet = res; +private DelegatingResultSet(final Statement statement, final ResultSet resultSet) { +super((AbandonedTrace)statement); +this.statement = statement; +this.resultSet = resultSet; } /** @@ -102,20 +104,43 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS this.resultSet = res; } -public static ResultSet wrapResultSet(final Statement stmt, final ResultSet rset) { -if(null == rset) { +/** + * Wraps the given result set in a delegate. + * + * @param statement + *The Statement which created the ResultSet. + * @param resultSet + *The ResultSet to wrap. + * @return a new delegate. + */ +public static ResultSet wrapResultSet(final Statement statement, final ResultSet resultSet) { +if (null == resultSet) { return null; } -return new DelegatingResultSet(stmt,rset); +return new DelegatingResultSet(statement, resultSet); } -public static ResultSet wrapResultSet(final Connection conn, final ResultSet rset) { -if(null == rset) { +/** + * Wraps the given result set in a delegate. + * + * @param connection + *The Connection which created the ResultSet. + * @param resultSet + *The ResultSet to wrap. + * @return a new delegate. + */ +public static ResultSet wrapResultSet(final Connection connection, final ResultSet resultSet) { +if (null == resultSet) { return null; } -return new DelegatingResultSet(conn,rset); +return new DelegatingResultSet(connection, resultSet); } +/** + * Gets my delegate. + * + * @return my delegate. + */ public ResultSet getDelegate() { return resultSet; } @@ -136,6 +161,8 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS * {@code DelegatingResultSet}s, and you want to make * sure to obtain a "genuine" {@link ResultSet}. * + * + * @return the innermost delegate. */ public ResultSet getInnermostDelegate() { ResultSet r = resultSet;
[46/50] [abbrv] commons-dbcp git commit: Remove trailing white spaces on all lines.
Remove trailing white spaces on all lines. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/411cf622 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/411cf622 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/411cf622 Branch: refs/heads/release Commit: 411cf6223e17554a0cb1f2c7ea4113391ba437f1 Parents: 518adf6 Author: Gary Gregory Authored: Wed Jun 13 11:17:55 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:17:55 2018 -0600 -- .../java/org/apache/commons/dbcp2/BasicDataSourceFactory.java | 4 ++-- .../java/org/apache/commons/dbcp2/DelegatingConnection.java| 2 +- .../java/org/apache/commons/dbcp2/DelegatingStatement.java | 2 +- .../apache/commons/dbcp2/DriverManagerConnectionFactory.java | 6 +++--- .../org/apache/commons/dbcp2/PoolableConnectionFactory.java| 4 ++-- .../org/apache/commons/dbcp2/PoolableConnectionMXBean.java | 2 +- .../org/apache/commons/dbcp2/PoolablePreparedStatement.java| 2 +- src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java | 2 +- src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 2 +- .../org/apache/commons/dbcp2/SwallowedExceptionLogger.java | 2 +- src/main/java/org/apache/commons/dbcp2/package-info.java | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java index 46af519..69c2cb9 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java @@ -556,7 +556,7 @@ public class BasicDataSourceFactory implements ObjectFactory { * * Parse properties from the string. Format of the string must be [propertyName=property;]* * - * + * * @param propText * @return Properties * @throws Exception @@ -571,7 +571,7 @@ public class BasicDataSourceFactory implements ObjectFactory { /** * Parse list of property values from a delimited string - * + * * @param value *delimited list of values * @param delimiter http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index d6db252..1356efa 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -124,7 +124,7 @@ public class DelegatingConnection extends AbandonedTrace i /** * Returns my underlying {@link Connection}. - * + * * @return my underlying {@link Connection}. */ public C getDelegate() { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 098950d..7cce5e2 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -78,7 +78,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { * This method is useful when you may have nested {@code DelegatingStatement}s, and you want to make sure to obtain * a "genuine" {@link Statement}. * - * + * * @return The innermost delegate. * * @see #getDelegate http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/411cf622/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java index 7c62ed5..00c7484 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java @@ -40,7 +40,7 @@ public class DriverManagerConnectionFactory implements ConnectionFactory { /** * Constructor for DriverManagerConnectio
[49/50] [abbrv] commons-dbcp git commit: Prepare for release 2.4.0.
Prepare for release 2.4.0. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8c42fb86 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8c42fb86 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8c42fb86 Branch: refs/heads/release Commit: 8c42fb865dfb1a478d3c2d54f1741caaa10f3587 Parents: 4148549 Author: Gary Gregory Authored: Wed Jun 13 11:22:44 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:22:44 2018 -0600 -- RELEASE-NOTES.txt | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8c42fb86/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 8649b4f..acf3ef1 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,8 +1,8 @@ Apache Apache Commons DBCP - Version 2.4.0 - RELEASE NOTES + Version 2.4.0 + RELEASE NOTES -The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.4.0. +The Apache Commons DBCP team is pleased to announce the release of Apache Apache Commons DBCP 2.4.0-SNAPSHOT. Apache Commons DBCP software implements Database Connection Pooling. @@ -10,6 +10,7 @@ This is a minor release, including bug fixes and enhancements. Changes in this version include: + Fixed Bugs: o DBCP-484: Connection leak during XATransaction in high load. Thanks to Emanuel Freitas. o DBCP-496: Add support for pooling CallableStatements to the org.apache.commons.dbcp2.cpdsadapter package. Thanks to Gary Gregory. @@ -20,6 +21,12 @@ o DBCP-491: Ensure DBCP ConnectionListener can deal with transaction managers w o DBCP-494: org.apache.commons.dbcp2.PStmtKey should make copies of given arrays in constructors. Thanks to Gary Gregory. o DBCP-495: Remove duplicate code in org.apache.commons.dbcp2.cpdsadapter.PStmtKeyCPDS. Thanks to Gary Gregory. o DBCP-497: Deprecate use of PStmtKeyCPDS in favor of PStmtKey. Thanks to Gary Gregory. +o DBCP-498: org.apache.commons.dbcp2.DataSourceConnectionFactory should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-499: org.apache.commons.dbcp2.managed.DataSourceXAConnectionFactory should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-500: org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-501: org.apache.commons.dbcp2.datasources.CPDSConnectionFactory should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-502: org.apache.commons.dbcp2.datasources internals should use a char[] instead of a String to store passwords. Thanks to Gary Gregory. +o DBCP-503: org.apache.commons.dbcp2.datasources.InstanceKeyDataSourceFactory.closeAll() does not close all. Thanks to Gary Gregory. For complete information on Apache Commons DBCP, including instructions on how to submit bug reports, @@ -27,6 +34,7 @@ patches, or suggestions for improvement, see the Apache Apache Commons DBCP webs http://commons.apache.org/dbcp/ + - Apache Apache Commons DBCP
[14/50] [abbrv] commons-dbcp git commit: Javadoc.
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/5cc5624a Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/5cc5624a Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/5cc5624a Branch: refs/heads/release Commit: 5cc5624a22fd441ac2ec9a31e8d955993c1ef72d Parents: 437d4d6 Author: Gary Gregory Authored: Mon Jun 11 17:48:29 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:48:29 2018 -0600 -- .../commons/dbcp2/managed/TransactionRegistry.java | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5cc5624a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java index 7715497..70aa23c 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java @@ -48,7 +48,7 @@ public class TransactionRegistry { * Creates a TransactionRegistry for the specified transaction manager. * * @param transactionManager - *the transaction manager used to enlist connections + *the transaction manager used to enlist connections. */ public TransactionRegistry(final TransactionManager transactionManager) { this.transactionManager = transactionManager; @@ -59,9 +59,9 @@ public class TransactionRegistry { * it is actually the XAResource that is given to the transaction manager. * * @param connection - *the JDBC connection + *The JDBC connection. * @param xaResource - *the XAResource which managed the connection within a transaction + *The XAResource which managed the connection within a transaction. */ public synchronized void registerConnection(final Connection connection, final XAResource xaResource) { Objects.requireNonNull(connection, "connection is null"); @@ -74,9 +74,9 @@ public class TransactionRegistry { * * @param connection *the connection - * @return the XAResource registered for the connection; never null + * @return The XAResource registered for the connection; never null. * @throws SQLException - * if the connection does not have a registered XAResource + * Thrown when the connection does not have a registered XAResource. */ public synchronized XAResource getXAResource(final Connection connection) throws SQLException { Objects.requireNonNull(connection, "connection is null"); @@ -91,9 +91,9 @@ public class TransactionRegistry { /** * Gets the active TransactionContext or null if not Transaction is active. * - * @return the active TransactionContext or null if no Transaction is active + * @return The active TransactionContext or null if no Transaction is active. * @throws SQLException - * if an error occurs while fetching the transaction + * Thrown when an error occurs while fetching the transaction. */ public TransactionContext getActiveTransactionContext() throws SQLException { Transaction transaction = null; @@ -123,9 +123,10 @@ public class TransactionRegistry { } /** - * Unregisters a destroyed connection from {@link TransactionRegistry} + * Unregisters a destroyed connection from {@link TransactionRegistry}. * * @param connection + *A destroyed connection from {@link TransactionRegistry}. */ public synchronized void unregisterConnection(final Connection connection) { final Connection key = getConnectionKey(connection);
[20/50] [abbrv] commons-dbcp git commit: Add missing Javadoc, better param names, line length 120.
Add missing Javadoc, better param names, line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/00354024 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/00354024 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/00354024 Branch: refs/heads/release Commit: 00354024c64400dfaba80873e55fa365d45b1f9f Parents: 628e21f Author: Gary Gregory Authored: Mon Jun 11 18:00:07 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:00:07 2018 -0600 -- .../commons/dbcp2/DriverConnectionFactory.java | 24 +++- 1 file changed, 18 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/00354024/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java index 09f02bf..4c2686c 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java @@ -15,6 +15,7 @@ * limitations under the License. */ package org.apache.commons.dbcp2; + import java.sql.Connection; import java.sql.Driver; import java.sql.SQLException; @@ -31,19 +32,30 @@ public class DriverConnectionFactory implements ConnectionFactory { private final Driver driver; private final Properties properties; -public DriverConnectionFactory(final Driver driver, final String connectUri, final Properties props) { +/** + * Constructs a connection factory for a given Driver. + * + * @param driver + *The Driver. + * @param connectString + *The connection string. + * @param properties + *The connection properties. + */ +public DriverConnectionFactory(final Driver driver, final String connectString, final Properties properties) { this.driver = driver; -this.connectionUri = connectUri; -this.properties = props; +this.connectionUri = connectString; +this.properties = properties; } + @Override public Connection createConnection() throws SQLException { -return driver.connect(connectionUri,properties); +return driver.connect(connectionUri, properties); } @Override public String toString() { -return this.getClass().getName() + " [" + String.valueOf(driver) + ";" + -String.valueOf(connectionUri) + ";" + String.valueOf(properties) + "]"; +return this.getClass().getName() + " [" + String.valueOf(driver) + ";" + String.valueOf(connectionUri) + ";" ++ String.valueOf(properties) + "]"; } }
[35/50] [abbrv] commons-dbcp git commit: Add missing Javadoc and Javadoc tweaks.
Add missing Javadoc and Javadoc tweaks. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/9b7cc8b3 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/9b7cc8b3 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/9b7cc8b3 Branch: refs/heads/release Commit: 9b7cc8b38d7d2ce97ace6e7a9c904f910b7bc096 Parents: 55cc86a Author: Gary Gregory Authored: Mon Jun 11 18:50:34 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:50:34 2018 -0600 -- .../java/org/apache/commons/dbcp2/PoolingDataSource.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9b7cc8b3/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java index f4d6cbe..d28f7a4 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java @@ -46,6 +46,12 @@ public class PoolingDataSource implements DataSource, Auto /** Controls access to the underlying connection */ private boolean accessToUnderlyingConnectionAllowed; +/** + * Constructs a new instance backed by the given connection pool. + * + * @param pool + *the given connection pool. + */ public PoolingDataSource(final ObjectPool pool) { Objects.requireNonNull(pool, "Pool must not be null."); this.pool = pool; @@ -63,7 +69,7 @@ public class PoolingDataSource implements DataSource, Auto } /** - * Close and free all {@link Connection}s from the pool. + * Closes and free all {@link Connection}s from the pool. * * @since 2.1 */ @@ -118,7 +124,7 @@ public class PoolingDataSource implements DataSource, Auto //--- DataSource methods - /** - * Return a {@link java.sql.Connection} from my pool, according to the contract specified by + * Returns a {@link java.sql.Connection} from my pool, according to the contract specified by * {@link ObjectPool#borrowObject}. */ @Override
[23/50] [abbrv] commons-dbcp git commit: Javadoc.
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/738aecef Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/738aecef Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/738aecef Branch: refs/heads/release Commit: 738aecefacef32fbf53c5932022a5c4157eb1133 Parents: 0eca91a Author: Gary Gregory Authored: Mon Jun 11 18:02:02 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:02:02 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/738aecef/src/main/java/org/apache/commons/dbcp2/Constants.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/Constants.java b/src/main/java/org/apache/commons/dbcp2/Constants.java index ee25580..36fb0ec 100644 --- a/src/main/java/org/apache/commons/dbcp2/Constants.java +++ b/src/main/java/org/apache/commons/dbcp2/Constants.java @@ -17,7 +17,7 @@ package org.apache.commons.dbcp2; /** - * Constants for use with JMX + * Constants for use with JMX. * * @since 2.0 */
[09/50] [abbrv] commons-dbcp git commit: Line length 120.
Line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/cc7f0700 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/cc7f0700 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/cc7f0700 Branch: refs/heads/release Commit: cc7f070063cbecf7289918e63150696ede9efeb9 Parents: 6a612f3 Author: Gary Gregory Authored: Mon Jun 11 17:41:24 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:41:24 2018 -0600 -- .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/cc7f0700/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index 49a20d6..6c4479d 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -158,8 +158,7 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl throws SQLException { getConnectionCalled = true; PooledConnectionImpl pooledConnection = null; -// Workaround for buggy WebLogic 5.1 classloader - ignore the -// exception upon first invocation. +// Workaround for buggy WebLogic 5.1 classloader - ignore the exception upon first invocation. try { if (connectionProperties != null) { update(connectionProperties, KEY_USER, pooledUserName);
[03/50] [abbrv] commons-dbcp git commit: Javadoc.
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/a3ff0a8f Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/a3ff0a8f Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/a3ff0a8f Branch: refs/heads/release Commit: a3ff0a8f0f2859169af38424d9f061fecd1e3a93 Parents: 8672c35 Author: Gary Gregory Authored: Mon Jun 11 17:09:38 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:09:38 2018 -0600 -- .../org/apache/commons/dbcp2/DelegatingCallableStatement.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/a3ff0a8f/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java index 9a1474c..978467a 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java @@ -41,16 +41,18 @@ import java.util.Map; * * All of the methods from the {@link CallableStatement} interface simply call the corresponding method on the * "delegate" provided in my constructor. + * * * Extends AbandonedTrace to implement Statement tracking and logging of code which created the Statement. Tracking the * Statement ensures that the Connection which created it can close any open Statement's on Connection close. + * * * @since 2.0 */ public class DelegatingCallableStatement extends DelegatingPreparedStatement implements CallableStatement { /** - * Create a wrapper for the Statement which traces this Statement to the Connection which created it and the code + * Creates a wrapper for the Statement which traces this Statement to the Connection which created it and the code * which created it. * * @param c
[04/50] [abbrv] commons-dbcp git commit: Add missing Javadoc HTML tags.
Add missing Javadoc HTML tags. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/c2999dfd Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/c2999dfd Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/c2999dfd Branch: refs/heads/release Commit: c2999dfde9d33635ce8d9fc5ade5ae19d7f32c22 Parents: a3ff0a8 Author: Gary Gregory Authored: Mon Jun 11 17:12:44 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:12:44 2018 -0600 -- .../org/apache/commons/dbcp2/DelegatingResultSet.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/c2999dfd/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index 3e2424e..53beeab 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -45,11 +45,13 @@ import java.util.Map; * All of the methods from the {@link ResultSet} interface * simply call the corresponding method on the "delegate" * provided in my constructor. + * * * Extends AbandonedTrace to implement result set tracking and * logging of code which created the ResultSet. Tracking the * ResultSet ensures that the Statement which created it can * close any open ResultSet's on Statement close. + * * * @since 2.0 */ @@ -65,12 +67,13 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS private Connection connection; /** - * Create a wrapper for the ResultSet which traces this + * Creates a wrapper for the ResultSet which traces this * ResultSet to the Statement which created it and the * code which created it. * * Private to ensure all construction is * {@link #wrapResultSet(Statement, ResultSet)} + * * * @param stmt Statement which created this ResultSet * @param res ResultSet to wrap @@ -82,12 +85,13 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS } /** - * Create a wrapper for the ResultSet which traces this + * Creates a wrapper for the ResultSet which traces this * ResultSet to the Connection which created it (via, for * example DatabaseMetadata, and the code which created it. * * Private to ensure all construction is * {@link #wrapResultSet(Connection, ResultSet)} + * * * @param conn Connection which created this ResultSet * @param res ResultSet to wrap @@ -126,10 +130,12 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS * delegate that is not a {@code DelegatingResultSet}, * or {@code null} when no non-{@code DelegatingResultSet} * delegate can be found by traversing this chain. + * * * This method is useful when you may have nested * {@code DelegatingResultSet}s, and you want to make * sure to obtain a "genuine" {@link ResultSet}. + * */ public ResultSet getInnermostDelegate() { ResultSet r = resultSet;
[40/50] [abbrv] commons-dbcp git commit: Line length 120.
Line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/d5a24430 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/d5a24430 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/d5a24430 Branch: refs/heads/release Commit: d5a24430061654ac5319ba1392415e7f3958a475 Parents: c43bd77 Author: Gary Gregory Authored: Tue Jun 12 08:14:16 2018 -0600 Committer: Gary Gregory Committed: Tue Jun 12 08:14:16 2018 -0600 -- .../apache/commons/dbcp2/AbandonedTrace.java| 10 +- .../apache/commons/dbcp2/BasicDataSource.java | 53 +- .../commons/dbcp2/BasicDataSourceFactory.java | 236 ++- .../apache/commons/dbcp2/ConnectionFactory.java |6 +- .../commons/dbcp2/DelegatingConnection.java | 319 ++-- .../dbcp2/DelegatingDatabaseMetaData.java | 1199 + .../commons/dbcp2/DelegatingResultSet.java | 1580 +- .../commons/dbcp2/DelegatingStatement.java | 46 +- .../dbcp2/DriverManagerConnectionFactory.java | 32 +- .../dbcp2/LifetimeExceededException.java|5 +- .../dbcp2/PoolableCallableStatement.java| 26 +- .../dbcp2/PoolableConnectionFactory.java| 20 +- .../commons/dbcp2/PoolableConnectionMXBean.java | 17 +- .../dbcp2/PoolablePreparedStatement.java| 39 +- .../apache/commons/dbcp2/PoolingDataSource.java | 27 +- .../org/apache/commons/dbcp2/PoolingDriver.java | 60 +- .../commons/dbcp2/SwallowedExceptionLogger.java | 21 +- .../org/apache/commons/dbcp2/package-info.java | 207 +-- 18 files changed, 2530 insertions(+), 1373 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d5a24430/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java index 77b5441..659fe76 100644 --- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java +++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java @@ -50,7 +50,8 @@ public class AbandonedTrace implements TrackedUse { /** * Constructs a new AbandonedTrace with a parent object. * - * @param parent AbandonedTrace parent object. + * @param parent + *AbandonedTrace parent object. */ public AbandonedTrace(final AbandonedTrace parent) { init(parent); @@ -59,7 +60,8 @@ public class AbandonedTrace implements TrackedUse { /** * Initializes abandoned tracing for this object. * - * @param parent AbandonedTrace parent object. + * @param parent + *AbandonedTrace parent object. */ private void init(final AbandonedTrace parent) { if (parent != null) { @@ -111,7 +113,7 @@ public class AbandonedTrace implements TrackedUse { * Clears the list of objects being traced by this object. */ protected void clearTrace() { -synchronized(this.traceList) { +synchronized (this.traceList) { this.traceList.clear(); } } @@ -149,7 +151,7 @@ public class AbandonedTrace implements TrackedUse { *AbandonedTrace object to remove. */ protected void removeTrace(final AbandonedTrace trace) { -synchronized(this.traceList) { +synchronized (this.traceList) { final Iterator> iter = traceList.iterator(); while (iter.hasNext()) { final AbandonedTrace traceInList = iter.next().get(); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d5a24430/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index 861238f..d940e7e 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -129,7 +129,6 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean this.defaultAutoCommit = defaultAutoCommit; } - /** * The default read-only state of connections created by this pool. */ @@ -165,8 +164,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The default TransactionIsolation state of connections created by this pool. */ -private volatile int defaultTransactionIsolation = -PoolableConnectionFactory.UNKNOWN_TRANSACTIONISOLATION; +private volatile int defaultTransactionIsolation = PoolableConnectionFactory.UNKNOWN_TRANSACTIONISOLATION; /**
[02/50] [abbrv] commons-dbcp git commit: Refactor common code.
Refactor common code. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8672c356 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8672c356 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8672c356 Branch: refs/heads/release Commit: 8672c3560a180a36f854458724ab7b40ee8b9d54 Parents: c432a07 Author: Gary Gregory Authored: Mon Jun 11 17:08:43 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:08:43 2018 -0600 -- .../dbcp2/DelegatingCallableStatement.java | 230 ++- 1 file changed, 117 insertions(+), 113 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8672c356/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java index ac48ce8..9a1474c 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java @@ -66,7 +66,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public void registerOutParameter(final int parameterIndex, final int sqlType) throws SQLException { checkOpen(); try { -((CallableStatement) getDelegate()).registerOutParameter(parameterIndex, sqlType); + getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType); } catch (final SQLException e) { handleException(e); } @@ -76,7 +76,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public void registerOutParameter(final int parameterIndex, final int sqlType, final int scale) throws SQLException { checkOpen(); try { -((CallableStatement) getDelegate()).registerOutParameter(parameterIndex, sqlType, scale); + getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType, scale); } catch (final SQLException e) { handleException(e); } @@ -86,7 +86,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public boolean wasNull() throws SQLException { checkOpen(); try { -return ((CallableStatement) getDelegate()).wasNull(); +return getDelegateCallableStatement().wasNull(); } catch (final SQLException e) { handleException(e); return false; @@ -97,7 +97,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public String getString(final int parameterIndex) throws SQLException { checkOpen(); try { -return ((CallableStatement) getDelegate()).getString(parameterIndex); +return getDelegateCallableStatement().getString(parameterIndex); } catch (final SQLException e) { handleException(e); return null; @@ -108,7 +108,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public boolean getBoolean(final int parameterIndex) throws SQLException { checkOpen(); try { -return ((CallableStatement) getDelegate()).getBoolean(parameterIndex); +return getDelegateCallableStatement().getBoolean(parameterIndex); } catch (final SQLException e) { handleException(e); return false; @@ -119,7 +119,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public byte getByte(final int parameterIndex) throws SQLException { checkOpen(); try { -return ((CallableStatement) getDelegate()).getByte(parameterIndex); +return getDelegateCallableStatement().getByte(parameterIndex); } catch (final SQLException e) { handleException(e); return 0; @@ -130,7 +130,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public short getShort(final int parameterIndex) throws SQLException { checkOpen(); try { -return ((CallableStatement) getDelegate()).getShort(parameterIndex); +return getDelegateCallableStatement().getShort(parameterIndex); } catch (final SQLException e) { handleException(e); return 0; @@ -141,7 +141,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp public int getInt(final int parameterIndex) throws SQLException { checkOpen(); try { -return ((CallableStatement
[01/50] [abbrv] commons-dbcp git commit: Line length 120 and standard formatting.
Repository: commons-dbcp Updated Branches: refs/heads/release f8b218691 -> fb23b1530 Line length 120 and standard formatting. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/c432a075 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/c432a075 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/c432a075 Branch: refs/heads/release Commit: c432a075e7c1bca79a63eb2a8f9d9ef5495c0e48 Parents: b3f1cc3 Author: Gary Gregory Authored: Mon Jun 11 17:07:48 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:07:48 2018 -0600 -- .../dbcp2/DelegatingCallableStatement.java | 1060 +- 1 file changed, 773 insertions(+), 287 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/c432a075/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java index 9aed970..ac48ce8 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java @@ -39,359 +39,876 @@ import java.util.Map; /** * A base delegating implementation of {@link CallableStatement}. * - * All of the methods from the {@link CallableStatement} interface - * simply call the corresponding method on the "delegate" - * provided in my constructor. + * All of the methods from the {@link CallableStatement} interface simply call the corresponding method on the + * "delegate" provided in my constructor. * - * Extends AbandonedTrace to implement Statement tracking and - * logging of code which created the Statement. Tracking the - * Statement ensures that the Connection which created it can - * close any open Statement's on Connection close. + * Extends AbandonedTrace to implement Statement tracking and logging of code which created the Statement. Tracking the + * Statement ensures that the Connection which created it can close any open Statement's on Connection close. * * @since 2.0 */ -public class DelegatingCallableStatement extends DelegatingPreparedStatement -implements CallableStatement { +public class DelegatingCallableStatement extends DelegatingPreparedStatement implements CallableStatement { /** - * Create a wrapper for the Statement which traces this - * Statement to the Connection which created it and the - * code which created it. + * Create a wrapper for the Statement which traces this Statement to the Connection which created it and the code + * which created it. * - * @param c the {@link DelegatingConnection} that created this statement - * @param s the {@link CallableStatement} to delegate all calls to + * @param c + *the {@link DelegatingConnection} that created this statement + * @param s + *the {@link CallableStatement} to delegate all calls to */ -public DelegatingCallableStatement(final DelegatingConnection c, - final CallableStatement s) { +public DelegatingCallableStatement(final DelegatingConnection c, final CallableStatement s) { super(c, s); } @Override -public void registerOutParameter(final int parameterIndex, final int sqlType) throws SQLException -{ checkOpen(); try { ((CallableStatement)getDelegate()).registerOutParameter( parameterIndex, sqlType); } catch (final SQLException e) { handleException(e); } } +public void registerOutParameter(final int parameterIndex, final int sqlType) throws SQLException { +checkOpen(); +try { +((CallableStatement) getDelegate()).registerOutParameter(parameterIndex, sqlType); +} catch (final SQLException e) { +handleException(e); +} +} @Override -public void registerOutParameter(final int parameterIndex, final int sqlType, final int scale) throws SQLException -{ checkOpen(); try { ((CallableStatement)getDelegate()).registerOutParameter( parameterIndex, sqlType, scale); } catch (final SQLException e) { handleException(e); } } +public void registerOutParameter(final int parameterIndex, final int sqlType, final int scale) throws SQLException { +checkOpen(); +try { +((CallableStatement) getDelegate()).registerOutParameter(parameterIndex, sqlType, scale); +} catch (final SQLException e) { +handleException(e); +} +} @Override -public boolean wasNull() throws SQLException -{ checkOpen(); try { return ((CallableStatement)getDelegate())
[21/50] [abbrv] commons-dbcp git commit: Better ivar name.
Better ivar name. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/75199a4d Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/75199a4d Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/75199a4d Branch: refs/heads/release Commit: 75199a4d3244bf3f97979024ac15a55728cb0860 Parents: 0035402 Author: Gary Gregory Authored: Mon Jun 11 18:00:33 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:00:33 2018 -0600 -- .../org/apache/commons/dbcp2/DriverConnectionFactory.java| 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/75199a4d/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java index 4c2686c..c7d5716 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java @@ -28,7 +28,7 @@ import java.util.Properties; */ public class DriverConnectionFactory implements ConnectionFactory { -private final String connectionUri; +private final String connectionString; private final Driver driver; private final Properties properties; @@ -44,18 +44,18 @@ public class DriverConnectionFactory implements ConnectionFactory { */ public DriverConnectionFactory(final Driver driver, final String connectString, final Properties properties) { this.driver = driver; -this.connectionUri = connectString; +this.connectionString = connectString; this.properties = properties; } @Override public Connection createConnection() throws SQLException { -return driver.connect(connectionUri, properties); +return driver.connect(connectionString, properties); } @Override public String toString() { -return this.getClass().getName() + " [" + String.valueOf(driver) + ";" + String.valueOf(connectionUri) + ";" +return this.getClass().getName() + " [" + String.valueOf(driver) + ";" + String.valueOf(connectionString) + ";" + String.valueOf(properties) + "]"; } }
[33/50] [abbrv] commons-dbcp git commit: Better description of time scale.
Better description of time scale. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/18e6a973 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/18e6a973 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/18e6a973 Branch: refs/heads/release Commit: 18e6a973234edce2e46a5c4fd99ab890e8594b31 Parents: 8856608 Author: Gary Gregory Authored: Mon Jun 11 18:47:23 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:47:23 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/18e6a973/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java index 56ed7e9..48101f2 100644 --- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java +++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java @@ -38,7 +38,7 @@ public class AbandonedTrace implements TrackedUse { private final List> traceList = new ArrayList<>(); /** Last time this connection was used */ -private volatile long lastUsed = 0; +private volatile long lastUsedMillis = 0; /** * Create a new AbandonedTrace without config and without doing abandoned tracing. @@ -74,14 +74,14 @@ public class AbandonedTrace implements TrackedUse { */ @Override public long getLastUsed() { -return lastUsed; +return lastUsedMillis; } /** * Sets the time this object was last used to the current time in milliseconds. */ protected void setLastUsed() { -lastUsed = System.currentTimeMillis(); +lastUsedMillis = System.currentTimeMillis(); } /** @@ -91,7 +91,7 @@ public class AbandonedTrace implements TrackedUse { *time in milliseconds */ protected void setLastUsed(final long lastUsedMillis) { -lastUsed = lastUsedMillis; +this.lastUsedMillis = lastUsedMillis; } /**
[25/50] [abbrv] commons-dbcp git commit: Add missing Javadoc tags.
Add missing Javadoc tags. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/f20a5698 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/f20a5698 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/f20a5698 Branch: refs/heads/release Commit: f20a569806d5cb3f5ccaf1cfb54946867b78cc91 Parents: 5ccf73a Author: Gary Gregory Authored: Mon Jun 11 18:08:01 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:08:01 2018 -0600 -- .../org/apache/commons/dbcp2/PoolableConnectionFactory.java| 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/f20a5698/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index 2f5288b..41d74a5 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -178,6 +178,9 @@ public class PoolableConnectionFactory implements PooledObjectFactory disconnectionSqlCodes) {
[22/50] [abbrv] commons-dbcp git commit: Line length 120.
Line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/0eca91ae Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/0eca91ae Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/0eca91ae Branch: refs/heads/release Commit: 0eca91ae405f281e734337024bf499bc2e90c8dc Parents: 75199a4 Author: Gary Gregory Authored: Mon Jun 11 18:01:31 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:01:31 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/Constants.java | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/0eca91ae/src/main/java/org/apache/commons/dbcp2/Constants.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/Constants.java b/src/main/java/org/apache/commons/dbcp2/Constants.java index 5670248..ee25580 100644 --- a/src/main/java/org/apache/commons/dbcp2/Constants.java +++ b/src/main/java/org/apache/commons/dbcp2/Constants.java @@ -18,18 +18,17 @@ package org.apache.commons.dbcp2; /** * Constants for use with JMX + * * @since 2.0 */ public class Constants { + public static final String JMX_CONNECTION_POOL_BASE_EXT = ",connectionpool="; public static final String JMX_CONNECTION_POOL_PREFIX = "connections"; -public static final String JMX_CONNECTION_BASE_EXT = -JMX_CONNECTION_POOL_BASE_EXT + -JMX_CONNECTION_POOL_PREFIX + -",connection="; +public static final String JMX_CONNECTION_BASE_EXT = JMX_CONNECTION_POOL_BASE_EXT + JMX_CONNECTION_POOL_PREFIX ++ ",connection="; -public static final String JMX_STATEMENT_POOL_BASE_EXT = -JMX_CONNECTION_BASE_EXT; +public static final String JMX_STATEMENT_POOL_BASE_EXT = JMX_CONNECTION_BASE_EXT; public static final String JMX_STATEMENT_POOL_PREFIX = ",statementpool=statements"; }
[41/50] [abbrv] commons-dbcp git commit: Javadoc.
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/0047005d Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/0047005d Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/0047005d Branch: refs/heads/release Commit: 0047005da62e887eb4f1784b5890e0aac6ad89b3 Parents: d5a2443 Author: Gary Gregory Authored: Tue Jun 12 08:18:24 2018 -0600 Committer: Gary Gregory Committed: Tue Jun 12 08:18:24 2018 -0600 -- .../java/org/apache/commons/dbcp2/PStmtKey.java | 36 +++- 1 file changed, 28 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/0047005d/src/main/java/org/apache/commons/dbcp2/PStmtKey.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java index c70c3b6..aba3acc 100644 --- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java +++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java @@ -31,31 +31,51 @@ import org.apache.commons.dbcp2.PoolingConnection.StatementType; */ public class PStmtKey { -/** SQL defining Prepared or Callable Statement */ +/** + * SQL defining Prepared or Callable Statement + */ private final String sql; -/** Result set type */ +/** + * Result set type; one of ResultSet.TYPE_FORWARD_ONLY, ResultSet.TYPE_SCROLL_INSENSITIVE, + * or ResultSet.TYPE_SCROLL_SENSITIVE. + */ private final Integer resultSetType; -/** Result set concurrency */ +/** + * Result set concurrency. A concurrency type; one of ResultSet.CONCUR_READ_ONLY or + * ResultSet.CONCUR_UPDATABLE. + */ private final Integer resultSetConcurrency; -/** Result set holdability */ +/** + * Result set holdability. One of the following ResultSet constants: + * ResultSet.HOLD_CURSORS_OVER_COMMIT or ResultSet.CLOSE_CURSORS_AT_COMMIT. + */ private final Integer resultSetHoldability; /** Database catalog */ private final String catalog; -/** Auto generated keys */ +/** + * A flag indicating whether auto-generated keys should be returned; one of + * Statement.RETURN_GENERATED_KEYS or Statement.NO_GENERATED_KEYS. + */ private final Integer autoGeneratedKeys; -/** column indexes */ +/** + * An array of column indexes indicating the columns that should be returned from the inserted row or rows. + */ private final int[] columnIndexes; -/** column names */ +/** + * An array of column names indicating the columns that should be returned from the inserted row or rows. + */ private final String[] columnNames; -/** Statement type */ +/** + * Statement type, prepared or callable. + */ private final StatementType statementType; /** Statement builder */
[37/50] [abbrv] commons-dbcp git commit: Line length 120.
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d5a24430/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 1442536..098950d 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -26,15 +26,11 @@ import java.util.List; /** * A base delegating implementation of {@link Statement}. * - * All of the methods from the {@link Statement} interface - * simply check to see that the {@link Statement} is active, - * and call the corresponding method on the "delegate" - * provided in my constructor. + * All of the methods from the {@link Statement} interface simply check to see that the {@link Statement} is active, and + * call the corresponding method on the "delegate" provided in my constructor. * - * Extends AbandonedTrace to implement Statement tracking and - * logging of code which created the Statement. Tracking the - * Statement ensures that the Connection which created it can - * close any open Statement's on Connection close. + * Extends AbandonedTrace to implement Statement tracking and logging of code which created the Statement. Tracking the + * Statement ensures that the Connection which created it can close any open Statement's on Connection close. * * @since 2.0 */ @@ -71,7 +67,6 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { return statement; } - /** * If my underlying {@link Statement} is not a {@code DelegatingStatement}, returns it, otherwise recursively * invokes this method on my delegate. @@ -83,6 +78,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { * This method is useful when you may have nested {@code DelegatingStatement}s, and you want to make sure to obtain * a "genuine" {@link Statement}. * + * * @return The innermost delegate. * * @see #getDelegate @@ -101,7 +97,8 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { /** * Sets my delegate. * - * @param statement my delegate. + * @param statement + *my delegate. */ public void setDelegate(final Statement statement) { this.statement = statement; @@ -118,10 +115,8 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { } protected void checkOpen() throws SQLException { -if(isClosed()) { -throw new SQLException -(this.getClass().getName() + " with address: \"" + -this.toString() + "\" is closed."); +if (isClosed()) { +throw new SQLException(this.getClass().getName() + " with address: \"" + this.toString() + "\" is closed."); } } @@ -168,8 +163,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { protected void handleException(final SQLException e) throws SQLException { if (connection != null) { connection.handleException(e); -} -else { +} else { throw e; } } @@ -215,9 +209,8 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { connection.setLastUsed(); } try { -return DelegatingResultSet.wrapResultSet(this,statement.executeQuery(sql)); -} -catch (final SQLException e) { +return DelegatingResultSet.wrapResultSet(this, statement.executeQuery(sql)); +} catch (final SQLException e) { handleException(e); throw new AssertionError(); } @@ -227,9 +220,8 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { public ResultSet getResultSet() throws SQLException { checkOpen(); try { -return DelegatingResultSet.wrapResultSet(this,statement.getResultSet()); -} -catch (final SQLException e) { +return DelegatingResultSet.wrapResultSet(this, statement.getResultSet()); +} catch (final SQLException e) { handleException(e); throw new AssertionError(); } @@ -244,7 +236,8 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { try { return statement.executeUpdate(sql); } catch (final SQLException e) { -handleException(e); return 0; +handleException(e); +return 0; } } @@ -631,7 +624,6 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { return closed; } - @Override public boolean isWrapperFor(final Class ifac
[39/50] [abbrv] commons-dbcp git commit: Line length 120.
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d5a24430/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java index b20cbc5..4a36cb9 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java @@ -49,7 +49,8 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData { * @param databaseMetaData *the database meta data */ -public DelegatingDatabaseMetaData(final DelegatingConnection connection, final DatabaseMetaData databaseMetaData) { +public DelegatingDatabaseMetaData(final DelegatingConnection connection, +final DatabaseMetaData databaseMetaData) { super(); this.connection = connection; this.databaseMetaData = databaseMetaData; @@ -99,38 +100,62 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData { @Override public boolean allProceduresAreCallable() throws SQLException { -try { return databaseMetaData.allProceduresAreCallable(); } - catch (final SQLException e) { handleException(e); return false; } +try { +return databaseMetaData.allProceduresAreCallable(); +} catch (final SQLException e) { +handleException(e); +return false; +} } @Override public boolean allTablesAreSelectable() throws SQLException { -try { return databaseMetaData.allTablesAreSelectable(); } -catch (final SQLException e) { handleException(e); return false; } +try { +return databaseMetaData.allTablesAreSelectable(); +} catch (final SQLException e) { +handleException(e); +return false; +} } @Override public boolean dataDefinitionCausesTransactionCommit() throws SQLException { -try { return databaseMetaData.dataDefinitionCausesTransactionCommit(); } -catch (final SQLException e) { handleException(e); return false; } +try { +return databaseMetaData.dataDefinitionCausesTransactionCommit(); +} catch (final SQLException e) { +handleException(e); +return false; +} } @Override public boolean dataDefinitionIgnoredInTransactions() throws SQLException { -try { return databaseMetaData.dataDefinitionIgnoredInTransactions(); } -catch (final SQLException e) { handleException(e); return false; } +try { +return databaseMetaData.dataDefinitionIgnoredInTransactions(); +} catch (final SQLException e) { +handleException(e); +return false; +} } @Override public boolean deletesAreDetected(final int type) throws SQLException { -try { return databaseMetaData.deletesAreDetected(type); } -catch (final SQLException e) { handleException(e); return false; } +try { +return databaseMetaData.deletesAreDetected(type); +} catch (final SQLException e) { +handleException(e); +return false; +} } @Override public boolean doesMaxRowSizeIncludeBlobs() throws SQLException { -try { return databaseMetaData.doesMaxRowSizeIncludeBlobs(); } -catch (final SQLException e) { handleException(e); return false; } +try { +return databaseMetaData.doesMaxRowSizeIncludeBlobs(); +} catch (final SQLException e) { +handleException(e); +return false; +} } @Override @@ -161,14 +186,22 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData { @Override public String getCatalogSeparator() throws SQLException { -try { return databaseMetaData.getCatalogSeparator(); } -catch (final SQLException e) { handleException(e); throw new AssertionError(); } +try { +return databaseMetaData.getCatalogSeparator(); +} catch (final SQLException e) { +handleException(e); +throw new AssertionError(); +} } @Override public String getCatalogTerm() throws SQLException { -try { return databaseMetaData.getCatalogTerm(); } -catch (final SQLException e) { handleException(e); throw new AssertionError(); } +try { +return databaseMetaData.getCatalogTerm(); +} catch (final SQLException e) { +handleException(e); +throw new AssertionError(); +} } @Override @@ -228,50 +261,82 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData { @Override public int getDatabaseMajorVersion() th
[44/50] [abbrv] commons-dbcp git commit: Format XML.
Format XML. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/e183847a Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/e183847a Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/e183847a Branch: refs/heads/release Commit: e183847a17f944776ef8230ff6f0c5a06263b9d8 Parents: f283f4c Author: Gary Gregory Authored: Tue Jun 12 09:18:15 2018 -0600 Committer: Gary Gregory Committed: Tue Jun 12 09:18:15 2018 -0600 -- src/site/xdoc/guide/classdiagrams.xml| 58 +-- src/site/xdoc/guide/index.xml| 50 --- src/site/xdoc/guide/sequencediagrams.xml | 52 3 files changed, 82 insertions(+), 78 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e183847a/src/site/xdoc/guide/classdiagrams.xml -- diff --git a/src/site/xdoc/guide/classdiagrams.xml b/src/site/xdoc/guide/classdiagrams.xml index 8282490..d616ea2 100644 --- a/src/site/xdoc/guide/classdiagrams.xml +++ b/src/site/xdoc/guide/classdiagrams.xml @@ -1,44 +1,44 @@ - + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> - - Class Diagrams - Commons Documentation Team - + +Class Diagrams +Commons Documentation Team + - + - - - + + + - - - + + + - - - + + + - - - + + + - + http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e183847a/src/site/xdoc/guide/index.xml -- diff --git a/src/site/xdoc/guide/index.xml b/src/site/xdoc/guide/index.xml index 3c9c3b5..d9d55af 100644 --- a/src/site/xdoc/guide/index.xml +++ b/src/site/xdoc/guide/index.xml @@ -1,36 +1,40 @@ - + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> - - Developers Guide - Commons Documentation Team - + +Developers Guide +Commons Documentation Team + - + - - - + + + + + - - - + + + + + - + http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e183847a/src/site/xdoc/guide/sequencediagrams.xml -- diff --git a/src/site/xdoc/guide/sequencediagrams.xml b/src/site/xdoc/guide/sequencediagrams.xml index 4c0ba5d..4b5bca5 100644 --- a/src/site/xdoc/guide/sequencediagrams.xml +++ b/src/site/xdoc/guide/sequencediagrams.xml @@ -1,40 +1,40 @@ - + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> - - Sequence Diagrams - Commons Documentation Team - + +Sequence Diagrams +Commons Documentation Team + - + - - - + + + - - - + + + - - - + + + - +
[10/50] [abbrv] commons-dbcp git commit: Line length 120 and standard formatting.
Line length 120 and standard formatting. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/cb48137d Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/cb48137d Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/cb48137d Branch: refs/heads/release Commit: cb48137d5ab27db5da09ee3940c2cf93fa47fcc6 Parents: cc7f070 Author: Gary Gregory Authored: Mon Jun 11 17:42:43 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:42:43 2018 -0600 -- .../dbcp2/cpdsadapter/ConnectionImpl.java | 77 1 file changed, 31 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/cb48137d/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java index ec2155e..2226e8e 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java @@ -35,6 +35,7 @@ import org.apache.commons.dbcp2.DelegatingPreparedStatement; * * ConnectionImpl extends DelegatingConnection to enable access to the underlying connection. * + * * @since 2.0 */ class ConnectionImpl extends DelegatingConnection { @@ -42,22 +43,23 @@ class ConnectionImpl extends DelegatingConnection { private final boolean accessToUnderlyingConnectionAllowed; /** The object that instantiated this object */ - private final PooledConnectionImpl pooledConnection; +private final PooledConnectionImpl pooledConnection; /** * Creates a ConnectionImpl. * - * @param pooledConnection The PooledConnection that is calling the ctor. - * @param connection The JDBC 1.x Connection to wrap. - * @param accessToUnderlyingConnectionAllowed if true, then access is allowed to the underlying connection + * @param pooledConnection + *The PooledConnection that is calling the ctor. + * @param connection + *The JDBC 1.x Connection to wrap. + * @param accessToUnderlyingConnectionAllowed + *if true, then access is allowed to the underlying connection */ -ConnectionImpl(final PooledConnectionImpl pooledConnection, -final Connection connection, +ConnectionImpl(final PooledConnectionImpl pooledConnection, final Connection connection, final boolean accessToUnderlyingConnectionAllowed) { super(connection); this.pooledConnection = pooledConnection; -this.accessToUnderlyingConnectionAllowed = -accessToUnderlyingConnectionAllowed; +this.accessToUnderlyingConnectionAllowed = accessToUnderlyingConnectionAllowed; } /** @@ -126,7 +128,8 @@ class ConnectionImpl extends DelegatingConnection { * @since 2.4.0 */ @Override -public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency) throws SQLException { +public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency) +throws SQLException { checkOpen(); try { return new DelegatingCallableStatement(this, @@ -187,10 +190,8 @@ class ConnectionImpl extends DelegatingConnection { public PreparedStatement prepareStatement(final String sql) throws SQLException { checkOpen(); try { -return new DelegatingPreparedStatement -(this, pooledConnection.prepareStatement(sql)); -} -catch (final SQLException e) { +return new DelegatingPreparedStatement(this, pooledConnection.prepareStatement(sql)); +} catch (final SQLException e) { handleException(e); // Does not return return null; } @@ -204,75 +205,59 @@ class ConnectionImpl extends DelegatingConnection { * if this connection is closed or an error occurs in the wrapped connection. */ @Override -public PreparedStatement prepareStatement(final String sql, final int resultSetType, - final int resultSetConcurrency) +public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency) throws SQLException { checkOpen(); try { -return new DelegatingPreparedStatement -(this, pooledConnection.prepareStatement -(sql,resultSetType,resultSetConcurrency)); -} -catch (final SQLExc
[19/50] [abbrv] commons-dbcp git commit: Don't use deprecated ctor.
Don't use deprecated ctor. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/628e21fc Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/628e21fc Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/628e21fc Branch: refs/heads/release Commit: 628e21fcc75ddf52ff2ad5c67ee7b4840b6357df Parents: 95b6b99 Author: Gary Gregory Authored: Mon Jun 11 17:57:40 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:57:40 2018 -0600 -- .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/628e21fc/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java index 08f75e5..d6aa18a 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -157,7 +157,7 @@ class CPDSConnectionFactory // should we add this object as a listener or the pool. // consider the validateObject method in decision pc.addConnectionEventListener(this); -pci = new PooledConnectionAndInfo(pc, userName, Utils.toString(userPassword)); +pci = new PooledConnectionAndInfo(pc, userName, userPassword); pcMap.put(pc, pci); } catch (final SQLException e) { throw new RuntimeException(e.getMessage());
[32/50] [abbrv] commons-dbcp git commit: Better description of time scale.
Better description of time scale. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/8856608a Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8856608a Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8856608a Branch: refs/heads/release Commit: 8856608a047f389a40f6d1f409983de139b35850 Parents: 91dc994 Author: Gary Gregory Authored: Mon Jun 11 18:46:38 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:46:38 2018 -0600 -- .../org/apache/commons/dbcp2/AbandonedTrace.java| 16 1 file changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8856608a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java index a53b360..56ed7e9 100644 --- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java +++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java @@ -68,9 +68,9 @@ public class AbandonedTrace implements TrackedUse { } /** - * Gets the last time this object was used in ms. + * Gets the last time this object was used in milliseconds. * - * @return long time in ms + * @return long time in milliseconds */ @Override public long getLastUsed() { @@ -78,20 +78,20 @@ public class AbandonedTrace implements TrackedUse { } /** - * Sets the time this object was last used to the current time in ms. + * Sets the time this object was last used to the current time in milliseconds. */ protected void setLastUsed() { lastUsed = System.currentTimeMillis(); } /** - * Sets the time in ms this object was last used. + * Sets the time in milliseconds this object was last used. * - * @param time - *time in ms + * @param lastUsedMillis + *time in milliseconds */ -protected void setLastUsed(final long time) { -lastUsed = time; +protected void setLastUsed(final long lastUsedMillis) { +lastUsed = lastUsedMillis; } /**
[06/50] [abbrv] commons-dbcp git commit: Line length 120 and standard formatting.
Line length 120 and standard formatting. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/e7ee9481 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/e7ee9481 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/e7ee9481 Branch: refs/heads/release Commit: e7ee9481ed978b1571fab43fde8da46439e9d503 Parents: 15a5cf8 Author: Gary Gregory Authored: Mon Jun 11 17:22:46 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 17:22:46 2018 -0600 -- .../datasources/CPDSConnectionFactory.java | 99 ++--- .../datasources/InstanceKeyDataSource.java | 15 +- .../datasources/KeyedCPDSConnectionFactory.java | 17 +-- .../datasources/PerUserPoolDataSource.java | 138 +-- .../datasources/PooledConnectionAndInfo.java| 2 +- .../datasources/PooledConnectionManager.java| 32 +++-- .../dbcp2/datasources/SharedPoolDataSource.java | 42 +++--- .../SharedPoolDataSourceFactory.java| 12 +- 8 files changed, 162 insertions(+), 195 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/e7ee9481/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java index e3c0d2e..08f75e5 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -37,17 +37,14 @@ import org.apache.commons.pool2.PooledObjectFactory; import org.apache.commons.pool2.impl.DefaultPooledObject; /** - * A {@link PooledObjectFactory} that creates - * {@link org.apache.commons.dbcp2.PoolableConnection PoolableConnection}s. + * A {@link PooledObjectFactory} that creates {@link org.apache.commons.dbcp2.PoolableConnection PoolableConnection}s. * * @since 2.0 */ class CPDSConnectionFactory implements PooledObjectFactory, ConnectionEventListener, PooledConnectionManager { -private static final String NO_KEY_MESSAGE -= "close() was called on a Connection, but " -+ "I have no record of the underlying PooledConnection."; +private static final String NO_KEY_MESSAGE = "close() was called on a Connection, but I have no record of the underlying PooledConnection."; private final ConnectionPoolDataSource cpds; private final String validationQuery; @@ -59,17 +56,15 @@ class CPDSConnectionFactory private long maxConnLifetimeMillis = -1; /** - * Map of PooledConnections for which close events are ignored. - * Connections are muted when they are being validated. + * Map of PooledConnections for which close events are ignored. Connections are muted when they are being validated. */ -private final Set validatingSet = -Collections.newSetFromMap(new ConcurrentHashMap()); +private final Set validatingSet = Collections +.newSetFromMap(new ConcurrentHashMap()); /** * Map of PooledConnectionAndInfo instances */ -private final Map pcMap = -new ConcurrentHashMap<>(); +private final Map pcMap = new ConcurrentHashMap<>(); /** * Creates a new {@code PoolableConnectionFactory}. @@ -90,12 +85,9 @@ class CPDSConnectionFactory *The password to use to create connections * @since 2.4.0 */ -public CPDSConnectionFactory(final ConnectionPoolDataSource cpds, - final String validationQuery, - final int validationQueryTimeoutSeconds, - final boolean rollbackAfterValidation, - final String userName, - final char[] userPassword) { +public CPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, +final int validationQueryTimeoutSeconds, final boolean rollbackAfterValidation, final String userName, +final char[] userPassword) { this.cpds = cpds; this.validationQuery = validationQuery; this.validationQueryTimeoutSeconds = validationQueryTimeoutSeconds; @@ -122,12 +114,9 @@ class CPDSConnectionFactory * @param userPassword *The password to use to create connections */ -public CPDSConnectionFactory(final ConnectionPoolDataSource cpds, - final String validationQuery, - final int validationQueryTimeoutSeconds, - final boolean rollbackA
[50/50] [abbrv] commons-dbcp git commit: Merge branch 'master' into release.
Merge branch 'master' into release. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/fb23b153 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/fb23b153 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/fb23b153 Branch: refs/heads/release Commit: fb23b1530cfcf68004bf59a6a3e2a68fe79426b1 Parents: f8b2186 8c42fb8 Author: Gary Gregory Authored: Wed Jun 13 11:28:10 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 11:28:10 2018 -0600 -- .gitignore |4 +- CONTRIBUTING.md |2 +- README.md | 14 +- RELEASE-NOTES.txt | 47 +- build.properties.sample | 58 - build.xml | 283 --- dbcp-RC.sh |2 +- dbcp-pre-RC.sh |2 +- dbcp-release.sh |4 +- doc/README.txt |2 +- pom.xml |2 +- src/changes/changes.xml | 47 +- src/changes/release-notes.vm|2 +- .../apache/commons/dbcp2/AbandonedTrace.java| 72 +- .../apache/commons/dbcp2/BasicDataSource.java | 1356 ++--- .../commons/dbcp2/BasicDataSourceFactory.java | 248 +-- .../commons/dbcp2/BasicDataSourceMXBean.java| 40 + .../apache/commons/dbcp2/ConnectionFactory.java |7 +- .../org/apache/commons/dbcp2/Constants.java | 13 +- .../dbcp2/DataSourceConnectionFactory.java | 64 +- .../dbcp2/DelegatingCallableStatement.java | 1069 --- .../commons/dbcp2/DelegatingConnection.java | 525 +++--- .../dbcp2/DelegatingDatabaseMetaData.java | 1595 ++-- .../dbcp2/DelegatingPreparedStatement.java | 499 +++-- .../commons/dbcp2/DelegatingResultSet.java | 1774 +- .../commons/dbcp2/DelegatingStatement.java | 500 +++-- .../commons/dbcp2/DriverConnectionFactory.java | 35 +- .../dbcp2/DriverManagerConnectionFactory.java | 71 +- .../dbcp2/LifetimeExceededException.java|5 +- .../org/apache/commons/dbcp2/ListException.java | 57 + .../apache/commons/dbcp2/ObjectNameWrapper.java |6 +- .../java/org/apache/commons/dbcp2/PStmtKey.java | 562 -- .../dbcp2/PoolableCallableStatement.java| 68 +- .../commons/dbcp2/PoolableConnection.java | 67 +- .../dbcp2/PoolableConnectionFactory.java| 301 +-- .../commons/dbcp2/PoolableConnectionMXBean.java | 17 +- .../dbcp2/PoolablePreparedStatement.java| 53 +- .../apache/commons/dbcp2/PoolingConnection.java | 738 .../apache/commons/dbcp2/PoolingDataSource.java | 122 +- .../org/apache/commons/dbcp2/PoolingDriver.java | 105 +- .../commons/dbcp2/SwallowedExceptionLogger.java | 21 +- .../java/org/apache/commons/dbcp2/Utils.java| 91 +- .../dbcp2/cpdsadapter/ConnectionImpl.java | 219 ++- .../dbcp2/cpdsadapter/DriverAdapterCPDS.java| 481 ++--- .../commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 94 +- .../dbcp2/cpdsadapter/PooledConnectionImpl.java | 642 --- .../datasources/CPDSConnectionFactory.java | 231 +-- .../datasources/InstanceKeyDataSource.java | 715 +++ .../InstanceKeyDataSourceFactory.java | 282 ++- .../datasources/KeyedCPDSConnectionFactory.java | 205 +- .../datasources/PerUserPoolDataSource.java | 1480 --- .../PerUserPoolDataSourceFactory.java | 52 +- .../commons/dbcp2/datasources/PoolKey.java | 54 +- .../datasources/PooledConnectionAndInfo.java| 55 +- .../datasources/PooledConnectionManager.java| 30 +- .../dbcp2/datasources/SharedPoolDataSource.java | 137 +- .../SharedPoolDataSourceFactory.java| 12 +- .../commons/dbcp2/datasources/UserPassKey.java | 108 +- .../dbcp2/managed/BasicManagedDataSource.java | 90 +- .../managed/DataSourceXAConnectionFactory.java | 109 +- .../dbcp2/managed/LocalXAConnectionFactory.java | 134 +- .../dbcp2/managed/ManagedConnection.java| 75 +- .../dbcp2/managed/ManagedDataSource.java| 46 +- .../managed/PoolableManagedConnection.java | 38 +- .../PoolableManagedConnectionFactory.java | 31 +- .../dbcp2/managed/TransactionContext.java | 85 +- .../managed/TransactionContextListener.java |8 +- .../dbcp2/managed/TransactionRegistry.java | 63 +- .../dbcp2/managed/XAConnectionFactory.java | 24 +- .../org/apache/commons/dbcp2/package-info.java | 207 +- src/site/site.xml |1 + src/site/xdoc/configuration.xml | 1012 +- src/site/xdoc/dow
[29/50] [abbrv] commons-dbcp git commit: Simplify implementation without using the catch NPE hack.
Simplify implementation without using the catch NPE hack. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/3df22572 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/3df22572 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/3df22572 Branch: refs/heads/release Commit: 3df225721c22a5eb7b7b74e774ffe5a0705965d6 Parents: 9eb1e02 Author: Gary Gregory Authored: Mon Jun 11 18:21:24 2018 -0600 Committer: Gary Gregory Committed: Mon Jun 11 18:21:24 2018 -0600 -- src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3df22572/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java -- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java index 4272943..2423d19 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java @@ -145,11 +145,7 @@ public class PoolingDriver implements Driver { @Override public boolean acceptsURL(final String url) throws SQLException { -try { -return url.startsWith(URL_PREFIX); -} catch(final NullPointerException e) { -return false; -} +return url == null ? false : url.startsWith(URL_PREFIX); } @Override
commons-dbcp git commit: Merge branch 'master' into release.
Repository: commons-dbcp Updated Branches: refs/heads/release fb23b1530 -> 566085573 Merge branch 'master' into release. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/56608557 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/56608557 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/56608557 Branch: refs/heads/release Commit: 5660855731502d00319f54cd584c95afa487a854 Parents: fb23b15 Author: Gary Gregory Authored: Wed Jun 13 12:06:42 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 12:06:42 2018 -0600 -- pom.xml | 95 +--- 1 file changed, 91 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/56608557/pom.xml -- diff --git a/pom.xml b/pom.xml index fa9a2b7..4387356 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,14 @@ ggreg...@apache.org The Apache Software Foundation + + Ignacio J. Ortega + nacho + + + Sean C. Sullivan + sullis + @@ -148,6 +156,15 @@ Philippe Mouawad + + Glenn L. Nielsen + + + James House + + + James Ring + @@ -215,6 +232,42 @@ + + com.h2database + h2 + 1.4.197 + test + + + org.jboss.narayana.jta + narayana-jta + 5.8.2.Final + test + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.2_spec + 1.0.0.Final + test + + + org.jboss + jboss-transaction-spi + 7.6.0.Final + + + org.jboss.logging + jboss-logging-spi + + + test + + + org.jboss.logging + jboss-logging + 3.1.4.GA + test + @@ -222,12 +275,10 @@ UTF-8 1.7 1.7 - scm:svn:https://dist.apache.org/repos/dist/dev/commons/dbcp/ -true -dbcp2 +dbcp RC1 org.apache.commons.dbcp2 -2.3.0 +2.4.0 for JDBC 4.1 (Java 7.0+) 1.4 for JDBC 4 (Java 6.0) @@ -249,6 +300,12 @@ javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,* true + +2.3.0 +true + scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} +Gary Gregory +86fdc7e2a11262cb @@ -417,4 +474,34 @@ + + + jdk7 + +(,1.7] + + + + +org.apache.maven.plugins +maven-surefire-plugin + + + + org.apache.commons.dbcp2.StackMessageLog + + plain + + +**/Tester*.java + +**/Test*$*.java +**/*Narayana*.java + + + + + + +
[commons-dbcp] Git Push Summary
Repository: commons-dbcp Updated Tags: refs/tags/commons-dbcp-2.4.0-RC1 [created] b5f534fce
[commons-dbcp] Git Push Summary
Repository: commons-dbcp Updated Tags: refs/tags/commons-dbcp-2.4.0-RC1 [deleted] b5f534fce
[commons-dbcp] Git Push Summary
Repository: commons-dbcp Updated Tags: refs/tags/commons-dbcp-2.4.0-RC1 [created] a847119c8
Nexus: Staging Repository Dropped
Message from: https://repository.apache.orgDescription:Drop Apache Commons DBCP 2.4.0-RC1 while debugging our release plugin.Deployer properties:"userAgent" = "Apache-Maven/3.5.3 (Java 1.8.0_172; Windows 10 10.0)""userId" = "ggregory""ip" = "97.122.219.125"Details:The orgapachecommons-1331 staging repository has been dropped.Action performed by Gary D. Gregory (ggregory)
[text] USe ISO 8601 format for dates per Olivier Jaquemet's suggestion.
Repository: commons-text Updated Branches: refs/heads/master 9a38e76f7 -> 32378e15c USe ISO 8601 format for dates per Olivier Jaquemet's suggestion. Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/32378e15 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/32378e15 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/32378e15 Branch: refs/heads/master Commit: 32378e15c63734aa098c62ca57ab252d1db847ec Parents: 9a38e76 Author: Gary Gregory Authored: Wed Jun 13 12:27:51 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 12:27:51 2018 -0600 -- src/site/xdoc/release-history.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-text/blob/32378e15/src/site/xdoc/release-history.xml -- diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml index 886a794..d372a52 100644 --- a/src/site/xdoc/release-history.xml +++ b/src/site/xdoc/release-history.xml @@ -25,24 +25,24 @@ limitations under the License. -VersionRelease dateRequired Java VersionJavadocRelease notes +VersionRelease date (-MM-DD)Required Java VersionJavadocRelease notes - 1.406-12-20188api-1.4release notes for 1.4 + 1.42018-06-128api-1.4release notes for 1.4 - 1.303-16-20187api-1.3release notes for 1.3 + 1.32018-03-167api-1.3release notes for 1.3 - 1.212-12-20177api-1.2release notes for 1.2 + 1.22017-12-127api-1.2release notes for 1.2 - 1.15-23-20177api-1.1release notes for 1.1 + 1.12017-05-237api-1.1release notes for 1.1 - 1.03-11-20177api-1.0release notes for 1.0 + 1.02017-03-117api-1.0release notes for 1.0 - 1.0-beta-12-9-20177api-1.0-beta-1release notes for 1.0-beta-1 + 1.0-beta-12017-02-97api-1.0-beta-1release notes for 1.0-beta-1
[text] USe ISO 8601 format for dates per Olivier Jaquemet's suggestion.
Repository: commons-text Updated Branches: refs/heads/master 32378e15c -> 97b667135 USe ISO 8601 format for dates per Olivier Jaquemet's suggestion. Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/97b66713 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/97b66713 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/97b66713 Branch: refs/heads/master Commit: 97b667135bd5ed9bd5958cf64052631d77cac51b Parents: 32378e1 Author: Gary Gregory Authored: Wed Jun 13 12:29:50 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 12:29:50 2018 -0600 -- src/site/xdoc/release-history.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-text/blob/97b66713/src/site/xdoc/release-history.xml -- diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml index d372a52..0950028 100644 --- a/src/site/xdoc/release-history.xml +++ b/src/site/xdoc/release-history.xml @@ -42,7 +42,7 @@ limitations under the License. 1.02017-03-117api-1.0release notes for 1.0 - 1.0-beta-12017-02-97api-1.0-beta-1release notes for 1.0-beta-1 + 1.0-beta-12017-02-097api-1.0-beta-1release notes for 1.0-beta-1
[text] README.md: Restore description
Repository: commons-text Updated Branches: refs/heads/master 97b667135 -> ee8cef4d6 README.md: Restore description Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/ee8cef4d Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/ee8cef4d Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/ee8cef4d Branch: refs/heads/master Commit: ee8cef4d6fd70937cd47c14687bc0d8ab18fcc04 Parents: 97b6671 Author: Pascal Schumacher Authored: Wed Jun 13 20:29:35 2018 +0200 Committer: Pascal Schumacher Committed: Wed Jun 13 20:32:14 2018 +0200 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-text/blob/ee8cef4d/README.md -- diff --git a/README.md b/README.md index a79be17..28c08e4 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Apache Commons Text [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-text/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-text/) [![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-text/1.4.svg)](https://javadoc.io/doc/org.apache.commons/commons-text/1.4) -${project.description} +Apache Commons Text is a library focused on algorithms working on strings. Documentation -
commons-release-plugin git commit: stop trying to add target/site to staging commit
Repository: commons-release-plugin Updated Branches: refs/heads/master 2721e7c22 -> 814c5eab3 stop trying to add target/site to staging commit Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/814c5eab Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/814c5eab Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/814c5eab Branch: refs/heads/master Commit: 814c5eab3f746b40b44c430e2585ea9e98e67adb Parents: 2721e7c Author: Rob Tompkins Authored: Wed Jun 13 14:51:37 2018 -0400 Committer: Rob Tompkins Committed: Wed Jun 13 14:51:37 2018 -0400 -- .../release/plugin/mojos/CommonsDistributionStagingMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/814c5eab/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java -- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java index e86f56d..2c7bf28 100755 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java @@ -326,7 +326,8 @@ public class CommonsDistributionStagingMojo extends AbstractMojo { } catch (IOException e) { throw new MojoExecutionException("Site copying failed", e); } -return new ArrayList<>(FileUtils.listFiles(siteDirectory, null, true)); +File copiedSiteDirectory = new File(distVersionRcVersionDirectory, "site"); +return new ArrayList<>(FileUtils.listFiles(copiedSiteDirectory, null, true)); } /**
svn commit: r27435 - in /dev/commons/dbcp: ./ 2.4.0-RC1/ 2.4.0-RC1/binaries/ 2.4.0-RC1/site/ 2.4.0-RC1/site/apidocs/ 2.4.0-RC1/site/apidocs/org/ 2.4.0-RC1/site/apidocs/org/apache/ 2.4.0-RC1/site/apido
Author: ggregory Date: Wed Jun 13 19:18:48 2018 New Revision: 27435 Log: Apache Commons DBCP 2.4.0-RC1. [This commit notification would consist of 163 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
Nexus: Staging Repository Dropped
Message from: https://repository.apache.orgDescription:Drop Apache Commons DBCP 2.4.0-RC1.Deployer properties:"userAgent" = "Apache-Maven/3.5.3 (Java 1.8.0_172; Windows 10 10.0)""userId" = "ggregory""ip" = "97.122.219.125"Details:The orgapachecommons-1332 staging repository has been dropped.Action performed by Gary D. Gregory (ggregory)
svn commit: r27436 - in /dev/commons/dbcp: 2.4.0-RC1/ site.zip
Author: ggregory Date: Wed Jun 13 19:25:43 2018 New Revision: 27436 Log: Drop Apache Commons DBCP 2.4.0-RC1. Removed: dev/commons/dbcp/2.4.0-RC1/ dev/commons/dbcp/site.zip
commons-dbcp git commit: Prepare for release 2.4.0.
Repository: commons-dbcp Updated Branches: refs/heads/release 566085573 -> d7aa662fb Prepare for release 2.4.0. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/d7aa662f Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/d7aa662f Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/d7aa662f Branch: refs/heads/release Commit: d7aa662fbbb99e536ae28c47d0c4e1d51e39d5b9 Parents: 5660855 Author: Gary Gregory Authored: Wed Jun 13 13:26:05 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 13:26:05 2018 -0600 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/d7aa662f/pom.xml -- diff --git a/pom.xml b/pom.xml index 4387356..466 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 commons-dbcp2 - 2.4.0-SNAPSHOT + 2.4.0 Apache Commons DBCP 2001
[commons-dbcp] Git Push Summary
Repository: commons-dbcp Updated Tags: refs/tags/commons-dbcp-2.4.0-RC1 [deleted] a847119c8
[commons-dbcp] Git Push Summary
Repository: commons-dbcp Updated Tags: refs/tags/commons-dbcp-2.4.0-RC1 [created] 673048f6c
commons-release-plugin git commit: Parameterize README HTML file.
Repository: commons-release-plugin Updated Branches: refs/heads/master 814c5eab3 -> fac2d0a71 Parameterize README HTML file. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/fac2d0a7 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/fac2d0a7 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/fac2d0a7 Branch: refs/heads/master Commit: fac2d0a71c8e7713c6a7ccd066a2a1276ab43f1b Parents: 814c5ea Author: Gary Gregory Authored: Wed Jun 13 13:31:42 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 13:31:42 2018 -0600 -- .../resources/org/apache/commons/release/plugin/velocity/README.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/fac2d0a7/src/main/resources/org/apache/commons/release/plugin/velocity/README.vm -- diff --git a/src/main/resources/org/apache/commons/release/plugin/velocity/README.vm b/src/main/resources/org/apache/commons/release/plugin/velocity/README.vm index 1c3f364..541c279 100755 --- a/src/main/resources/org/apache/commons/release/plugin/velocity/README.vm +++ b/src/main/resources/org/apache/commons/release/plugin/velocity/README.vm @@ -16,7 +16,7 @@ --> ${artifactIdWithFirstLetterscapitalized} v${version}. -This is the 1.3 version of commons-text. It is available in both binary and source distributions. +This is the ${version} version of ${artifactId}. It is available in both binary and source distributions. Note:
svn commit: r27437 - in /dev/commons/dbcp: ./ 2.4.0-RC1/ 2.4.0-RC1/binaries/ 2.4.0-RC1/site/ 2.4.0-RC1/site/apidocs/ 2.4.0-RC1/site/apidocs/org/ 2.4.0-RC1/site/apidocs/org/apache/ 2.4.0-RC1/site/apido
Author: ggregory Date: Wed Jun 13 19:44:59 2018 New Revision: 27437 Log: Apache Commons DBCP 2.4.0-RC1. [This commit notification would consist of 163 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r27440 - in /release/commons/bsf: binaries/ source/
Author: ggregory Date: Wed Jun 13 19:55:29 2018 New Revision: 27440 Log: Renamed .sha files to .sha1. Added: release/commons/bsf/binaries/bsf-3.1-bin.tar.gz.sha1 release/commons/bsf/binaries/bsf-3.1-bin.zip.sha1 release/commons/bsf/source/bsf-3.1-src.tar.gz.sha1 release/commons/bsf/source/bsf-3.1-src.zip.sha1 Removed: release/commons/bsf/binaries/bsf-3.1-bin.tar.gz.sha release/commons/bsf/binaries/bsf-3.1-bin.zip.sha release/commons/bsf/source/bsf-3.1-src.tar.gz.sha release/commons/bsf/source/bsf-3.1-src.zip.sha Added: release/commons/bsf/binaries/bsf-3.1-bin.tar.gz.sha1 == --- release/commons/bsf/binaries/bsf-3.1-bin.tar.gz.sha1 (added) +++ release/commons/bsf/binaries/bsf-3.1-bin.tar.gz.sha1 Wed Jun 13 19:55:29 2018 @@ -0,0 +1 @@ +329e81e6e7e47d28961966beb4c1ee563cbeb62c *bsf-3.1-bin.tar.gz \ No newline at end of file Added: release/commons/bsf/binaries/bsf-3.1-bin.zip.sha1 == --- release/commons/bsf/binaries/bsf-3.1-bin.zip.sha1 (added) +++ release/commons/bsf/binaries/bsf-3.1-bin.zip.sha1 Wed Jun 13 19:55:29 2018 @@ -0,0 +1 @@ +83784dc237979fa7462352389d49da89528c70f3 *bsf-3.1-bin.zip \ No newline at end of file Added: release/commons/bsf/source/bsf-3.1-src.tar.gz.sha1 == --- release/commons/bsf/source/bsf-3.1-src.tar.gz.sha1 (added) +++ release/commons/bsf/source/bsf-3.1-src.tar.gz.sha1 Wed Jun 13 19:55:29 2018 @@ -0,0 +1 @@ +65863b2de2f9f605bb693ea1a3ea06add4f92200 *bsf-3.1-src.tar.gz \ No newline at end of file Added: release/commons/bsf/source/bsf-3.1-src.zip.sha1 == --- release/commons/bsf/source/bsf-3.1-src.zip.sha1 (added) +++ release/commons/bsf/source/bsf-3.1-src.zip.sha1 Wed Jun 13 19:55:29 2018 @@ -0,0 +1 @@ +138708157e194e2b73ec059ede2c82ad7f39ba08 *bsf-3.1-src.zip \ No newline at end of file
commons-release-plugin git commit: Require Java 8.
Repository: commons-release-plugin Updated Branches: refs/heads/master fac2d0a71 -> 8dbfc1155 Require Java 8. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/8dbfc115 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/8dbfc115 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/8dbfc115 Branch: refs/heads/master Commit: 8dbfc1155f78abdd191d17cba85173829cd0c550 Parents: fac2d0a Author: Gary Gregory Authored: Wed Jun 13 15:34:27 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 15:34:27 2018 -0600 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/8dbfc115/pom.xml -- diff --git a/pom.xml b/pom.xml index 2cb4d73..6c5c7f2 100755 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,8 @@ false -1.7 -1.7 +1.8 +1.8 3.5.3 commons-release-plugin COMMONSSITE
commons-release-plugin git commit: Require Java 8.
Repository: commons-release-plugin Updated Branches: refs/heads/master 8dbfc1155 -> 8de6999c8 Require Java 8. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/8de6999c Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/8de6999c Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/8de6999c Branch: refs/heads/master Commit: 8de6999c87e02a7514469265358ba3b022bed479 Parents: 8dbfc11 Author: Gary Gregory Authored: Wed Jun 13 15:34:59 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 15:34:59 2018 -0600 -- .travis.yml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/8de6999c/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 8db0db2..f34346b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ language: java sudo: false jdk: - - openjdk7 - oraclejdk8 script:
commons-build-plugin git commit: Require Java 8.
Repository: commons-build-plugin Updated Branches: refs/heads/master 9d7553c5f -> 610136c63 Require Java 8. Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/610136c6 Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/610136c6 Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/610136c6 Branch: refs/heads/master Commit: 610136c63a216a266a7af23e499dc92e9ab0830b Parents: 9d7553c Author: Gary Gregory Authored: Wed Jun 13 15:35:30 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 15:35:30 2018 -0600 -- .travis.yml | 1 - pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/610136c6/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index f60f4bc..419667d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,4 @@ language: java sudo: false jdk: - - openjdk7 - oraclejdk8 http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/610136c6/pom.xml -- diff --git a/pom.xml b/pom.xml index 4833d5d..ca77fed 100644 --- a/pom.xml +++ b/pom.xml @@ -195,8 +195,8 @@ true - - +1.8 +1.8 commons-build-plugin COMMONSSITE
commons-build-plugin git commit: Require Java 8.
Repository: commons-build-plugin Updated Branches: refs/heads/master 610136c63 -> e48c2142a Require Java 8. Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/e48c2142 Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/e48c2142 Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/e48c2142 Branch: refs/heads/master Commit: e48c2142a63067b5efb57c2a9e5ceb6c69737970 Parents: 610136c Author: Gary Gregory Authored: Wed Jun 13 15:36:25 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 15:36:25 2018 -0600 -- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e48c2142/src/changes/changes.xml -- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 61119db..3b89678 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -41,6 +41,9 @@ Change the Maven goal prefix from "commons" to "commons-build". + +Update platform requirement from Java 7 to Java 8. +
commons-build-plugin git commit: Require Java 8.
Repository: commons-build-plugin Updated Branches: refs/heads/master e48c2142a -> cfa875b80 Require Java 8. Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/cfa875b8 Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/cfa875b8 Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/cfa875b8 Branch: refs/heads/master Commit: cfa875b80a0631678cb7df2612420873f7fec269 Parents: e48c214 Author: Gary Gregory Authored: Wed Jun 13 15:37:03 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 15:37:03 2018 -0600 -- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/cfa875b8/RELEASE-NOTES.txt -- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 2f47eab..37f885e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -19,6 +19,7 @@ Changes since the last release: 3. Fix README.md generation typo: 'JavaDoc' -> 'Javadoc'. 4. Change the Maven goal prefix from "commons" to "commons-build". 5. Add a goal for generating the NOTICE.txt file. +6. Update platform requirement from Java 7 to Java 8. VERSION 1.8 - 2018-04-02
commons-release-plugin git commit: Parameterize README HTML file.
Repository: commons-release-plugin Updated Branches: refs/heads/master 8de6999c8 -> ab5c0caef Parameterize README HTML file. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/ab5c0cae Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/ab5c0cae Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/ab5c0cae Branch: refs/heads/master Commit: ab5c0caef2114008df80b012d97d6426a42bcac9 Parents: 8de6999 Author: Gary Gregory Authored: Wed Jun 13 15:38:08 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 15:38:08 2018 -0600 -- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/ab5c0cae/src/changes/changes.xml -- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ce5c69d..7faaeb5 100755 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -28,6 +28,7 @@ Put unpacked site in scm dev dist directory for navigating purposes. Adding README.html and HEADER.html to staged release + Update platform requirement from Java 7 to Java 8.
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close Apache Commons DBCP 2.4.0-RC1.Deployer properties:"userAgent" = "Apache-Maven/3.5.3 (Java 1.8.0_172; Windows 10 10.0)""userId" = "ggregory""ip" = "97.122.219.125"Details:The following artifacts have been staged/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-test-sources.jar(SHA1: a8cb680bd20e46b548413ab4f3159a1b6af370fc)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-javadoc.jar.asc(SHA1: a2fbc96c6b8553b13b4f2ed653d9aa5717e89842)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0.pom(SHA1: c73a1f93433feba1cd4fc8d3994b4e830ee0c7cd)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-sources.jar(SHA1: f3a963f855209e9b4a18ea642a3a01adb95d8946)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0.jar.asc(SHA1: 3352f1b1ab04452445709d19272449bc5238d735)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-test-sources.jar.asc(SHA1: e073bc4700757d6b6d66a84989ba9f72b85fa2d4)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0.pom.asc(SHA1: df3fbc3dc6460cba003b16f8eba13ed3ffd8beef)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0.jar(SHA1: d8ebe77dea8e3b76218874b5e56957727a3fbab7)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-javadoc.jar(SHA1: 46cfd110cc0002c5f37bc6965e0149ec208ef458)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-sources.jar.asc(SHA1: b3a3467cf022728806eb2db63ca0c1fa76f9a5f4)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-tests.jar.asc(SHA1: 51051e26c5eb6c76e4dbf9523e9c9f22be548343)/org/apache/commons/commons-dbcp2/2.4.0/commons-dbcp2-2.4.0-tests.jar(SHA1: 8546d77cf33dbe35145fbcbd4890f29a673b6e97)Action performed by Gary D. Gregory (ggregory)
commons-release-plugin git commit: Remove unused local var.
Repository: commons-release-plugin Updated Branches: refs/heads/master ab5c0caef -> bd02fb6b9 Remove unused local var. Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/bd02fb6b Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/bd02fb6b Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/bd02fb6b Branch: refs/heads/master Commit: bd02fb6b923c054726f801cf9bfa0507e6c2f369 Parents: ab5c0ca Author: Gary Gregory Authored: Wed Jun 13 16:37:56 2018 -0600 Committer: Gary Gregory Committed: Wed Jun 13 16:37:56 2018 -0600 -- .../release/plugin/mojos/CommonsDistributionStagingMojo.java| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/bd02fb6b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java -- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java index 2c7bf28..02f1e89 100755 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java @@ -241,7 +241,6 @@ public class CommonsDistributionStagingMojo extends AbstractMojo { *can properly handle the exception. */ private File copyReleaseNotesToWorkingDirectory() throws MojoExecutionException { -StringBuffer copiedReleaseNotesAbsolutePath; SharedFunctions.initDirectory(getLog(), distVersionRcVersionDirectory); getLog().info("Copying RELEASE-NOTES.txt to working directory."); File copiedReleaseNotes = new File(distVersionRcVersionDirectory, releaseNotesFile.getName());