Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Vote for Common Compress 1.18 RC1 has passedDeployer properties:"userAgent" = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0""userId" = "bodewig""ip" = "84.148.255.53"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/commons/commons-compress/1.18/commons-compress-1.18-tests.jar.asc(SHA1: f621e332eaf07859f17b161b5f14e4c705774a61)/org/apache/commons/commons-compress/1.18/commons-compress-1.18.pom(SHA1: e200ad298ce5683b6c1546d30b19259e79cd575f)/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar.asc(SHA1: 0a0d8b1c4fba35d23fda06fee8dfd35344676feb)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-test-sources.jar(SHA1: de9c3ab7fceb9e13f812e81ddc4f5e9f36736cea)/org/apache/commons/commons-compress/1.18/commons-compress-1.18.pom.asc(SHA1: dbf8d14dd97541fd32a1765c8c012ba95349ee94)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-test-sources.jar.asc(SHA1: 4708ce729be1987133cfae535a7e675ceeb738fb)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-javadoc.jar.asc(SHA1: 3db3aa20e9f6b998e3c74c0b0c0b7129d45568e4)/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar(SHA1: 1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-sources.jar(SHA1: a25b942b99fde2cc2913ab39ad34abc0df4f5eb9)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-tests.jar(SHA1: 2a6711864f89bb8f8c30fe5880b0d63a17d32f35)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-javadoc.jar(SHA1: 31d77fd62a1d5db4c6dd1598f2e36d0d9ee6fcda)/org/apache/commons/commons-compress/1.18/commons-compress-1.18-sources.jar.asc(SHA1: 31158b27be7dfe1f3c5e0d3e94739b6f405e3c5f)Action performed by Stefan Bodewig (bodewig)

[commons-compress] Git Push Summary

[bodewig]

Repository: commons-compress
Updated Tags:  refs/tags/rel/1.18 [created] 2f700bd12

svn commit: r28769 - /dev/commons/compress/ /dev/commons/compress/binaries/ /dev/commons/compress/source/ /release/commons/compress/ /release/commons/compress/binaries/ /release/commons/compress/sourc

[bodewig]

Author: bodewig
Date: Thu Aug 16 08:10:51 2018
New Revision: 28769

Log:
vote for Commons Compress 1.18 RC1 has passed

Added:
release/commons/compress/binaries/commons-compress-1.18-bin.tar.gz
  - copied unchanged from r28768, 
dev/commons/compress/binaries/commons-compress-1.18-bin.tar.gz
release/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.asc
  - copied unchanged from r28768, 
dev/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.asc
release/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.sha256
  - copied unchanged from r28768, 
dev/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.sha256
release/commons/compress/binaries/commons-compress-1.18-bin.zip
  - copied unchanged from r28768, 
dev/commons/compress/binaries/commons-compress-1.18-bin.zip
release/commons/compress/binaries/commons-compress-1.18-bin.zip.asc
  - copied unchanged from r28768, 
dev/commons/compress/binaries/commons-compress-1.18-bin.zip.asc
release/commons/compress/binaries/commons-compress-1.18-bin.zip.sha256
  - copied unchanged from r28768, 
dev/commons/compress/binaries/commons-compress-1.18-bin.zip.sha256
release/commons/compress/source/commons-compress-1.18-src.tar.gz
  - copied unchanged from r28768, 
dev/commons/compress/source/commons-compress-1.18-src.tar.gz
release/commons/compress/source/commons-compress-1.18-src.tar.gz.asc
  - copied unchanged from r28768, 
dev/commons/compress/source/commons-compress-1.18-src.tar.gz.asc
release/commons/compress/source/commons-compress-1.18-src.tar.gz.sha256
  - copied unchanged from r28768, 
dev/commons/compress/source/commons-compress-1.18-src.tar.gz.sha256
release/commons/compress/source/commons-compress-1.18-src.zip
  - copied unchanged from r28768, 
dev/commons/compress/source/commons-compress-1.18-src.zip
release/commons/compress/source/commons-compress-1.18-src.zip.asc
  - copied unchanged from r28768, 
dev/commons/compress/source/commons-compress-1.18-src.zip.asc
release/commons/compress/source/commons-compress-1.18-src.zip.sha256
  - copied unchanged from r28768, 
dev/commons/compress/source/commons-compress-1.18-src.zip.sha256
Removed:
dev/commons/compress/RELEASE-NOTES.txt
dev/commons/compress/binaries/commons-compress-1.18-bin.tar.gz
dev/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.asc
dev/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.sha256
dev/commons/compress/binaries/commons-compress-1.18-bin.zip
dev/commons/compress/binaries/commons-compress-1.18-bin.zip.asc
dev/commons/compress/binaries/commons-compress-1.18-bin.zip.sha256
dev/commons/compress/source/commons-compress-1.18-src.tar.gz
dev/commons/compress/source/commons-compress-1.18-src.tar.gz.asc
dev/commons/compress/source/commons-compress-1.18-src.tar.gz.sha256
dev/commons/compress/source/commons-compress-1.18-src.zip
dev/commons/compress/source/commons-compress-1.18-src.zip.asc
dev/commons/compress/source/commons-compress-1.18-src.zip.sha256
Modified:
release/commons/compress/README.html
release/commons/compress/RELEASE-NOTES.txt

Modified: release/commons/compress/README.html
==
--- release/commons/compress/README.html (original)
+++ release/commons/compress/README.html Thu Aug 16 08:10:51 2018
@@ -1,6 +1,6 @@
-Commons-Compress 1.17
+Commons-Compress 1.18
 
-This is the 1.17 release of commons-compress. It is available in both 
binary and source distributions.
+This is the 1.18 release of commons-compress. It is available in both 
binary and source distributions.
 
 Note:
 The tar files in the distribution use GNU tar extensions
@@ -34,12 +34,12 @@ href="https://www.apache.org/dist/common
 
 Always test available signatures, e.g.,
 $ pgpk -a KEYS
-$ pgpv commons-compress-1.17-bin.tar.gz.asc
+$ pgpv commons-compress-1.18-bin.tar.gz.asc
 or,
 $ pgp -ka KEYS
-$ pgp commons-compress-1.17-bin.tar.gz.asc
+$ pgp commons-compress-1.18-bin.tar.gz.asc
 or,
 $ gpg --import KEYS
-$ gpg --verify commons-compress-1.17-bin.tar.gz.asc
+$ gpg --verify commons-compress-1.18-bin.tar.gz.asc
 
 

Modified: release/commons/compress/RELEASE-NOTES.txt
==
--- release/commons/compress/RELEASE-NOTES.txt (original)
+++ release/commons/compress/RELEASE-NOTES.txt Thu Aug 16 08:10:51 2018
@@ -5,6 +5,44 @@ compression and archive formats.  These
 lzma, xz, Snappy, traditional Unix Compress, DEFLATE, DEFLATE64, LZ4,
 Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
 
+Release 1.18
+
+
+New features:
+o It is now possible to specify the arguments of zstd-jni's
+  ZstdOutputStream constructors via Commons Compress as well.
+  Issue: COMPRESS-460.
+  Thanks to Carmi Grushko.
+
+Fixed Bugs:
+o The example Expander class has been vulnerable to a path
+  

[2/2] commons-compress git commit: Merge tag 'rel/1.18' and prepare next iteration

[bodewig]

Merge tag 'rel/1.18' and prepare next iteration


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/a7a95f04
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/a7a95f04
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/a7a95f04

Branch: refs/heads/master
Commit: a7a95f04bfe2c0a855ff3081099f0ef82d32f35a
Parents: 0326bd9 b95d5cd
Author: Stefan Bodewig 
Authored: Thu Aug 16 10:13:59 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 10:34:27 2018 +0200

--
 README.md   |  2 +-
 pom.xml |  2 +-
 src/changes/changes.xml |  5 -
 src/site/site.xml   |  1 +
 src/site/xdoc/download_compress.xml | 26 +-
 src/site/xdoc/index.xml | 18 --
 6 files changed, 24 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/a7a95f04/pom.xml
--
diff --cc pom.xml
index 5e0ffdd,9a85a35..1e3953b
--- a/pom.xml
+++ b/pom.xml
@@@ -24,7 -24,7 +24,7 @@@

  
commons-compress
-   1.18-SNAPSHOT
 -  1.18
++  1.19-SNAPSHOT
Apache Commons Compress
https://commons.apache.org/proper/commons-compress/


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/a7a95f04/src/changes/changes.xml
--
diff --cc src/changes/changes.xml
index 9e84003,9e84003..24948ce
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -42,7 -42,7 +42,10 @@@ The  type attribute can be add,
  commons-compress


--
++
++

  The example Expander class has been vulnerable to a path

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/a7a95f04/src/site/xdoc/index.xml
--

[1/2] commons-compress git commit: prepare RC1 of Commons Compress 1.18

[bodewig]

Repository: commons-compress
Updated Branches:
  refs/heads/master 0326bd90a -> a7a95f04b


prepare RC1 of Commons Compress 1.18


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/b95d5cde
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/b95d5cde
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/b95d5cde

Branch: refs/heads/master
Commit: b95d5cde4c68640f886e3c6802384fae47408a37
Parents: 9da94ed
Author: Stefan Bodewig 
Authored: Mon Aug 13 09:14:05 2018 +0200
Committer: Stefan Bodewig 
Committed: Mon Aug 13 09:14:05 2018 +0200

--
 README.md   |  2 +-
 pom.xml |  2 +-
 src/site/site.xml   |  1 +
 src/site/xdoc/download_compress.xml | 26 +-
 src/site/xdoc/index.xml | 18 --
 5 files changed, 20 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b95d5cde/README.md
--
diff --git a/README.md b/README.md
index b79acb2..b576ca3 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ Alternatively you can pull it from the central Maven 
repositories:
 
   org.apache.commons
   commons-compress
-  1.17
+  1.18
 
 ```
 

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b95d5cde/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5e0ffdd..9a85a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   
 
   commons-compress
-  1.18-SNAPSHOT
+  1.18
   Apache Commons Compress
   https://commons.apache.org/proper/commons-compress/
   

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b95d5cde/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index 139c343..e816250 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -38,6 +38,7 @@
 
 
   
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b95d5cde/src/site/xdoc/download_compress.xml
--
diff --git a/src/site/xdoc/download_compress.xml 
b/src/site/xdoc/download_compress.xml
index 082a1a0..bed1ce7 100644
--- a/src/site/xdoc/download_compress.xml
+++ b/src/site/xdoc/download_compress.xml
@@ -111,32 +111,32 @@ limitations under the License.
   
 
 
-
+
   
 
   
-  commons-compress-1.17-bin.tar.gz
-  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.17-bin.tar.gz.sha256;>sha256
-  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.17-bin.tar.gz.asc;>pgp
+  commons-compress-1.18-bin.tar.gz
+  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.sha256;>sha256
+  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.18-bin.tar.gz.asc;>pgp
   
   
-  commons-compress-1.17-bin.zip
-  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.17-bin.zip.sha256;>sha256
-  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.17-bin.zip.asc;>pgp
+  commons-compress-1.18-bin.zip
+  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.18-bin.zip.sha256;>sha256
+  https://www.apache.org/dist/commons/compress/binaries/commons-compress-1.18-bin.zip.asc;>pgp
   
 
   
   
 
   
-  commons-compress-1.17-src.tar.gz
-  https://www.apache.org/dist/commons/compress/source/commons-compress-1.17-src.tar.gz.sha256;>sha256
-  https://www.apache.org/dist/commons/compress/source/commons-compress-1.17-src.tar.gz.asc;>pgp
+  commons-compress-1.18-src.tar.gz
+  https://www.apache.org/dist/commons/compress/source/commons-compress-1.18-src.tar.gz.sha256;>sha256
+  https://www.apache.org/dist/commons/compress/source/commons-compress-1.18-src.tar.gz.asc;>pgp
   
   
-  commons-compress-1.17-src.zip
-  https://www.apache.org/dist/commons/compress/source/commons-compress-1.17-src.zip.sha256;>sha256
-  https://www.apache.org/dist/commons/compress/source/commons-compress-1.17-src.zip.asc;>pgp
+  commons-compress-1.18-src.zip
+  https://www.apache.org/dist/commons/compress/source/commons-compress-1.18-src.zip.sha256;>sha256
+  

svn commit: r1838195 - /commons/cms-site/trunk/doap/doap_compress.rdf

[bodewig]

Author: bodewig
Date: Thu Aug 16 12:31:07 2018
New Revision: 1838195

URL: http://svn.apache.org/viewvc?rev=1838195=rev
Log:
add Commons Compress 1.18

Modified:
commons/cms-site/trunk/doap/doap_compress.rdf

Modified: commons/cms-site/trunk/doap/doap_compress.rdf
URL: 
http://svn.apache.org/viewvc/commons/cms-site/trunk/doap/doap_compress.rdf?rev=1838195=1838194=1838195=diff
==
--- commons/cms-site/trunk/doap/doap_compress.rdf (original)
+++ commons/cms-site/trunk/doap/doap_compress.rdf Thu Aug 16 12:31:07 2018
@@ -36,6 +36,13 @@
 
   
 commons-compress
+2018-08-16
+1.18
+  
+
+
+  
+commons-compress
 2018-06-03
 1.17
   

[2/3] commons-rng git commit: RNG-55: Check for zero norm.

[erans]

RNG-55: Check for zero norm.


Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/8539ccbe
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/8539ccbe
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/8539ccbe

Branch: refs/heads/master
Commit: 8539ccbeda3d390390cfc57185cfc6d2f6d0ebee
Parents: c54506b
Author: Gilles 
Authored: Thu Aug 16 14:44:56 2018 +0200
Committer: Gilles 
Committed: Thu Aug 16 14:44:56 2018 +0200

--
 .../commons/rng/sampling/UnitSphereSampler.java   |  9 +
 .../rng/sampling/UnitSphereSamplerTest.java   | 18 ++
 src/changes/changes.xml   |  3 +++
 3 files changed, 30 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-rng/blob/8539ccbe/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
--
diff --git 
a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
 
b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
index b289025..46dd474 100644
--- 
a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
+++ 
b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
@@ -59,6 +59,15 @@ public class UnitSphereSampler {
 normSq += comp * comp;
 }
 
+if (normSq == 0) {
+// Zero-norm vector is discarded.
+// Using recursion as it is highly unlikely to generate more
+// than a few such vectors. It also protects against infinite
+// loop (in case a buggy generator is used), by eventually
+// raising a "StackOverflowError".
+return nextVector();
+}
+
 final double f = 1 / Math.sqrt(normSq);
 for (int i = 0; i < dimension; i++) {
 v[i] *= f;

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/8539ccbe/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
--
diff --git 
a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
 
b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
index a66e4cd..2b7ff47 100644
--- 
a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
+++ 
b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
@@ -56,6 +56,24 @@ public class UnitSphereSamplerTest {
 }
 }
 
+/** Cf. RNG-55. */
+@Test(expected = StackOverflowError.class)
+public void testBadProvider1() {
+final UniformRandomProvider bad = new UniformRandomProvider() {
+public long nextLong(long n) { return 0; }
+public long nextLong() { return 0; }
+public int nextInt(int n) { return 0; }
+public int nextInt() { return 0; }
+public float nextFloat() { return 0; }
+public double nextDouble() { return 0;}
+public void nextBytes(byte[] bytes, int start, int len) {}
+public void nextBytes(byte[] bytes) {}
+public boolean nextBoolean() { return false; }
+};
+
+new UnitSphereSampler(1, bad).nextVector();
+}
+
 /**
  * @return the length (L2-norm) of given vector.
  */

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/8539ccbe/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f36c4e3..2bd1a44 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -67,6 +67,9 @@ Additional code is provided in the following module:
 It is however not part of the official API and no compatibility
 should be expected in subsequent releases.
 ">
+  
+"UnitSphereSampler": Prevent returning NaN components.
+  
 
 
 

svn commit: r1838194 - /commons/cms-site/trunk/conf/component_releases.properties

[bodewig]

Author: bodewig
Date: Thu Aug 16 12:30:09 2018
New Revision: 1838194

URL: http://svn.apache.org/viewvc?rev=1838194=rev
Log:
add Commons Compress 1.18

Modified:
commons/cms-site/trunk/conf/component_releases.properties

Modified: commons/cms-site/trunk/conf/component_releases.properties
URL: 
http://svn.apache.org/viewvc/commons/cms-site/trunk/conf/component_releases.properties?rev=1838194=1838193=1838194=diff
==
--- commons/cms-site/trunk/conf/component_releases.properties (original)
+++ commons/cms-site/trunk/conf/component_releases.properties Thu Aug 16 
12:30:09 2018
@@ -12,8 +12,8 @@ codecVersion=1.11
 codecReleased=2017-10-20
 collectionsVersion=4.2
 collectionsReleased=2018-07-11
-compressVersion=1.17
-compressReleased=2018-06-03
+compressVersion=1.18
+compressReleased=2018-08-16
 configurationVersion=2.3
 configurationReleased=2018-08-08
 csvVersion=1.5

[commons-jexl] branch master updated: JEXL-267: added test illustrating intended behaviors

[henrib]

This is an automated email from the ASF dual-hosted git repository.

henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
 new b6c6db7  JEXL-267: added test illustrating intended behaviors
b6c6db7 is described below

commit b6c6db7c60726c1eeefe90da8506941ec1ad561b
Author: henrib 
AuthorDate: Thu Aug 16 15:33:23 2018 +0200

JEXL-267: added test illustrating intended behaviors
---
 .../org/apache/commons/jexl3/Issues200Test.java | 21 +
 1 file changed, 21 insertions(+)

diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java 
b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 625962d..31fb8f8 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -632,4 +632,25 @@ public class Issues200Test extends JexlTestCase {
 Assert.assertEquals(4, result);
 Assert.assertEquals(4, msi.size());
 }
+
+@Test
+public void test267() throws Exception {
+Object result;
+JexlScript script;
+JexlEngine jexl = new JexlBuilder().create();
+JexlContext ctxt = new MapContext();
+// API declared params
+script = jexl.createScript("x + y", "x", "y");
+result = script.execute(ctxt, 20, 22);
+Assert.assertEquals(42, result);
+// script declared params
+script = jexl.createScript("(x, y)->{ x + y}");
+result = script.execute(ctxt, 22, 20);
+Assert.assertEquals(42, result);
+// explicitly returning the lambda
+script = jexl.createScript("return (x, y)->{ x + y}");
+result = script.execute(ctxt);
+Assert.assertTrue(result instanceof JexlScript);
+}
+
 }

[commons-jexl] branch master updated: JEXL-266: augmented example/prototype with 2 forEach operator 'overloads'

[henrib]

This is an automated email from the ASF dual-hosted git repository.

henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
 new 06122d3  JEXL-266: augmented example/prototype with 2 forEach operator 
'overloads'
06122d3 is described below

commit 06122d3775edf14bdb0c87bf642976a9e8a01b9d
Author: henrib 
AuthorDate: Thu Aug 16 15:00:29 2018 +0200

JEXL-266: augmented example/prototype with 2 forEach operator 'overloads'
---
 .../org/apache/commons/jexl3/Issues200Test.java| 23 --
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java 
b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 9b09dd4..625962d 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -588,6 +588,10 @@ public class Issues200Test extends JexlTestCase {
 queue.addFirst(it266);
 return it266;
 }
+
+public Iterator forEach(Map collection) {
+return forEach(collection.values());
+}
 
 public void remove() {
 Deque queue = TLS_FOREACH.get();
@@ -603,14 +607,29 @@ public class Issues200Test extends JexlTestCase {
 
 @Test
 public void test266() throws Exception {
+Object result;
+JexlScript script;
 JexlEngine jexl = new JexlBuilder().arithmetic(new 
Arithmetic266(true)).create();
 JexlContext ctxt = new MapContext();
+
 List li = new ArrayList(Arrays.asList(1, 2, 3, 4, 5 
,6));
 ctxt.set("list", li);
-Object result;
-JexlScript script;
 script = jexl.createScript("for (var item : list) { if (item <= 3) 
remove(); } return size(list)");
 result = script.execute(ctxt);
 Assert.assertEquals(3, result);
+Assert.assertEquals(3, li.size());
+
+Map msi = new HashMap();
+msi.put("a", 1);
+msi.put("b", 2);
+msi.put("c", 3);
+msi.put("d", 4);
+msi.put("e", 5);
+msi.put("f", 6);
+ctxt.set("map", msi);
+script = jexl.createScript("for (var item : map) { if (item <= 2) 
remove(); } return size(map)");
+result = script.execute(ctxt);
+Assert.assertEquals(4, result);
+Assert.assertEquals(4, msi.size());
 }
 }

[2/2] commons-compress git commit: make Sonar less unhappy

[bodewig]

make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/087e4a9d
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/087e4a9d
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/087e4a9d

Branch: refs/heads/master
Commit: 087e4a9d51437243eb0a4698b3bd2b71b4567c3e
Parents: 1efa5de
Author: Stefan Bodewig 
Authored: Thu Aug 16 14:48:50 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 14:48:50 2018 +0200

--
 .../commons/compress/archivers/ar/ArArchiveInputStream.java| 6 ++
 .../apache/commons/compress/archivers/examples/Expander.java   | 6 ++
 .../commons/compress/archivers/zip/ZipArchiveInputStream.java  | 6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/087e4a9d/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
 
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index 3ed8f2f..206d388 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -264,13 +264,11 @@ public class ArArchiveInputStream extends 
ArchiveInputStream {
 if (currentEntry == null) {
 throw new IllegalStateException("No current ar entry");
 }
-int toRead = len;
 final long entryEnd = entryOffset + currentEntry.getLength();
-if (len > 0 && entryEnd > offset) {
-toRead = (int) Math.min(len, entryEnd - offset);
-} else {
+if (len < 0 || offset >= entryEnd) {
 return -1;
 }
+final int toRead = (int) Math.min(len, entryEnd - offset);
 final int ret = this.input.read(b, off, toRead);
 trackReadBytes(ret);
 return ret;

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/087e4a9d/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java 
b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
index cfaba87..4922527 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
@@ -222,11 +222,9 @@ public class Expander {
 @Override
 public void writeEntryDataTo(ArchiveEntry entry, OutputStream out) 
throws IOException {
 final byte[] buffer = new byte[8024];
-int n = 0;
-long count = 0;
+int n;
 while (-1 != (n = archive.read(buffer))) {
 out.write(buffer, 0, n);
-count += n;
 }
 }
 }, targetDirectory);
@@ -240,7 +238,7 @@ public class Expander {
 throws IOException {
 String targetDirPath = targetDirectory.getCanonicalPath();
 if (!targetDirPath.endsWith(File.separator)) {
-targetDirPath += File.separatorChar;
+targetDirPath += File.separator;
 }
 ArchiveEntry nextEntry = supplier.getNextReadableEntry();
 while (nextEntry != null) {

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/087e4a9d/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index e1995d7..196e402 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -246,7 +246,7 @@ public class ZipArchiveInputStream extends 
ArchiveInputStream implements InputSt
 } else {
 readFully(lfhBuf);
 }
-} catch (final EOFException e) {
+} catch (final EOFException e) { //NOSONAR
 return null;
 }
 
@@ -1120,7 +1120,7 @@ public class ZipArchiveInputStream extends 
ArchiveInputStream implements InputSt
 // LFH has already been read and all but the first eight bytes contain 
(part of) the APK signing block,
 // also subtract 16 bytes in order to position us at the magic string
 

[1/2] commons-compress git commit: update security page with CVE-2018-11771

[bodewig]

Repository: commons-compress
Updated Branches:
  refs/heads/master a7a95f04b -> 087e4a9d5


update security page with CVE-2018-11771


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/1efa5de8
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/1efa5de8
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/1efa5de8

Branch: refs/heads/master
Commit: 1efa5de83e0f00fec485fbc9669e17d30556ed98
Parents: a7a95f0
Author: Stefan Bodewig 
Authored: Thu Aug 16 14:47:53 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 14:47:53 2018 +0200

--
 src/site/xdoc/security-reports.xml | 23 +++
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/1efa5de8/src/site/xdoc/security-reports.xml
--
diff --git a/src/site/xdoc/security-reports.xml 
b/src/site/xdoc/security-reports.xml
index fcca3ab..9a996fb 100644
--- a/src/site/xdoc/security-reports.xml
+++ b/src/site/xdoc/security-reports.xml
@@ -54,6 +54,29 @@
 the descriptions here are incomplete, please report them
 privately to the Apache Security Team. Thank you.
 
+
+  Low: Denial of Service https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-11771;>CVE-2018-11771
+
+  When reading a specially crafted ZIP archive, the read
+  method of ZipArchiveInputStream can fail to
+  return the correct EOF indication after the end of the
+  stream has been reached. When combined with a
+  java.io.InputStreamReader this can lead to an
+  infinite stream, which can be used to mount a denial of
+  service attack against services that use Compress' zip
+  package
+
+  This was fixed in revision https://git-wip-us.apache.org/repos/asf?p=commons-compress.git;a=blobdiff;f=src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java;h=e1995d7aa51dfac6ae933987fb0b7760c607582b;hp=0a2c1aa0063c620c867715119eae2013c87b5e70;hb=a41ce6892cb0590b2e658704434ac0dbcb6834c8;hpb=64ed6dde03afbef6715fdfdeab5fc04be6192899;>a41ce68.
+
+  This was  made public on 16 August 2018.
+
+  Affects: 1.7 - 1.17
+
+
+
 
   Low: Denial of Service https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1324;>CVE-2018-1324

commons-compress git commit: make site-deploy again

[bodewig]

Repository: commons-compress
Updated Branches:
  refs/heads/master 087e4a9d5 -> 0a30d4389


make site-deploy again


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/0a30d438
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/0a30d438
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/0a30d438

Branch: refs/heads/master
Commit: 0a30d4389ce1ab5deb128180cdcab4b44dff2df6
Parents: 087e4a9
Author: Stefan Bodewig 
Authored: Thu Aug 16 18:04:35 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 18:04:35 2018 +0200

--
 pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/0a30d438/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1e3953b..b9ce208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,10 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
 
 0.11.1
 
+
+
https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${project.artifactId}
+
 4.11.0
 1.7.21
   

commons-release-plugin git commit: [COMMONSSITE-120] Use SHA-256 and SHA-512, not MD5, not SHA-1.

[ggregory]

Repository: commons-release-plugin
Updated Branches:
  refs/heads/master 2543f323d -> 55d3a85d4


[COMMONSSITE-120] Use SHA-256 and SHA-512, not MD5, not SHA-1.

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/55d3a85d
Tree: 
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/55d3a85d
Diff: 
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/55d3a85d

Branch: refs/heads/master
Commit: 55d3a85d41bc1678fbd387712e1053a6e3950bf7
Parents: 2543f32
Author: Gary Gregory 
Authored: Thu Aug 16 09:39:43 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 09:39:43 2018 -0600

--
 src/changes/changes.xml |   1 +
 .../CommonsDistributionDetachmentMojo.java  | 107 +++
 .../mojos/CommonsDistributionStagingMojo.java   |   2 +-
 .../vote-txt-template.txt   |   2 +-
 src/main/scripts/generate-xdocs.build.xml   |   8 +-
 .../xdoc/download_commons-release-plugin.xml| 308 +--
 .../CommonsDistributionDetachmentMojoTest.java  |  20 +-
 .../CommonsDistributionStagingMojoTest.java |  31 +-
 8 files changed, 232 insertions(+), 247 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/55d3a85d/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bbd6abd..a64857a 100755
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -28,6 +28,7 @@
 
   Better error message when files 
cannot be checked in to the SCM.
   Check the result of checking out files 
from the SCM.
+  [release-plugin] Use SHA-256 and SHA-512, not MD5, not 
SHA-1.
 
 
 

http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/55d3a85d/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 97a622e..e569223 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
@@ -77,18 +77,18 @@ public class CommonsDistributionDetachmentMojo extends 
AbstractMojo {
 private final List detachedArtifacts = new ArrayList<>();
 
 /**
- * A {@link Properties} of {@link Artifact} → {@link String} containing 
the sha1 signatures
+ * A {@link Properties} of {@link Artifact} → {@link String} containing 
the sha256 signatures
  * for the individual artifacts, where the {@link Artifact} is represented 
as:
- * groupId:artifactId:version:type=sha1.
+ * groupId:artifactId:version:type=sha256.
  */
-private final Properties artifactSha1s = new Properties();
+private final Properties artifactSha256s = new Properties();
 
 /**
  * A {@link Properties} of {@link Artifact} → {@link String} containing 
the sha256 signatures
  * for the individual artifacts, where the {@link Artifact} is represented 
as:
- * groupId:artifactId:version:type=sha1.
+ * groupId:artifactId:version:type=sha512.
  */
-private final Properties artifactSha256s = new Properties();
+private final Properties artifactSha512s = new Properties();
 
 /**
  * The maven project context injection so that we can get a hold of the 
variables at hand.
@@ -118,8 +118,8 @@ public class CommonsDistributionDetachmentMojo extends 
AbstractMojo {
 @Override
 public void execute() throws MojoExecutionException {
 if (!isDistModule) {
-getLog().info("This module is marked as a non distribution "
-+ "or assembly module, and the plugin will not run.");
+getLog().info(
+"This module is marked as a non distribution or assembly 
module, and the plugin will not run.");
 return;
 }
 if (StringUtils.isEmpty(distSvnStagingUrl)) {
@@ -128,8 +128,8 @@ public class CommonsDistributionDetachmentMojo extends 
AbstractMojo {
 }
 getLog().info("Detaching Assemblies");
 for (Object attachedArtifact : project.getAttachedArtifacts()) {
-putAttachedArtifactInSha1Map((Artifact) attachedArtifact);
 putAttachedArtifactInSha256Map((Artifact) attachedArtifact);
+putAttachedArtifactInSha512Map((Artifact) attachedArtifact);
 if (ARTIFACT_TYPES_TO_DETACH.contains(((Artifact) 
attachedArtifact).getType())) {
   

svn commit: r1838207 - in /commons/proper/vfs/trunk: pom.xml src/changes/changes.xml

[ggregory]

Author: ggregory
Date: Thu Aug 16 16:18:16 2018
New Revision: 1838207

URL: http://svn.apache.org/viewvc?rev=1838207=rev
Log:
[VFS-671] Update Apache Commons Compress from 1.16.1 to 1.18.

Modified:
commons/proper/vfs/trunk/pom.xml
commons/proper/vfs/trunk/src/changes/changes.xml

Modified: commons/proper/vfs/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1838207=1838206=1838207=diff
==
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Thu Aug 16 16:18:16 2018
@@ -412,7 +412,7 @@
   
 org.apache.commons
 commons-compress
-1.16.1
+1.18
   
   
 org.apache.jackrabbit

Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1838207=1838206=1838207=diff
==
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Thu Aug 16 16:18:16 2018
@@ -86,6 +86,9 @@ The  type attribute can be add,u
   
 org.apache.commons.vfs2.util.CombinedResources.loadResources(String) 
should not throw an NPE for the system class loader is null.
   
+  
+Update Apache Commons Compress from 1.16.1 to 1.18.
+  
 
 
   

commons-compress git commit: note to self, remove workaround when next parent becomes available

[bodewig]

Repository: commons-compress
Updated Branches:
  refs/heads/master 0a30d4389 -> 3867f3eaf


note to self, remove workaround when next parent becomes available


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/3867f3ea
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/3867f3ea
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/3867f3ea

Branch: refs/heads/master
Commit: 3867f3eaf8b22d6c4f6a38e5e39989594a44c1f5
Parents: 0a30d43
Author: Stefan Bodewig 
Authored: Thu Aug 16 18:09:08 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 18:09:37 2018 +0200

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3867f3ea/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b9ce208..47d7c44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,8 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, 
arj.
   maven-bundle-plugin
   ${commons.felix.version}
 
-
+
 
   com.github.siom79.japicmp
   japicmp-maven-plugin

svn commit: r1838210 - /commons/proper/commons-parent/trunk/pom.xml

[ggregory]

Author: ggregory
Date: Thu Aug 16 17:08:50 2018
New Revision: 1838210

URL: http://svn.apache.org/viewvc?rev=1838210=rev
Log:
Fix comment.

Modified:
commons/proper/commons-parent/trunk/pom.xml

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1838210=1838209=1838210=diff
==
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Thu Aug 16 17:08:50 2018
@@ -1862,7 +1862,7 @@
 0.90
 false
 
-
 ${project.artifactId}
-

commons-release-plugin git commit: Update Apache Commons Compress from 1.17 to 1.18.

[ggregory]

Repository: commons-release-plugin
Updated Branches:
  refs/heads/master 55d3a85d4 -> 36cb84476


Update Apache Commons Compress from 1.17 to 1.18.

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/36cb8447
Tree: 
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/36cb8447
Diff: 
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/36cb8447

Branch: refs/heads/master
Commit: 36cb84476b7d261a5b951ca2b30d555f14fea434
Parents: 55d3a85
Author: Gary Gregory 
Authored: Thu Aug 16 10:08:44 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 10:08:44 2018 -0600

--
 pom.xml | 2 +-
 src/changes/changes.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/36cb8447/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 58b8f9f..31826d5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@
 
   org.apache.commons
   commons-compress
-  1.17
+  1.18
 
 
   org.apache.maven.plugin-testing

http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/36cb8447/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a64857a..7ac8938 100755
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -29,6 +29,7 @@
   Better error message when files 
cannot be checked in to the SCM.
   Check the result of checking out files 
from the SCM.
   [release-plugin] Use SHA-256 and SHA-512, not MD5, not 
SHA-1.
+  Update Apache Commons Compress from 
1.17 to 1.18.
 
 
 

commons-compress git commit: add details

[bodewig]

Repository: commons-compress
Updated Branches:
  refs/heads/master 3867f3eaf -> 5fd497fa3


add details


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/5fd497fa
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/5fd497fa
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/5fd497fa

Branch: refs/heads/master
Commit: 5fd497fa380c84d74718ef1b0c0b39b31a4fae30
Parents: 3867f3e
Author: Stefan Bodewig 
Authored: Thu Aug 16 18:18:20 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 18:18:20 2018 +0200

--
 src/site/xdoc/security-reports.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/5fd497fa/src/site/xdoc/security-reports.xml
--
diff --git a/src/site/xdoc/security-reports.xml 
b/src/site/xdoc/security-reports.xml
index 9a996fb..caa2c33 100644
--- a/src/site/xdoc/security-reports.xml
+++ b/src/site/xdoc/security-reports.xml
@@ -70,8 +70,8 @@
   This was fixed in revision https://git-wip-us.apache.org/repos/asf?p=commons-compress.git;a=blobdiff;f=src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java;h=e1995d7aa51dfac6ae933987fb0b7760c607582b;hp=0a2c1aa0063c620c867715119eae2013c87b5e70;hb=a41ce6892cb0590b2e658704434ac0dbcb6834c8;hpb=64ed6dde03afbef6715fdfdeab5fc04be6192899;>a41ce68.
 
-  This was  made public on 16 August 2018.
+  This was first reported to the Security Team on 14 June
+  2018 and made public on 16 August 2018.
 
   Affects: 1.7 - 1.17
 

commons-dbcp git commit: [DBCP-519] Add some toString() methods for debugging (never printing passwords)

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 7b893aed7 -> 5bac43f7b


[DBCP-519] Add some toString() methods for debugging (never printing
passwords)

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/5bac43f7
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/5bac43f7
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/5bac43f7

Branch: refs/heads/master
Commit: 5bac43f7b775c9c876af614e745f80ccb495f01f
Parents: 7b893ae
Author: Gary Gregory 
Authored: Thu Aug 16 12:59:41 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 12:59:41 2018 -0600

--
 src/changes/changes.xml |  3 +
 .../dbcp2/cpdsadapter/DriverAdapterCPDS.java| 40 +++
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java | 23 +++
 .../datasources/CPDSConnectionFactory.java  | 26 +++
 .../datasources/InstanceKeyDataSource.java  | 72 
 .../datasources/PerUserPoolDataSource.java  | 41 +++
 .../dbcp2/datasources/SharedPoolDataSource.java |  7 ++
 .../commons/dbcp2/datasources/UserPassKey.java  |  7 +-
 8 files changed, 216 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5bac43f7/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 27717b1..8d69d58 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,6 +76,9 @@ The  type attribute can be add,update,fix,remove.
   
 Allow DBCP to work with old Java 6/JDBC drivers without throwing 
AbstractMethodError.
   
+  
+Add some toString() methods for debugging (never printing passwords.)
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5bac43f7/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 0844c9b..db97efe 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -730,4 +730,44 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
 }
 }
 }
+
+/**
+ * Does not print the userPassword field nor the password in the 
connectionProperties.
+ * 
+ * @since 2.6.0
+ */
+@Override
+public String toString() {
+StringBuilder builder = new StringBuilder(super.toString());
+builder.append("[description=");
+builder.append(description);
+builder.append(", url=");
+builder.append(url);
+builder.append(", userName=");
+builder.append(userName);
+builder.append(", driver=");
+builder.append(driver);
+builder.append(", loginTimeout=");
+builder.append(loginTimeout);
+builder.append(", poolPreparedStatements=");
+builder.append(poolPreparedStatements);
+builder.append(", maxIdle=");
+builder.append(maxIdle);
+builder.append(", timeBetweenEvictionRunsMillis=");
+builder.append(timeBetweenEvictionRunsMillis);
+builder.append(", numTestsPerEvictionRun=");
+builder.append(numTestsPerEvictionRun);
+builder.append(", minEvictableIdleTimeMillis=");
+builder.append(minEvictableIdleTimeMillis);
+builder.append(", maxPreparedStatements=");
+builder.append(maxPreparedStatements);
+builder.append(", getConnectionCalled=");
+builder.append(getConnectionCalled);
+builder.append(", connectionProperties=");
+builder.append(((Properties) 
connectionProperties.clone()).remove("password"));
+builder.append(", accessToUnderlyingConnectionAllowed=");
+builder.append(accessToUnderlyingConnectionAllowed);
+builder.append("]");
+return builder.toString();
+}
 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5bac43f7/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index 715c0de..604ad71 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -647,4 +647,27 @@ class 

commons-dbcp git commit: Add comment.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 16c46bdb4 -> 749e5b391


Add comment.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/749e5b39
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/749e5b39
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/749e5b39

Branch: refs/heads/master
Commit: 749e5b3918721a1143905e1482916d8674128a5e
Parents: 16c46bd
Author: Gary Gregory 
Authored: Thu Aug 16 13:13:57 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 13:13:57 2018 -0600

--
 .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/749e5b39/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 eb0d472..58aafcc 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -19,6 +19,9 @@ package org.apache.commons.dbcp2.cpdsadapter;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
@@ -742,6 +745,7 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
 builder.append("[description=");
 builder.append(description);
 builder.append(", url=");
+// TODO What if the connection string contains a 'password' query 
parameter but that connection string is not in a legal URL format?
 builder.append(url);
 builder.append(", userName=");
 builder.append(userName);

commons-dbcp git commit: [DBCP-519] Add some toString() methods for debugging (never printing passwords)

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 5bac43f7b -> 16c46bdb4


[DBCP-519] Add some toString() methods for debugging (never printing
passwords)

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/16c46bdb
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/16c46bdb
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/16c46bdb

Branch: refs/heads/master
Commit: 16c46bdb4330287fa64cbb2b71014c76852e5c8b
Parents: 5bac43f
Author: Gary Gregory 
Authored: Thu Aug 16 13:09:46 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 13:09:46 2018 -0600

--
 .../apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/16c46bdb/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 db97efe..eb0d472 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -764,7 +764,13 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
 builder.append(", getConnectionCalled=");
 builder.append(getConnectionCalled);
 builder.append(", connectionProperties=");
-builder.append(((Properties) 
connectionProperties.clone()).remove("password"));
+Properties tmpProps = connectionProperties;
+final String pwdKey = "password";
+if (connectionProperties.contains(pwdKey)) {
+tmpProps = (Properties) connectionProperties.clone();
+tmpProps.remove(pwdKey);
+}
+builder.append(tmpProps);
 builder.append(", accessToUnderlyingConnectionAllowed=");
 builder.append(accessToUnderlyingConnectionAllowed);
 builder.append("]");

commons-dbcp git commit: [DBCP-519] Add some toString() methods for debugging (never printing passwords): Remove user names from toString() output per Phil's suugestion.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 749e5b391 -> 04e3fe1d2


[DBCP-519] Add some toString() methods for debugging (never printing
passwords): Remove user names from toString() output per Phil's
suugestion.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/04e3fe1d
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/04e3fe1d
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/04e3fe1d

Branch: refs/heads/master
Commit: 04e3fe1d2cfd176784f164413010d87a01f1e5c2
Parents: 749e5b3
Author: Gary Gregory 
Authored: Thu Aug 16 15:03:25 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 15:03:25 2018 -0600

--
 .../dbcp2/cpdsadapter/DriverAdapterCPDS.java|  6 +--
 .../datasources/CPDSConnectionFactory.java  |  2 -
 .../datasources/PerUserPoolDataSource.java  | 41 
 3 files changed, 2 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/04e3fe1d/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 58aafcc..add181e 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -735,7 +735,7 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
 }
 
 /**
- * Does not print the userPassword field nor the password in the 
connectionProperties.
+ * Does not print the userName and userPassword field nor the 'user' or 
'password' in the connectionProperties.
  * 
  * @since 2.6.0
  */
@@ -745,10 +745,8 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
 builder.append("[description=");
 builder.append(description);
 builder.append(", url=");
-// TODO What if the connection string contains a 'password' query 
parameter but that connection string is not in a legal URL format?
+// TODO What if the connection string contains a 'user' or 'password' 
query parameter but that connection string is not in a legal URL format?
 builder.append(url);
-builder.append(", userName=");
-builder.append(userName);
 builder.append(", driver=");
 builder.append(driver);
 builder.append(", loginTimeout=");

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/04e3fe1d/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 ef6e5f7..a6253f0 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -411,8 +411,6 @@ class CPDSConnectionFactory
 builder.append(rollbackAfterValidation);
 builder.append(", pool=");
 builder.append(pool);
-builder.append(", userName=");
-builder.append(userName);
 builder.append(", maxConnLifetimeMillis=");
 builder.append(maxConnLifetimeMillis);
 builder.append(", validatingSet=");

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/04e3fe1d/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java 
b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
index 289617b..1087b37 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
@@ -1173,45 +1173,4 @@ public class PerUserPoolDataSource extends 
InstanceKeyDataSource {
 con.setReadOnly(defaultReadOnly.booleanValue());
 }
 }
-
-@Override
-protected void toStringFields(StringBuilder builder) {
-super.toStringFields(builder);
-builder.append(", perUserBlockWhenExhausted=");
-builder.append(perUserBlockWhenExhausted);
-builder.append(", perUserEvictionPolicyClassName=");
-builder.append(perUserEvictionPolicyClassName);
-builder.append(", perUserLifo=");
-builder.append(perUserLifo);
-builder.append(", 

commons-dbcp git commit: [DBCP-519] Add some toString() methods for debugging (never printing passwords): Synchronize toString() for mutable objects.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 04e3fe1d2 -> 3fe15786c


[DBCP-519] Add some toString() methods for debugging (never printing
passwords): Synchronize toString() for mutable objects.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/3fe15786
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/3fe15786
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/3fe15786

Branch: refs/heads/master
Commit: 3fe15786c11fdcf1808aacc05b8b15d61f7ce23e
Parents: 04e3fe1
Author: Gary Gregory 
Authored: Thu Aug 16 15:41:42 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 15:41:42 2018 -0600

--
 src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 2 +-
 .../org/apache/commons/dbcp2/DelegatingPreparedStatement.java| 2 +-
 src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java  | 4 ++--
 src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java  | 2 +-
 src/main/java/org/apache/commons/dbcp2/PoolingConnection.java| 2 +-
 .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 2 +-
 .../apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java   | 2 +-
 .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java  | 2 +-
 .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java  | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/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 a94b665..546e6a8 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -88,7 +88,7 @@ public class DelegatingConnection 
extends AbandonedTrace i
  * Returns a string representation of the metadata associated with the 
innermost delegate connection.
  */
 @Override
-public String toString() {
+public synchronized String toString() {
 String s = null;
 
 final Connection c = this.getInnermostDelegateInternal();

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
index 5d38e03..048687c 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
@@ -688,7 +688,7 @@ public class DelegatingPreparedStatement extends 
DelegatingStatement implements
  */
 @SuppressWarnings("resource")
 @Override
-public String toString() {
+public synchronized String toString() {
 final Statement statement = getDelegate();
 return statement == null ? "NULL" : statement.toString();
 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/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 cac9133..3d1483c 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
@@ -1242,8 +1242,8 @@ public final class DelegatingResultSet extends 
AbandonedTrace implements ResultS
 }
 
 @Override
-public String toString() {
-return super.toString() + "[_res=" + resultSet + ", _stmt=" + 
statement + ", _conn=" + connection + "]";
+public synchronized String toString() {
+return super.toString() + "[resultSet=" + resultSet + ", statement=" + 
statement + ", connection=" + connection + "]";
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/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 3df926b..8a1725f 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -790,7 +790,7 @@ public class DelegatingStatement extends AbandonedTrace 
implements 

commons-pool git commit: Remove redundant type arguments.

[ggregory]

Repository: commons-pool
Updated Branches:
  refs/heads/master 5b2832931 -> 4f00184b2


Remove redundant type arguments.

Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/4f00184b
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/4f00184b
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/4f00184b

Branch: refs/heads/master
Commit: 4f00184b29c7f0560f90121c53abd11f9a68ba37
Parents: 5b28329
Author: Gary Gregory 
Authored: Thu Aug 16 18:15:15 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:15:15 2018 -0600

--
 .../org/apache/commons/pool2/impl/TestGenericObjectPool.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-pool/blob/4f00184b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
--
diff --git 
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java 
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index a6ee7ff..cfe0fe7 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -2674,7 +2674,7 @@ public class TestGenericObjectPool extends 
TestBaseObjectPool {
 @Override
 public PooledObject wrap(final String obj) {
 // fake
-return new DefaultPooledObject(obj);
+return new DefaultPooledObject<>(obj);
 }
 };
 }
@@ -2779,7 +2779,7 @@ public class TestGenericObjectPool extends 
TestBaseObjectPool {
 @Override
 public PooledObject wrap(final String obj) {
 // fake
-return new DefaultPooledObject(obj);
+return new DefaultPooledObject<>(obj);
 }
 };
 }

commons-pool git commit: Remove redundant modifiers.

[ggregory]

Repository: commons-pool
Updated Branches:
  refs/heads/master 4f00184b2 -> a54ef151a


Remove redundant modifiers.

Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/a54ef151
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/a54ef151
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/a54ef151

Branch: refs/heads/master
Commit: a54ef151a15dac730539c81afa7a1108f7f8c0ff
Parents: 4f00184
Author: Gary Gregory 
Authored: Thu Aug 16 18:16:05 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:16:05 2018 -0600

--
 .../apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java | 2 +-
 .../org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-pool/blob/a54ef151/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
--
diff --git 
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
 
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
index e4ae5cf..bd89722 100644
--- 
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
+++ 
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedKeyedObjectPool.java
@@ -139,7 +139,7 @@ public abstract class BaseTestProxiedKeyedObjectPool {
 }
 
 
-protected static interface TestObject {
+protected interface TestObject {
 String getData();
 void setData(String data);
 }

http://git-wip-us.apache.org/repos/asf/commons-pool/blob/a54ef151/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
--
diff --git 
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java 
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
index f712d21..7e5222a 100644
--- 
a/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
+++ 
b/src/test/java/org/apache/commons/pool2/proxy/BaseTestProxiedObjectPool.java
@@ -174,7 +174,7 @@ public abstract class BaseTestProxiedObjectPool {
 }
 
 
-protected static interface TestObject {
+protected interface TestObject {
 String getData();
 void setData(String data);
 }

commons-pool git commit: Remove trailing white spaces.

[ggregory]

Repository: commons-pool
Updated Branches:
  refs/heads/master a54ef151a -> bbc34c389


Remove trailing white spaces.

Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/bbc34c38
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/bbc34c38
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/bbc34c38

Branch: refs/heads/master
Commit: bbc34c389dbe4495fb280ae412a88f53fdfda94a
Parents: a54ef15
Author: Gary Gregory 
Authored: Thu Aug 16 18:17:27 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:17:27 2018 -0600

--
 .../pool2/impl/GenericObjectPoolMXBean.java | 74 ++--
 .../pool2/impl/TestGenericObjectPool.java   |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-pool/blob/bbc34c38/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
--
diff --git 
a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java 
b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
index 3b1d9e1..737ea54 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPoolMXBean.java
@@ -33,178 +33,178 @@ import java.util.Set;
 public interface GenericObjectPoolMXBean {
 
 // Getters for basic configuration settings
-
+
 /**
  * See {@link GenericObjectPool#getBlockWhenExhausted()}
  * @return See {@link GenericObjectPool#getBlockWhenExhausted()}
  */
 boolean getBlockWhenExhausted();
-
+
 /**
  * See {@link GenericObjectPool#getLifo()}
  * @return See {@link GenericObjectPool#getLifo()}
  */
 boolean getFairness();
-
+
 /**
  * See {@link GenericObjectPool#getFairness()}
  * @return See {@link GenericObjectPool#getFairness()}
  */
 boolean getLifo();
-
+
 /**
  * See {@link GenericObjectPool#getMaxIdle()}
  * @return See {@link GenericObjectPool#getMaxIdle()}
  */
 int getMaxIdle();
-
+
 /**
  * See {@link GenericObjectPool#getMaxTotal()}
  * @return See {@link GenericObjectPool#getMaxTotal()}
  */
 int getMaxTotal();
-
+
 /**
  * See {@link GenericObjectPool#getMaxWaitMillis()}
  * @return See {@link GenericObjectPool#getMaxWaitMillis()}
  */
 long getMaxWaitMillis();
-
+
 /**
  * See {@link GenericObjectPool#getMinEvictableIdleTimeMillis()}
  * @return See {@link GenericObjectPool#getMinEvictableIdleTimeMillis()}
  */
 long getMinEvictableIdleTimeMillis();
-
+
 /**
  * See {@link GenericObjectPool#getMinIdle()}
  * @return See {@link GenericObjectPool#getMinIdle()}
  */
 int getMinIdle();
-
+
 /**
  * See {@link GenericObjectPool#getNumActive()}
  * @return See {@link GenericObjectPool#getNumActive()}
  */
 int getNumActive();
-
+
 /**
  * See {@link GenericObjectPool#getNumIdle()}
  * @return See {@link GenericObjectPool#getNumIdle()}
  */
 int getNumIdle();
-
+
 /**
  * See {@link GenericObjectPool#getNumTestsPerEvictionRun()}
  * @return See {@link GenericObjectPool#getNumTestsPerEvictionRun()}
  */
 int getNumTestsPerEvictionRun();
-
+
 /**
  * See {@link GenericObjectPool#getTestOnCreate()}
  * @return See {@link GenericObjectPool#getTestOnCreate()}
  * @since 2.2
  */
 boolean getTestOnCreate();
-
+
 /**
  * See {@link GenericObjectPool#getTestOnBorrow()}
  * @return See {@link GenericObjectPool#getTestOnBorrow()}
  */
 boolean getTestOnBorrow();
-
+
 /**
  * See {@link GenericObjectPool#getTestOnReturn()}
  * @return See {@link GenericObjectPool#getTestOnReturn()}
  */
 boolean getTestOnReturn();
-
+
 /**
  * See {@link GenericObjectPool#getTestWhileIdle()}
  * @return See {@link GenericObjectPool#getTestWhileIdle()}
  */
 boolean getTestWhileIdle();
-
+
 /**
  * See {@link GenericObjectPool#getTimeBetweenEvictionRunsMillis()}
  * @return See {@link GenericObjectPool#getTimeBetweenEvictionRunsMillis()}
  */
 long getTimeBetweenEvictionRunsMillis();
-
+
 /**
  * See {@link GenericObjectPool#isClosed()}
  * @return See {@link GenericObjectPool#isClosed()}
  */
 boolean isClosed();
-
+
 // Getters for monitoring attributes
-
+
 /**
  * See {@link GenericObjectPool#getBorrowedCount()}
  * @return See {@link GenericObjectPool#getBorrowedCount()}
  */
 long getBorrowedCount();
-
+
 /**
  * See {@link GenericObjectPool#getReturnedCount()}

commons-dbcp git commit: Use final.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 6b5437590 -> 258371be0


Use final.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/258371be
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/258371be
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/258371be

Branch: refs/heads/master
Commit: 258371be0c31e424ad2392313f15fd126830996c
Parents: 6b54375
Author: Gary Gregory 
Authored: Thu Aug 16 18:07:39 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:07:39 2018 -0600

--
 .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 2 +-
 .../apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java   | 2 +-
 .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java  | 2 +-
 .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java  | 4 ++--
 .../apache/commons/dbcp2/datasources/SharedPoolDataSource.java   | 2 +-
 .../org/apache/commons/dbcp2/managed/TransactionContext.java | 2 +-
 .../apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java  | 2 +-
 .../commons/dbcp2/datasources/TestCPDSConnectionFactory.java | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/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 61f0fda..81c6292 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -741,7 +741,7 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
  */
 @Override
 public synchronized String toString() {
-StringBuilder builder = new StringBuilder(super.toString());
+final StringBuilder builder = new StringBuilder(super.toString());
 builder.append("[description=");
 builder.append(description);
 builder.append(", url=");

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index 5b47add..4849e2e 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -653,7 +653,7 @@ class PooledConnectionImpl
  */
 @Override
 public synchronized String toString() {
-StringBuilder builder = new StringBuilder(super.toString());
+final StringBuilder builder = new StringBuilder(super.toString());
 builder.append("[connection=");
 builder.append(connection);
 builder.append(", delegatingConnection=");

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/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 76bafc2..c71d1de 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -403,7 +403,7 @@ class CPDSConnectionFactory
  */
 @Override
 public synchronized String toString() {
-StringBuilder builder = new StringBuilder(super.toString());
+final StringBuilder builder = new StringBuilder(super.toString());
 builder.append("[cpds=");
 builder.append(cpds);
 builder.append(", validationQuery=");

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java 
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index ccd2be3..1b070cc 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1059,14 +1059,14 @@ public abstract class InstanceKeyDataSource implements 

commons-dbcp git commit: Always use blocks.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 258371be0 -> 91fa2dae7


Always use blocks.

Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/91fa2dae
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/91fa2dae
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/91fa2dae

Branch: refs/heads/master
Commit: 91fa2dae7647558bc68ded9c3e7eb5a1c1846404
Parents: 258371b
Author: Gary Gregory 
Authored: Thu Aug 16 18:08:44 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:08:44 2018 -0600

--
 .../commons/dbcp2/managed/TestPoolableManagedConnection.java   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91fa2dae/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
--
diff --git 
a/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
 
b/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
index 4496dbb..a7414f9 100644
--- 
a/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
+++ 
b/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
@@ -83,10 +83,12 @@ public class TestPoolableManagedConnection {
 
 @After
 public void tearDown() throws SQLException {
-if (conn != null && !conn.isClosed())
+if (conn != null && !conn.isClosed()) {
 conn.close();
-if (pool != null && !pool.isClosed())
+}
+if (pool != null && !pool.isClosed()) {
 pool.close();
+}
 }
 
 @Test

commons-pool git commit: Fix Javadoc nit. Better local var names.

[ggregory]

Repository: commons-pool
Updated Branches:
  refs/heads/master 3feab0942 -> c2dd4c3ea


Fix Javadoc nit. Better local var names.

Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/c2dd4c3e
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/c2dd4c3e
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/c2dd4c3e

Branch: refs/heads/master
Commit: c2dd4c3ea7311b382034fcf301b40c3fc74027fa
Parents: 3feab09
Author: Gary Gregory 
Authored: Thu Aug 16 17:45:41 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 17:45:41 2018 -0600

--
 .../java/org/apache/commons/pool2/impl/EvictionTimer.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-pool/blob/c2dd4c3e/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
--
diff --git a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java 
b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
index 93649fd..2fc9ffd 100644
--- a/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
+++ b/src/main/java/org/apache/commons/pool2/impl/EvictionTimer.java
@@ -108,23 +108,23 @@ class EvictionTimer {
 }
 
 /**
- * Thread factory that creates a thread, with the context classloader from 
this class.
+ * Thread factory that creates a thread, with the context class loader 
from this class.
  */
 private static class EvictorThreadFactory implements ThreadFactory {
 
 @Override
-public Thread newThread(final Runnable r) {
-final Thread t = new Thread(null, r, 
"commons-pool-evictor-thread");
+public Thread newThread(final Runnable runnable) {
+final Thread thread = new Thread(null, runnable, 
"commons-pool-evictor-thread");
 
 AccessController.doPrivileged(new PrivilegedAction() {
 @Override
 public Void run() {
-
t.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
+
thread.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
 return null;
 }
 });
 
-return t;
+return thread;
 }
 }
 }

commons-dbcp git commit: Remove trailing white spaces on all lines.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 8215e0c44 -> 6b5437590


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/6b543759
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/6b543759
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/6b543759

Branch: refs/heads/master
Commit: 6b54375904329efb89c1e1bd2791c5f621608502
Parents: 8215e0c
Author: Gary Gregory 
Authored: Thu Aug 16 18:06:57 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:06:57 2018 -0600

--
 src/main/java/org/apache/commons/dbcp2/Jdbc41Bridge.java   | 2 +-
 .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java| 2 +-
 .../org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +-
 .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java| 2 +-
 .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6b543759/src/main/java/org/apache/commons/dbcp2/Jdbc41Bridge.java
--
diff --git a/src/main/java/org/apache/commons/dbcp2/Jdbc41Bridge.java 
b/src/main/java/org/apache/commons/dbcp2/Jdbc41Bridge.java
index d0a9bf1..caaace9 100644
--- a/src/main/java/org/apache/commons/dbcp2/Jdbc41Bridge.java
+++ b/src/main/java/org/apache/commons/dbcp2/Jdbc41Bridge.java
@@ -27,7 +27,7 @@ import javax.sql.CommonDataSource;
 /**
  * Defines bridge methods to JDBC 4.1 (Java 7) methods to allow call sites to 
operate safely (without
  * {@link AbstractMethodError}) when using a JDBC driver written for JDBC 4.0 
(Java 6).
- * 
+ *
  * @since 2.6.0
  */
 public class Jdbc41Bridge {

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6b543759/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 0171264..61f0fda 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -736,7 +736,7 @@ public class DriverAdapterCPDS implements 
ConnectionPoolDataSource, Referenceabl
 
 /**
  * Does not print the userName and userPassword field nor the 'user' or 
'password' in the connectionProperties.
- * 
+ *
  * @since 2.6.0
  */
 @Override

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6b543759/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index ec35b3b..5b47add 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -649,7 +649,7 @@ class PooledConnectionImpl
 }
 
 /**
- * @since 2.6.0 
+ * @since 2.6.0
  */
 @Override
 public synchronized String toString() {

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6b543759/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 ed9faf8..76bafc2 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -399,7 +399,7 @@ class CPDSConnectionFactory
 }
 
 /**
- * @since 2.6.0 
+ * @since 2.6.0
  */
 @Override
 public synchronized String toString() {

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6b543759/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java 
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index 40ff4d5..ccd2be3 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1055,7 +1055,7 

commons-dbcp git commit: Add missing @since 2.6.0.

[ggregory]

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 3fe15786c -> 8215e0c44


Add missing @since 2.6.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/8215e0c4
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/8215e0c4
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/8215e0c4

Branch: refs/heads/master
Commit: 8215e0c44341bd27d453be77f5258205470792b0
Parents: 3fe1578
Author: Gary Gregory 
Authored: Thu Aug 16 18:06:34 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:06:34 2018 -0600

--
 .../apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java| 3 +++
 .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java   | 3 +++
 .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java   | 3 +++
 3 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8215e0c4/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index 68ac396..ec35b3b 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -648,6 +648,9 @@ class PooledConnectionImpl
 return true;
 }
 
+/**
+ * @since 2.6.0 
+ */
 @Override
 public synchronized String toString() {
 StringBuilder builder = new StringBuilder(super.toString());

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8215e0c4/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 df8f96a..ed9faf8 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -398,6 +398,9 @@ class CPDSConnectionFactory
 }
 }
 
+/**
+ * @since 2.6.0 
+ */
 @Override
 public synchronized String toString() {
 StringBuilder builder = new StringBuilder(super.toString());

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/8215e0c4/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
--
diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java 
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index fb8636b..40ff4d5 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1054,6 +1054,9 @@ public abstract class InstanceKeyDataSource implements 
DataSource, Referenceable
 return cpds;
 }
 
+/**
+ * @since 2.6.0 
+ */
 @Override
 public synchronized String toString() {
 StringBuilder builder = new StringBuilder(super.toString());

commons-pool git commit: Refactor call to startEvictor(1L) (magic number) into a new method stopEvictor(). This makes the intent of the call obvious.

[ggregory]

Repository: commons-pool
Updated Branches:
  refs/heads/master c2dd4c3ea -> 9d92f15b4


Refactor call to startEvictor(1L) (magic number) into a new method
stopEvictor(). This makes the intent of the call obvious.

Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/9d92f15b
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/9d92f15b
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/9d92f15b

Branch: refs/heads/master
Commit: 9d92f15b4384333a6ac826ff83453e0aa0faf405
Parents: c2dd4c3
Author: Gary Gregory 
Authored: Thu Aug 16 18:13:18 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:13:18 2018 -0600

--
 .../org/apache/commons/pool2/impl/BaseGenericObjectPool.java   | 6 ++
 .../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java  | 2 +-
 .../java/org/apache/commons/pool2/impl/GenericObjectPool.java  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-pool/blob/9d92f15b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
--
diff --git 
a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java 
b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
index f06a44b..2cfbefd 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -785,6 +785,12 @@ public abstract class BaseGenericObjectPool extends 
BaseObject {
 }
 
 /**
+ * Stops the evictor.
+ */
+void stopEvitor() {
+startEvictor(-1L);
+}
+/**
  * Tries to ensure that the configured minimum number of idle instances are
  * available in the pool.
  * @throws Exception if an error occurs creating idle instances

http://git-wip-us.apache.org/repos/asf/commons-pool/blob/9d92f15b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
--
diff --git 
a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java 
b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index 3dab36e..72aab16 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -688,7 +688,7 @@ public class GenericKeyedObjectPool extends 
BaseGenericObjectPool
 
 // Stop the evictor before the pool is closed since evict() calls
 // assertOpen()
-startEvictor(-1L);
+stopEvitor();
 
 closed = true;
 // This clear removes any idle objects

http://git-wip-us.apache.org/repos/asf/commons-pool/blob/9d92f15b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
--
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java 
b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index a05038a..0f4b357 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -672,7 +672,7 @@ public class GenericObjectPool extends 
BaseGenericObjectPool
 
 // Stop the evictor before the pool is closed since evict() calls
 // assertOpen()
-startEvictor(-1L);
+stopEvitor();
 
 closed = true;
 // This clear removes any idle objects

commons-pool git commit: Use final.

[ggregory]

Repository: commons-pool
Updated Branches:
  refs/heads/master 9d92f15b4 -> 5b2832931


Use final.

Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/5b283293
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/5b283293
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/5b283293

Branch: refs/heads/master
Commit: 5b2832931a49e17dc227943b09ab94aeea6decd0
Parents: 9d92f15
Author: Gary Gregory 
Authored: Thu Aug 16 18:13:50 2018 -0600
Committer: Gary Gregory 
Committed: Thu Aug 16 18:13:50 2018 -0600

--
 .../org/apache/commons/pool2/impl/BaseGenericObjectPool.java | 2 +-
 .../java/org/apache/commons/pool2/impl/GenericObjectPool.java| 4 ++--
 .../org/apache/commons/pool2/impl/TestGenericObjectPool.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5b283293/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
--
diff --git 
a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java 
b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
index 2cfbefd..8efb01f 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -217,7 +217,7 @@ public abstract class BaseGenericObjectPool extends 
BaseObject {
 this.blockWhenExhausted = blockWhenExhausted;
 }
 
-protected void setConfig(BaseObjectPoolConfig conf) {
+protected void setConfig(final BaseObjectPoolConfig conf) {
 setLifo(conf.getLifo());
 setMaxWaitMillis(conf.getMaxWaitMillis());
 setBlockWhenExhausted(conf.getBlockWhenExhausted());

http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5b283293/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
--
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java 
b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index 0f4b357..abdf7e1 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -822,8 +822,8 @@ public class GenericObjectPool extends 
BaseGenericObjectPool
 localMaxTotal = Integer.MAX_VALUE;
 }
 
-long localStartTimeMillis = System.currentTimeMillis();
-long localMaxWaitTimeMillis = Math.max(getMaxWaitMillis(), 0);
+final long localStartTimeMillis = System.currentTimeMillis();
+final long localMaxWaitTimeMillis = Math.max(getMaxWaitMillis(), 0);
 
 // Flag that indicates if create should:
 // - TRUE:  call the factory to create an object

http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5b283293/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
--
diff --git 
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java 
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index b84924d..a6ee7ff 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -2639,7 +2639,7 @@ public class TestGenericObjectPool extends 
TestBaseObjectPool {
 
 @Test(timeout = 1200 /* maxWaitMillis x2 + padding */)
 public void testReturnBorrowObjectWithingMaxWaitMillis() throws Exception {
-long maxWaitMillis = 500;
+final long maxWaitMillis = 500;
 
 final GenericObjectPool createSlowObjectFactoryPool
 = new GenericObjectPool<>(createSlowObjectFactory(6));
@@ -2657,7 +2657,7 @@ public class TestGenericObjectPool extends 
TestBaseObjectPool {
 try {
 createSlowObjectFactoryPool.borrowObject(maxWaitMillis);
 fail("borrowObject must fail due to timeout by maxWaitMillis");
-} catch (NoSuchElementException e) {
+} catch (final NoSuchElementException e) {
 }
 
 Assert.assertTrue(thread1.isAlive());

[1/3] commons-rng git commit: Number of rerun set to 1 in sampling tests.

[erans]

Repository: commons-rng
Updated Branches:
  refs/heads/master f2586803f -> 74c2b58d3


Number of rerun set to 1 in sampling tests.

Reinstates commit 2a31d8764facb77c8a3c301b0613078df8c93d13.


Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/c54506bd
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/c54506bd
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/c54506bd

Branch: refs/heads/master
Commit: c54506bd2859ae351b108e7b87494652812f9db8
Parents: f258680
Author: Gilles 
Authored: Thu Aug 16 14:23:47 2018 +0200
Committer: Gilles 
Committed: Thu Aug 16 14:23:47 2018 +0200

--
 commons-rng-sampling/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-rng/blob/c54506bd/commons-rng-sampling/pom.xml
--
diff --git a/commons-rng-sampling/pom.xml b/commons-rng-sampling/pom.xml
index f56eec0..90c291a 100644
--- a/commons-rng-sampling/pom.xml
+++ b/commons-rng-sampling/pom.xml
@@ -72,7 +72,7 @@
 maven-surefire-plugin
 2.22.0
 
-  4
+  1
 
   
 

[3/3] commons-rng git commit: RNG-55: Forbid negative dimension.

[erans]

RNG-55: Forbid negative dimension.


Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/74c2b58d
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/74c2b58d
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/74c2b58d

Branch: refs/heads/master
Commit: 74c2b58d321f1cd08e3a9b8f1911bada8008a319
Parents: 8539ccb
Author: Gilles 
Authored: Thu Aug 16 14:52:00 2018 +0200
Committer: Gilles 
Committed: Thu Aug 16 14:52:00 2018 +0200

--
 .../java/org/apache/commons/rng/sampling/UnitSphereSampler.java | 4 
 .../org/apache/commons/rng/sampling/UnitSphereSamplerTest.java  | 5 +
 src/changes/changes.xml | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-rng/blob/74c2b58d/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
--
diff --git 
a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
 
b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
index 46dd474..cbb3785 100644
--- 
a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
+++ 
b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/UnitSphereSampler.java
@@ -40,6 +40,10 @@ public class UnitSphereSampler {
  */
 public UnitSphereSampler(int dimension,
  UniformRandomProvider rng) {
+if (dimension <= 0) {
+throw new IllegalArgumentException("Dimension must be strictly 
positive");
+}
+
 this.dimension = dimension;
 sampler = new ZigguratNormalizedGaussianSampler(rng);
 }

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/74c2b58d/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
--
diff --git 
a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
 
b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
index 2b7ff47..fb4ac08 100644
--- 
a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
+++ 
b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/UnitSphereSamplerTest.java
@@ -25,6 +25,11 @@ import org.apache.commons.rng.UniformRandomProvider;
  * Test for {@link UnitSphereSampler}.
  */
 public class UnitSphereSamplerTest {
+@Test(expected = IllegalArgumentException.class)
+public void testPrecondition() {
+new UnitSphereSampler(0, null);
+}
+
 /**
  * Test the distribution of points in two dimensions.
  */

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/74c2b58d/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2bd1a44..bbb9893 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -68,7 +68,8 @@ It is however not part of the official API and no 
compatibility
 should be expected in subsequent releases.
 ">
   
-"UnitSphereSampler": Prevent returning NaN components.
+"UnitSphereSampler": Prevent returning NaN components and forbid
+negative dimension.
   
 
 

[commons-rng] Git Push Summary

[erans]

Repository: commons-rng
Updated Branches:
  refs/heads/feature__RNG-35 [deleted] c14e09caa