commons-dbcp.git
2 years agoUpdate POM version numbers for Apache Commons DBCP release 2.7.0 commons-dbcp-2.7.0 commons-dbcp-2.7.0-RC1
Gary Gregory [Wed, 31 Jul 2019 12:46:24 +0000 (08:46 -0400)] 
Update POM version numbers for Apache Commons DBCP release 2.7.0

2 years agoMerge branch 'master' into release
Gary Gregory [Wed, 31 Jul 2019 12:45:25 +0000 (08:45 -0400)] 
Merge branch 'master' into release

2 years agoPreparing for RC.
Gary Gregory [Wed, 31 Jul 2019 12:42:25 +0000 (08:42 -0400)] 
Preparing for RC.

2 years agoPrepare for the next release.
Gary Gregory [Wed, 31 Jul 2019 11:51:14 +0000 (07:51 -0400)] 
Prepare for the next release.

2 years agoExtract commons code into new private methods and sort methods.
Gary Gregory [Wed, 31 Jul 2019 01:25:31 +0000 (21:25 -0400)] 
Extract commons code into new private methods and sort methods.
Remove trailing whitespace.
Javadoc.

2 years agoFormat nit.
Gary Gregory [Wed, 31 Jul 2019 01:12:18 +0000 (21:12 -0400)] 
Format nit.

2 years ago[DBCP-554]
Gary Gregory [Wed, 31 Jul 2019 01:12:03 +0000 (21:12 -0400)] 
[DBCP-554]
org.apache.commons.dbcp2.PoolableCallableStatement.passivate() should
close ALL of its resources even when an exception occurs.

2 years ago[DBCP-553]
Gary Gregory [Tue, 30 Jul 2019 23:28:18 +0000 (19:28 -0400)] 
[DBCP-553]
org.apache.commons.dbcp2.PoolablePreparedStatement.passivate() should
close ALL of its resources even when an exception occurs.

2 years ago[DBCP-552] org.apache.commons.dbcp2.DelegatingConnection.passivate()
Gary Gregory [Tue, 30 Jul 2019 22:24:08 +0000 (18:24 -0400)] 
[DBCP-552] org.apache.commons.dbcp2.DelegatingConnection.passivate()
should close ALL of its resources even when an exception occurs.

Also remove trailing whitespace.

2 years agoOracle JDK 8 is no longer available, only 9 through 14.
Gary Gregory [Tue, 30 Jul 2019 22:05:39 +0000 (18:05 -0400)] 
Oracle JDK 8 is no longer available, only 9 through 14.

2 years agoSort methods.
Gary Gregory [Tue, 30 Jul 2019 22:00:52 +0000 (18:00 -0400)] 
Sort methods.

2 years ago[DBCP-551] org.apache.commons.dbcp2.DelegatingStatement.close() should
Gary Gregory [Tue, 30 Jul 2019 21:42:32 +0000 (17:42 -0400)] 
[DBCP-551] org.apache.commons.dbcp2.DelegatingStatement.close() should
try to close ALL of its result sets.

2 years agoPrepare for the next release.
Gary Gregory [Tue, 30 Jul 2019 20:11:49 +0000 (16:11 -0400)] 
Prepare for the next release.

2 years agoJavadoc and minor bullet-proofing.
Gary Gregory [Tue, 30 Jul 2019 20:09:23 +0000 (16:09 -0400)] 
Javadoc and minor bullet-proofing.

2 years agoUpdate tests from org.mockito:mockito-core 2.28.2 to 3.0.0.
Gary Gregory [Tue, 30 Jul 2019 20:01:54 +0000 (16:01 -0400)] 
Update tests from org.mockito:mockito-core 2.28.2 to 3.0.0.

2 years agoJavadoc.
Gary Gregory [Tue, 30 Jul 2019 20:01:05 +0000 (16:01 -0400)] 
Javadoc.

2 years agoJavadoc.
Gary Gregory [Tue, 30 Jul 2019 19:59:51 +0000 (15:59 -0400)] 
Javadoc.

2 years agoNo need for null check.
Gary Gregory [Tue, 30 Jul 2019 19:21:20 +0000 (15:21 -0400)] 
No need for null check.

2 years ago[DBCP-550] java.util.IllegalFormatException while building a message for
Gary Gregory [Tue, 30 Jul 2019 19:14:16 +0000 (15:14 -0400)] 
[DBCP-550] java.util.IllegalFormatException while building a message for
a SQLFeatureNotSupportedException in
Jdbc41Bridge.getObject(ResultSet,String,Class)

2 years ago[DBCP-549] Make
Gary Gregory [Tue, 30 Jul 2019 19:10:14 +0000 (15:10 -0400)] 
[DBCP-549] Make
org.apache.commons.dbcp2.AbandonedTrace.removeTrace(AbandonedTrace)
null-safe.

2 years agoCatch up with recent commits.
Gary Gregory [Tue, 30 Jul 2019 19:09:16 +0000 (15:09 -0400)] 
Catch up with recent commits.

2 years agoSplit out factory code out of BasicDataSource in small factory classes.
Gary Gregory [Tue, 30 Jul 2019 18:24:45 +0000 (14:24 -0400)] 
Split out factory code out of BasicDataSource in small factory classes.
This helps reduce the size and complexity of BasicDataSource and fixes a
Checkstyle violation for the class being too big.

2 years agoPrepare for the next release.
Gary Gregory [Tue, 30 Jul 2019 17:49:00 +0000 (13:49 -0400)] 
Prepare for the next release.

2 years agoAdd @SuppressWarnings.
Gary Gregory [Tue, 30 Jul 2019 14:27:59 +0000 (10:27 -0400)] 
Add @SuppressWarnings.

2 years agoAdd @SuppressWarnings.
Gary Gregory [Tue, 30 Jul 2019 14:25:36 +0000 (10:25 -0400)] 
Add @SuppressWarnings.

2 years agoJavadoc.
Gary Gregory [Tue, 30 Jul 2019 14:25:04 +0000 (10:25 -0400)] 
Javadoc.

2 years ago[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource
Gary Gregory [Tue, 30 Jul 2019 14:24:51 +0000 (10:24 -0400)] 
[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource
to a factory method _in_ DriverConnectionFactory. This moves the factory
code closer to home and fixes a checkstyle violation that had
BasicDataSource over 2,500 lines of source code.

2 years agoJavadoc.
Gary Gregory [Tue, 30 Jul 2019 14:24:08 +0000 (10:24 -0400)] 
Javadoc.

2 years agoUpdate plugins and start preparing for the next release.
Gary Gregory [Tue, 30 Jul 2019 14:23:54 +0000 (10:23 -0400)] 
Update plugins and start preparing for the next release.

2 years agoFix site link.
Gary Gregory [Tue, 30 Jul 2019 13:57:24 +0000 (09:57 -0400)] 
Fix site link.

2 years agoAdd license header for Apache RAT check.
Gary Gregory [Tue, 30 Jul 2019 13:57:05 +0000 (09:57 -0400)] 
Add license header for Apache RAT check.

2 years agoBetter lvar names.
Gary Gregory [Tue, 30 Jul 2019 13:56:48 +0000 (09:56 -0400)] 
Better lvar names.

2 years agoJavadoc.
Gary Gregory [Tue, 30 Jul 2019 13:56:27 +0000 (09:56 -0400)] 
Javadoc.

2 years ago[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource
Gary Gregory [Tue, 30 Jul 2019 13:56:01 +0000 (09:56 -0400)] 
[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource
to a factory method _in_ DriverConnectionFactory. This moves the factory
code closer to home and fixes a checkstyle violation that had
BasicDataSource over 2,500 lines of source code.

2 years agoRevert "Fix the site's source repository link."
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Fix the site's source repository link."

This reverts commit aa3c5e9d9a7da5ba6b201d8ff26912053aac38d1.

2 years agoRevert "Add slot for next release."
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Add slot for next release."

This reverts commit 64e2d9e5ebb164558b86c80ceed3e1d45e52cf86.

2 years agoRevert "Fix typo."
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Fix typo."

This reverts commit 128c7457bb8eb2b1a0171d939dc8a8ba09d76d9c.

2 years agoRevert "Update tests from com.h2database:h2 1.4.197 to 1.4.199."
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Update tests from com.h2database:h2 1.4.197 to 1.4.199."

This reverts commit 2d952351fea2c2831fd254f0d4cf3811732b8c63.

2 years agoRevert "Update tests from org.jboss.narayana.jta:narayana-jta 5.9.2.Final to 5.9...
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Update tests from org.jboss.narayana.jta:narayana-jta 5.9.2.Final to 5.9.5.Final."

This reverts commit 05263e2b8b87279ed5259a264577534cf97811f3.

2 years agoRevert "Update tests from org.jboss.logging:jboss-logging 3.3.2.Final to 3.4.0.Final."
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Update tests from org.jboss.logging:jboss-logging 3.3.2.Final to 3.4.0.Final."

This reverts commit d1c5839750223df95caaf541b184bc1c080b7676.

2 years agoRevert "Update tests from org.mockito:mockito-core 2.24.0 to 2.28.2."
Gary Gregory [Tue, 30 Jul 2019 13:41:55 +0000 (09:41 -0400)] 
Revert "Update tests from org.mockito:mockito-core 2.24.0 to 2.28.2."

This reverts commit 8af2f87305e38f41a2f2ba60483e754455c4c9a7.

2 years agoRevert "Update tests from org.mockito:mockito-core 2.28.2 to 3.0.0."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "Update tests from org.mockito:mockito-core 2.28.2 to 3.0.0."

This reverts commit 528579520d0db6d7ad767b1e02f969fa5aca8556.

2 years agoRevert "maven-pmd-plugin 3.11.0 -> 3.12.0."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "maven-pmd-plugin 3.11.0 -> 3.12.0."

This reverts commit 1fcd2b82c791d001168465c779dbaf0a955f8beb.

2 years agoRevert "[DBCP-548] Update Apache Commons Pool from 2.6.1 to 2.7.0."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "[DBCP-548] Update Apache Commons Pool from 2.6.1 to 2.7.0."

This reverts commit f5d63237102dfc5bdbf059e6ad308215d4e8c1dc.

2 years agoRevert "Update commons-parent from 47 to 48."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "Update commons-parent from 47 to 48."

This reverts commit 6619cde1a8047c5366c865e67f6579fe580e4926.

2 years agoRevert "Remove obsolete comment."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "Remove obsolete comment."

This reverts commit 91c30237317a31cfc56224ce63e34636add62c0c.

2 years agoRevert "Javadoc."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "Javadoc."

This reverts commit d603fc52f548b5e50985b0c6c09e1357bef8aafa.

2 years agoRevert "Add @SuppressWarnings."
Gary Gregory [Tue, 30 Jul 2019 13:41:54 +0000 (09:41 -0400)] 
Revert "Add @SuppressWarnings."

This reverts commit f6c1c4be33054ec634edf10f16bec71b6f85e3cd.

2 years agoRevert "Add @SuppressWarnings."
Gary Gregory [Tue, 30 Jul 2019 13:41:53 +0000 (09:41 -0400)] 
Revert "Add @SuppressWarnings."

This reverts commit dabd348acf5e9ea732d2e1395a22aa27ef23b048.

2 years agoRevert "Sort members."
Gary Gregory [Tue, 30 Jul 2019 13:41:53 +0000 (09:41 -0400)] 
Revert "Sort members."

This reverts commit e6893e4580338bc657da41b66efe4be41275de69.

2 years agoRevert "[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource to...
Gary Gregory [Tue, 30 Jul 2019 13:41:53 +0000 (09:41 -0400)] 
Revert "[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource to a factory method _in_ DriverConnectionFactory. This moves the factory code closer to home and fixes a checkstyle violation that had BasicDataSource over 2,500 lines of source code."

This reverts commit 5b43bc7347ba68a4d5831060b8198266470c38ee.

2 years agoRevert "Use current version of JaCoCo."
Gary Gregory [Tue, 30 Jul 2019 13:41:53 +0000 (09:41 -0400)] 
Revert "Use current version of JaCoCo."

This reverts commit c419630e2342f6acc2109fb0773c55f1a96d9f67.

2 years agoRevert "[DBCP-549] Make org.apache.commons.dbcp2.AbandonedTrace.removeTrace(Abandoned...
Gary Gregory [Mon, 29 Jul 2019 23:16:21 +0000 (19:16 -0400)] 
Revert "[DBCP-549] Make org.apache.commons.dbcp2.AbandonedTrace.removeTrace(AbandonedTrace) null-safe."

This reverts commit 6caf93beaf7e4207ef72c9ca17be75a1244d3470.

2 years ago[DBCP-549] Make
Gary Gregory [Mon, 29 Jul 2019 23:01:07 +0000 (19:01 -0400)] 
[DBCP-549] Make
org.apache.commons.dbcp2.AbandonedTrace.removeTrace(AbandonedTrace)
null-safe.

- Also refactor pattern into new protected method
org.apache.commons.dbcp2.AbandonedTrace.removeTrace(Object,
AbandonedTrace).
- Remove trailing white spaces on all lines
- Use final.

2 years agoUse current version of JaCoCo.
Gary Gregory [Mon, 29 Jul 2019 14:30:31 +0000 (10:30 -0400)] 
Use current version of JaCoCo.

- Also fix BC version.
- Reinstate log(String) as a protected method for BC.
- Better lvar names.
- Javadoc "jdni" -> "JNDI".
- Javadoc "api" -> "API".

2 years ago[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource
Gary Gregory [Mon, 29 Jul 2019 13:58:25 +0000 (09:58 -0400)] 
[Checkstyle] Move DriverConnectionFactory creation from BasicDataSource
to a factory method _in_ DriverConnectionFactory. This moves the factory
code closer to home and fixes a checkstyle violation that had
BasicDataSource over 2,500 lines of source code.

2 years agoSort members.
Gary Gregory [Mon, 29 Jul 2019 13:42:14 +0000 (09:42 -0400)] 
Sort members.

2 years agoAdd @SuppressWarnings.
Gary Gregory [Mon, 29 Jul 2019 13:35:38 +0000 (09:35 -0400)] 
Add @SuppressWarnings.

2 years agoAdd @SuppressWarnings.
Gary Gregory [Mon, 29 Jul 2019 13:35:04 +0000 (09:35 -0400)] 
Add @SuppressWarnings.

2 years agoJavadoc.
Gary Gregory [Mon, 29 Jul 2019 13:34:20 +0000 (09:34 -0400)] 
Javadoc.

2 years agoRemove obsolete comment.
Gary Gregory [Mon, 29 Jul 2019 13:10:29 +0000 (09:10 -0400)] 
Remove obsolete comment.

2 years agoUpdate commons-parent from 47 to 48.
Gary Gregory [Mon, 29 Jul 2019 12:55:33 +0000 (08:55 -0400)] 
Update commons-parent from 47 to 48.

2 years ago[DBCP-548] Update Apache Commons Pool from 2.6.1 to 2.7.0.
Gary Gregory [Mon, 29 Jul 2019 12:14:08 +0000 (08:14 -0400)] 
[DBCP-548] Update Apache Commons Pool from 2.6.1 to 2.7.0.

- Also bump DBCP's version to the next minor release since our main
underlying component, commons-pool2, is a minor release update.
- Use the current version of JApiCmp.

2 years agomaven-pmd-plugin 3.11.0 -> 3.12.0.
Gary Gregory [Thu, 25 Jul 2019 20:45:34 +0000 (16:45 -0400)] 
maven-pmd-plugin 3.11.0 -> 3.12.0.

2 years agoUpdate tests from org.mockito:mockito-core 2.28.2 to 3.0.0.
Gary Gregory [Thu, 25 Jul 2019 20:22:39 +0000 (16:22 -0400)] 
Update tests from org.mockito:mockito-core 2.28.2 to 3.0.0.

2 years agoUpdate tests from org.mockito:mockito-core 2.24.0 to 2.28.2.
Gary Gregory [Thu, 25 Jul 2019 20:19:57 +0000 (16:19 -0400)] 
Update tests from org.mockito:mockito-core 2.24.0 to 2.28.2.

2 years agoUpdate tests from org.jboss.logging:jboss-logging 3.3.2.Final to
Gary Gregory [Thu, 25 Jul 2019 20:16:20 +0000 (16:16 -0400)] 
Update tests from org.jboss.logging:jboss-logging 3.3.2.Final to
3.4.0.Final.

2 years agoUpdate tests from org.jboss.narayana.jta:narayana-jta 5.9.2.Final to
Gary Gregory [Thu, 25 Jul 2019 20:11:36 +0000 (16:11 -0400)] 
Update tests from org.jboss.narayana.jta:narayana-jta 5.9.2.Final to
5.9.5.Final.

2 years agoUpdate tests from com.h2database:h2 1.4.197 to 1.4.199.
Gary Gregory [Thu, 25 Jul 2019 20:07:56 +0000 (16:07 -0400)] 
Update tests from com.h2database:h2 1.4.197 to 1.4.199.

2 years agoFix typo.
Gary Gregory [Thu, 25 Jul 2019 20:04:29 +0000 (16:04 -0400)] 
Fix typo.

2 years agoAdd slot for next release.
Gary Gregory [Tue, 23 Jul 2019 12:45:51 +0000 (08:45 -0400)] 
Add slot for next release.

2 years agoFix the site's source repository link.
Gary Gregory [Sun, 21 Jul 2019 20:51:08 +0000 (16:51 -0400)] 
Fix the site's source repository link.

2 years agoFix the site's source repository link.
Gary Gregory [Sun, 21 Jul 2019 00:44:39 +0000 (20:44 -0400)] 
Fix the site's source repository link.

2 years agoReformat using updated standard Eclipse format
Mark Thomas [Thu, 11 Jul 2019 09:08:19 +0000 (10:08 +0100)] 
Reformat using updated standard Eclipse format

This is noiser than necessary because I accidentally included some
format changes I was experimenting with in the previous commit that
addressed line endings.

2 years agoConvert files using Windows line endings to unix line endings
Mark Thomas [Thu, 11 Jul 2019 08:51:09 +0000 (09:51 +0100)] 
Convert files using Windows line endings to unix line endings

The significant majority of the files in the repo use unix line-endings.
Mixed line endings cause large diffs when line endings change making the
true change harder to see. Therefore, switch all the files to a single
line ending - unix.
Common / recommended practice is to use unix line endings in the repo
and use native line endings locally.

2 years agoAdd my Eclipse formatting rules per Mark Thomas' suggestion. Contents
Gary Gregory [Wed, 10 Jul 2019 21:46:33 +0000 (17:46 -0400)] 
Add my Eclipse formatting rules per Mark Thomas' suggestion. Contents
likely to be adjusted.

2 years ago[DBCP-529] Add 'jmxName' property to web configuration parameters
Gary Gregory [Mon, 8 Jul 2019 15:27:20 +0000 (11:27 -0400)] 
[DBCP-529] Add 'jmxName' property to web configuration parameters
listing.

2 years agoDBCP-529 - Add 'jmxName' property to web... (#23)
yuri [Mon, 8 Jul 2019 15:25:55 +0000 (17:25 +0200)] 
DBCP-529 - Add 'jmxName' property to web... (#23)

...Configuration Parameters listing

Added a very basic description of the property.

2 years agoFix Javadoc link in README.md #21.
Gary Gregory [Mon, 8 Jul 2019 15:24:02 +0000 (11:24 -0400)] 
Fix Javadoc link in README.md #21.

- Thanks to LichKing-lee.
- Closes #21.

2 years ago[DBCP-547] Add a ConnectionFactory class name setting for
Gary Gregory [Mon, 8 Jul 2019 15:13:58 +0000 (11:13 -0400)] 
[DBCP-547] Add a ConnectionFactory class name setting for
BasicDataSource.createConnectionFactory() #33.

- Update version from 2.6.1-SNAPSHOT to 2.7.0 since this commits adds
new public APIs in BasicDataSource.
- Provide an alternative implementation from the PR
https://github.com/apache/commons-dbcp/pull/33 WRT to String value
handling. The handling of empty string for the new APIs is made
consistent with other String APIs instead of what is done in PR 33.
- Formatted new class TesterConnectionFactory differently from the PR
and sorted its methods.
- Closes #33.

2 years agoReplace Apache HTTP URL with HTTPS version.
Gary Gregory [Sun, 7 Jul 2019 14:31:49 +0000 (10:31 -0400)] 
Replace Apache HTTP URL with HTTPS version.

2 years agoUse HTTPS to access Apache resources.
Gary Gregory [Sun, 7 Jul 2019 00:42:39 +0000 (20:42 -0400)] 
Use HTTPS to access Apache resources.

2 years agoUse HTTPS links to Apache.
Gary Gregory [Thu, 4 Jul 2019 14:14:23 +0000 (10:14 -0400)] 
Use HTTPS links to Apache.

3 years agoName "Apache Commons" in page title.
Gary Gregory [Thu, 6 Jun 2019 14:09:09 +0000 (10:09 -0400)] 
Name "Apache Commons" in page title.

3 years ago[DBCP-546] Avoid NPE when calling DriverAdapterCPDS.toString().
Gary Gregory [Thu, 9 May 2019 00:35:28 +0000 (20:35 -0400)] 
[DBCP-546] Avoid NPE when calling DriverAdapterCPDS.toString().

3 years agoAvoid NPE when calling DriverAdapterCPDS.toString() (#31)
Sergey Chupov [Thu, 9 May 2019 00:32:55 +0000 (03:32 +0300)] 
Avoid NPE when calling DriverAdapterCPDS.toString() (#31)

* Add test for DriverAdapterCPDS.toString()

It currently fails when connectionProperties are null

* Do not access connectionProperties when it's null

3 years agoUse form that ensures checked exceptions are caught.
Mark Thomas [Fri, 3 May 2019 16:49:03 +0000 (17:49 +0100)] 
Use form that ensures checked exceptions are caught.

3 years agoClean-up.
Mark Thomas [Fri, 3 May 2019 16:47:28 +0000 (17:47 +0100)] 
Clean-up.

Remove tailing whitespace.
Imports in alphabetical order

3 years agoUpdate maven-pmd-plugin from 3.11.0 to 3.12.0.
Gary Gregory [Wed, 24 Apr 2019 16:51:36 +0000 (12:51 -0400)] 
Update maven-pmd-plugin from 3.11.0 to 3.12.0.

3 years agoNext version should be 2.6.1, not 2.7.0.
Gary Gregory [Thu, 11 Apr 2019 22:00:08 +0000 (18:00 -0400)] 
Next version should be 2.6.1, not 2.7.0.

3 years agoClean up.
Gary Gregory [Thu, 11 Apr 2019 21:46:30 +0000 (17:46 -0400)] 
Clean up.

3 years agoUpdate tests from JUnit 5.4.1 to 5.4.2.
Gary Gregory [Thu, 11 Apr 2019 16:58:21 +0000 (12:58 -0400)] 
Update tests from JUnit 5.4.1 to 5.4.2.

3 years agoUpdate tests from mockito-core 2.25.1 to 2.27.0.
Gary Gregory [Thu, 11 Apr 2019 16:54:58 +0000 (12:54 -0400)] 
Update tests from mockito-core 2.25.1 to 2.27.0.

3 years ago[DBCP-543] Update Apache Commons Pool from 2.6.1 to 2.6.2.
Gary Gregory [Thu, 11 Apr 2019 16:39:45 +0000 (12:39 -0400)] 
[DBCP-543] Update Apache Commons Pool from 2.6.1 to 2.6.2.

3 years agoUpdate test dependencies.
Gary Gregory [Mon, 1 Apr 2019 20:57:00 +0000 (16:57 -0400)] 
Update test dependencies.

- mockito-core 2.24.5 -> 2.25.1
- narayana-jta 5.9.3.Final -> 5.9.5.Final

3 years agoUse try-with-resources to make tests clean up after themselves.
Gary Gregory [Mon, 1 Apr 2019 17:45:06 +0000 (13:45 -0400)] 
Use try-with-resources to make tests clean up after themselves.

3 years ago[DBCP-542] Fix tests on Java 11.
Gary Gregory [Mon, 1 Apr 2019 15:47:53 +0000 (11:47 -0400)] 
[DBCP-542] Fix tests on Java 11.

3 years agoFix org.apache.commons.dbcp2.managed.TestSynchronizationOrder.testSessionSynchronizat...
Zheng Feng [Mon, 1 Apr 2019 15:40:41 +0000 (11:40 -0400)] 
Fix org.apache.commons.dbcp2.managed.TestSynchronizationOrder.testSessionSynchronization()
on Java 11.

3 years ago[DBCP-541] Upgrade to JUnit Jupiter #19.
Gary Gregory [Sat, 30 Mar 2019 18:10:36 +0000 (14:10 -0400)] 
[DBCP-541] Upgrade to JUnit Jupiter #19.

3 years agoUpgrade to JUnit Jupiter (#19)
Allon Murienik [Sat, 30 Mar 2019 15:04:13 +0000 (18:04 +0300)] 
Upgrade to JUnit Jupiter (#19)

This PR migrates the project to the modern JUnit Jupiter 5.4.1
testing framework.
Since JUnit Jupiter is not backwards compatible to JUnit 4.x, or even
JUnit Vintage 5.x, the patch is a tad large, although most of the
changes are just cosmetic.

1. Maven changes:
 a. junit:junit was replaced with org.junit.jupiter:junit-jupiter
 b. org.hamcrest:hamcrest-all was added since JUnit Jupiter no longer
    bundles Hamcrest with them.

2. Annotations:
 a. org.junit.jupiter.api.Test was used as a drop in replacement for
    org.juit.Test without arguments. See 3.b for handling of the
    @Test annotation with an "expected" argument.
 b. org.junit.jupiter.api.BeforeEach was used as an drop in
    replacement for org.junit.Before.
 c. org.junit.jupiter.api.AfterEach was used as a drop in replacement
    for org.junit.After.
 d. org.junit.jupiter.api.BeforeAll was used as a drop in replacement
    for org.junit.BeforeClass.
 e. org.junit.jupiter.api.AfterAll was used as a drop in replacement
    for org.junit.AfterClass.
 f. org.junit.jupiter.api.Disabled was used as a drop in replacement
    for org.junit.Ignore.

3. Assertions:
 a. org.junit.jupiter.api.Assertions' methods were used as a drop in
    replacements for org.junit.Assert's methods with the same name in
    the simple case of an assertion without a message.
    In the case of an assertion with a message,
    org.junit.jupiter.api.Assertions' methods were used, but the
    argument order was changed - Assert's methods take the message as
    the first argument, while Assertions' methods take the message as
    the last argument.
 b. org.junit.jupiter.api.Assertions#assertThrows was used to assert
    a specific exception was throws instead of an org.junit.Test
    annotation with an "expected" argument. This technique has a side
    bonus of making the tests slightly stricter, as now they assert the
    exception was thrown from a specific line and prevent false
    posivites where the test's "set-up" code accidentally threw that
    exception. The throws clauses of these methods were cleaned up from
    exceptions that can no longer be thrown in order to avoid
    compilation warnings.
 c. org.hamcrest.MatcherAssert#assertThat was used as a drop in
    reaplcement for org.junit.Assert#assertThat, as
    org.junit.jupiter.api.Assertions has no equivilent method.