date:20191230

Nexus: Staging Completed

2019-12-30 Thread Nexus Repository Manager

Message from: https://repository.apache.orgDescription:Close Apache Commons Codec 1.14 RC1.Deployer properties:"userAgent" = "Apache-Maven/3.6.3 (Java 1.8.0_231; Windows 10 10.0)""userId" = "ggregory""ip" = "98.180.85.198"Details:The following artifacts have been staged/commons-codec/commons-codec/1.14/commons-codec-1.14-tests.jar.asc(SHA1: ab73e1d8db5f15646d5ce1b007757b5a6e514b85)/commons-codec/commons-codec/1.14/commons-codec-1.14-javadoc.jar.asc(SHA1: aaf5d6845fefe5a043ec1c97715c7b2ce752a919)/commons-codec/commons-codec/1.14/commons-codec-1.14.jar(SHA1: 3cb1181b2141a7e752f5bdc998b7ef1849f726cf)/commons-codec/commons-codec/1.14/commons-codec-1.14-test-sources.jar.asc(SHA1: 2412cdb9948fd1e0df639304435740e74b443e1b)/commons-codec/commons-codec/1.14/commons-codec-1.14.jar.asc(SHA1: dbb1afeeaaf4c3fbc5e7dcfef0994161bc0a7951)/commons-codec/commons-codec/1.14/commons-codec-1.14-tests.jar(SHA1: 6b423a1ba7ca9c7e8d5d382f1146847cf21a0468)/commons-codec/commons-codec/1.14/commons-codec-1.14-test-sources.jar(SHA1: e0a7ec1014f5ba73770acda2bb1bbdc181d32746)/commons-codec/commons-codec/1.14/commons-codec-1.14.pom.asc(SHA1: e4a58956ab39811037976cee9f714a3e27075a7f)/commons-codec/commons-codec/1.14/commons-codec-1.14-sources.jar.asc(SHA1: 02711eeed665c03694e572b21bd433f8abbd9702)/commons-codec/commons-codec/1.14/commons-codec-1.14.pom(SHA1: 3e98fb226cb1c6a9caa5fdb2a522ba42f4ea16d2)/commons-codec/commons-codec/1.14/commons-codec-1.14-sources.jar(SHA1: 674f0614376ac38259b01bcc67189ef240234569)/commons-codec/commons-codec/1.14/commons-codec-1.14-javadoc.jar(SHA1: 5c33943dc2aa74f8831df97dd598007109283635)Action performed by Gary D. Gregory (ggregory)

svn commit: r37409 - in /dev/commons/codec/1.14-RC1: ./ binaries/ site/ site/apidocs/ site/apidocs/org/ site/apidocs/org/apache/ site/apidocs/org/apache/commons/ site/apidocs/org/apache/commons/codec/

2019-12-30 Thread ggregory

Author: ggregory
Date: Tue Dec 31 00:46:03 2019
New Revision: 37409

Log:
Staging release: commons-codec, version: 1.14


[This commit notification would consist of 193 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

[commons-codec] branch release updated (7146c72 -> af7b947)

2019-12-30 Thread ggregory

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

ggregory pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git.


from 7146c72  Prepare for 1.14.
 add af7b947  Update POM version numbers for Apache Commons Codec release 
1.14

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[commons-codec] annotated tag commons-codec-1.14-RC1 created (now c605837)

2019-12-30 Thread ggregory

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

ggregory pushed a change to annotated tag commons-codec-1.14-RC1
in repository https://gitbox.apache.org/repos/asf/commons-codec.git.


  at c605837  (tag)
 tagging af7b94750e2178b8437d9812b28e36ac87a455f2 (commit)
 replaces commons-codec-1.13
  by Gary Gregory
  on Mon Dec 30 19:38:40 2019 -0500

- Log -
Tag Apache Commons Codec release 1.14 RC1
-BEGIN PGP SIGNATURE-

iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAl4KmJEACgkQhv3H4qES
Ysvn8gf/WdBTYiIKlPfC0qqrNDMwljx/iW1uOfUAlkIDfCSGjxWsn/8XFRuAP51f
pv62boGFyiUhqVjuV59fTS1iWZbS/JgiTIewDLouq+bOZN/8HRlpRmJSn3oPIL3w
zBjpGGV9oi0gNhisR2r66HcHSIO3219kc6mimZFXl1Zsr5zg0h3Ctzfo0kvGAWId
dcsk6eJcJLbeoApayThYmFf6KHhXJ4Liuv0eDyP6CqbPyFHr/XDl0QM3MzxGOL3M
G5RiO1BkuycErz2tmn5Fp+UJl43kEDPRc7CDsOc1IKi6sLP4/DeJvHHi8QKNc9qE
hAV5fcMZUOTXlv4gnT+26E/Td+/SFg==
=pMYX
-END PGP SIGNATURE-
---

This annotated tag includes the following new commits:

 new af7b947  Update POM version numbers for Apache Commons Codec release 
1.14

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[commons-codec] 01/01: Update POM version numbers for Apache Commons Codec release 1.14

2019-12-30 Thread ggregory

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

ggregory pushed a commit to annotated tag commons-codec-1.14-RC1
in repository https://gitbox.apache.org/repos/asf/commons-codec.git

commit af7b94750e2178b8437d9812b28e36ac87a455f2
Author: Gary Gregory 
AuthorDate: Mon Dec 30 19:38:13 2019 -0500

Update POM version numbers for Apache Commons Codec release 1.14
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ffa1ff2..08adfcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ limitations under the License.
   commons-codec
   commons-codec
   
-  1.14-SNAPSHOT
+  1.14
   Apache Commons Codec
   2002

[commons-codec] branch release updated (1a30728 -> 7146c72)

2019-12-30 Thread ggregory

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

ggregory pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git.


from 1a30728  [CODEC-278] Deprecate Charset constants in 
org.apache.commons.codec.Charsets in favor of java.nio.charset.StandardCharsets.
 add a387ac8  Test incremental hash with huge length array added to 
unprocessed bytes.
 add 33491ff  Overflow safe position counter in XXHash32.
 add bc82d82  Update the method to get the little-endian int.
 add 88e729e  Test for incremental XXHash32.
 add 08bfd44  Test XXHash32 with huge length array added to unprocessed 
bytes.
 add 4c5b1b7  Add reference file for XXHash32 using a small number of bytes.
 add b46a254  Exclude test resources file from rat check.
 add b542cf9  Merge remote-tracking branch 'origin/release'
 add 150278a  Prepare for 1.14.
 add 5fcf098  Some Checkstyle fixes.
 new 7146c72  Prepare for 1.14.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 RELEASE-NOTES.txt  |  6 ++-
 pom.xml|  3 +-
 src/changes/changes.xml|  2 +-
 .../java/org/apache/commons/codec/Charsets.java| 48 +-
 .../org/apache/commons/codec/binary/Base32.java| 12 ++---
 .../commons/codec/binary/Base32InputStream.java|  6 +--
 .../commons/codec/binary/Base32OutputStream.java   |  6 +--
 .../codec/binary/BaseNCodecInputStream.java|  4 +-
 .../codec/binary/BaseNCodecOutputStream.java   |  6 +--
 .../apache/commons/codec/digest/MurmurHash3.java   |  1 +
 .../org/apache/commons/codec/digest/XXHash32.java  | 49 +-
 .../commons/codec/digest/MurmurHash3Test.java  | 34 +
 .../commons/codec/digest/XXHash32OverflowTest.java | 59 ++
 .../apache/commons/codec/digest/XXHash32Test.java  | 20 
 src/test/resources/small.bin   |  1 +
 15 files changed, 190 insertions(+), 67 deletions(-)
 create mode 100644 
src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
 create mode 100644 src/test/resources/small.bin

[commons-dbutils] branch 2_0 updated: Merge with github.com/wspeirs/sop4j-dbutils

2019-12-30 Thread wspeirs

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

wspeirs pushed a commit to branch 2_0
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git


The following commit(s) were added to refs/heads/2_0 by this push:
 new 180c099  Merge with github.com/wspeirs/sop4j-dbutils
180c099 is described below

commit 180c0990b1f0da4d0039904b68cc6b57f00558e5
Author: William Speirs 
AuthorDate: Mon Dec 30 19:27:42 2019 -0500

Merge with github.com/wspeirs/sop4j-dbutils
---
 .gitignore |   1 +
 pom.xml|  19 +-
 .../apache/commons/dbutils2/AbstractExecutor.java  | 120 -
 .../commons/dbutils2/BaseResultSetHandler.java | 110 +
 .../apache/commons/dbutils2/BasicRowProcessor.java |   2 +-
 .../org/apache/commons/dbutils2/BatchExecutor.java |  69 ++
 .../commons/dbutils2/BatchInsertExecutor.java  |   3 +-
 .../org/apache/commons/dbutils2/BeanProcessor.java |  19 +-
 .../org/apache/commons/dbutils2/EntityUtils.java   | 251 +++
 .../apache/commons/dbutils2/InsertExecutor.java|  10 +-
 .../org/apache/commons/dbutils2/QueryRunner.java   | 273 +
 .../commons/dbutils2/AbstractExecutorTest.java |  14 +-
 .../apache/commons/dbutils2/AsyncExecutorTest.java |   7 +-
 .../dbutils2/BaseResultSetHandlerTestCase.java |   1 -
 .../org/apache/commons/dbutils2/BaseTestCase.java  |   9 +-
 .../commons/dbutils2/BasicRowProcessorTest.java|   3 -
 .../apache/commons/dbutils2/BatchExecutorTest.java |  61 -
 .../commons/dbutils2/BatchInsertExecutorTest.java  |   8 +-
 .../apache/commons/dbutils2/BeanProcessorTest.java |   3 -
 .../org/apache/commons/dbutils2/DbUtilsTest.java   |   1 -
 .../java/org/apache/commons/dbutils2/EnumTest.java |  36 +++
 .../dbutils2/GenerousBeanProcessorTest.java|   2 +-
 .../commons/dbutils2/InsertExecutorTest.java   |  12 +-
 .../org/apache/commons/dbutils2/MockResultSet.java |   4 +-
 .../commons/dbutils2/MockResultSetMetaData.java|   2 -
 .../apache/commons/dbutils2/ProxyFactoryTest.java  |   2 -
 .../apache/commons/dbutils2/QueryExecutorTest.java |   4 +-
 .../apache/commons/dbutils2/QueryLoaderTest.java   |   5 +-
 .../apache/commons/dbutils2/QueryRunnerTest.java   |   3 +-
 .../commons/dbutils2/ResultSetIteratorTest.java|   2 -
 .../java/org/apache/commons/dbutils2/TestBean.java |  14 ++
 .../commons/dbutils2/UpdateExecutorTest.java   |   8 +-
 .../dbutils2/handlers/BeanMapHandlerTest.java  |   4 +-
 .../dbutils2/handlers/ColumnListHandlerTest.java   |   1 -
 .../dbutils2/handlers/KeyedHandlerTest.java|   1 -
 .../commons/dbutils2/handlers/MapHandlerTest.java  |   1 -
 .../dbutils2/handlers/MapListHandlerTest.java  |   1 -
 .../dbutils2/handlers/ScalarHandlerTest.java   |   1 -
 .../wrappers/SqlNullCheckedResultSetTest.java  |   1 -
 .../wrappers/StringTrimmedResultSetTest.java   |   2 -
 40 files changed, 849 insertions(+), 241 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..e420ee4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/*
diff --git a/pom.xml b/pom.xml
index bd7096d..07dacbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,10 +189,27 @@
   Benedikt Ritter
   bene at systemoutprintln dot de
 
-  
+
+  William Speirs
+  bill.spe...@gmail.com
+  
+Java Developer
+  
+
+   
 
   
 
+  javax.persistence
+  javax.persistence-api
+  2.2
+
+
+  commons-beanutils
+  commons-beanutils
+  1.9.4
+
+ 
   junit
   junit
   4.11
diff --git a/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java 
b/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
index 89f99e7..f2356cb 100644
--- a/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
+++ b/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
@@ -38,6 +38,7 @@ import java.util.regex.Pattern;
 abstract class AbstractExecutor> {
 
 private static final String COLON = ":";  // TODO: change this to any 
character
+private static final Pattern PARAM_PATTERN = Pattern.compile("(:\\w+)");
 
 private final Connection conn;
 private final String sql;
@@ -48,13 +49,16 @@ abstract class AbstractExecutor> {
 private int currentPosition = 0;
 
 public AbstractExecutor(final Connection conn, final String sql) throws 
SQLException {
+this(conn, sql, Statement.NO_GENERATED_KEYS);
+}
+
+public AbstractExecutor(final Connection conn, final String sql, final int 
autoGeneratedKeys) throws SQLException {
 this.conn = conn;
 this.sql = sql;
 this.paramPosMap = new HashMap>();
 this.paramValueMap = new HashMap();
 
-final Pattern paramPattern = Pattern.compile("(:\\w+)");
-final Matcher matcher = paramPattern.matcher(sql);
+final Matcher matcher =

[commons-codec] 01/01: Prepare for 1.14.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git

commit 7146c720770171fa4aba5a44abbd4b8cdb7b8e25
Author: Gary Gregory 
AuthorDate: Mon Dec 30 19:32:07 2019 -0500

Prepare for 1.14.
---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e8b30ea..7c95625 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,7 +42,7 @@ The  type attribute can be add,update,fix,remove.
   
   
 
-
+
   Hex: Allow encoding 
read-only ByteBuffer.
   Hex: Only use an 
available ByteBuffer backing array if the length equals the remaining byte 
count.
   MurmurHash3: 
Deprecate hash64 methods and hash methods accepting a String that use the 
default encoding.

[commons-codec] 03/03: Some Checkstyle fixes.

2019-12-30 Thread ggregory

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

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

commit 5fcf0987924255f93445cbb6b0babad6109b608c
Author: Gary Gregory 
AuthorDate: Mon Dec 30 19:30:23 2019 -0500

Some Checkstyle fixes.
---
 .../java/org/apache/commons/codec/Charsets.java| 48 +++---
 .../org/apache/commons/codec/binary/Base32.java| 12 +++---
 .../commons/codec/binary/Base32InputStream.java|  6 +--
 .../commons/codec/binary/Base32OutputStream.java   |  6 +--
 .../codec/binary/BaseNCodecInputStream.java|  4 +-
 .../codec/binary/BaseNCodecOutputStream.java   |  6 +--
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/Charsets.java 
b/src/main/java/org/apache/commons/codec/Charsets.java
index 4a6c42f..8c7d1f5 100644
--- a/src/main/java/org/apache/commons/codec/Charsets.java
+++ b/src/main/java/org/apache/commons/codec/Charsets.java
@@ -64,30 +64,6 @@ public class Charsets {
 //
 
 /**
- * Returns the given Charset or the default Charset if the given Charset 
is null.
- *
- * @param charset
- *A charset or null.
- * @return the given Charset or the default Charset if the given Charset 
is null
- */
-public static Charset toCharset(final Charset charset) {
-return charset == null ? Charset.defaultCharset() : charset;
-}
-
-/**
- * Returns a Charset for the named charset. If the name is null, return 
the default Charset.
- *
- * @param charset
- *The name of the requested charset, may be null.
- * @return a Charset for the named charset
- * @throws java.nio.charset.UnsupportedCharsetException
- * If the named charset is unavailable
- */
-public static Charset toCharset(final String charset) {
-return charset == null ? Charset.defaultCharset() : 
Charset.forName(charset);
-}
-
-/**
  * CharEncodingISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.
  * 
  * Every implementation of the Java platform is required to support this 
character encoding.
@@ -159,4 +135,28 @@ public class Charsets {
  */
 @Deprecated
 public static final Charset UTF_8 = StandardCharsets.UTF_8;
+
+/**
+ * Returns the given Charset or the default Charset if the given Charset 
is null.
+ *
+ * @param charset
+ *A charset or null.
+ * @return the given Charset or the default Charset if the given Charset 
is null
+ */
+public static Charset toCharset(final Charset charset) {
+return charset == null ? Charset.defaultCharset() : charset;
+}
+
+/**
+ * Returns a Charset for the named charset. If the name is null, return 
the default Charset.
+ *
+ * @param charset
+ *The name of the requested charset, may be null.
+ * @return a Charset for the named charset
+ * @throws java.nio.charset.UnsupportedCharsetException
+ * If the named charset is unavailable
+ */
+public static Charset toCharset(final String charset) {
+return charset == null ? Charset.defaultCharset() : 
Charset.forName(charset);
+}
 }
diff --git a/src/main/java/org/apache/commons/codec/binary/Base32.java 
b/src/main/java/org/apache/commons/codec/binary/Base32.java
index bdea48e..99b4b19 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base32.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base32.java
@@ -343,14 +343,14 @@ public class Base32 extends BaseNCodec {
  * octets, using {@link 
org.apache.commons.codec.binary.BaseNCodec.Context#pos Context#pos} as the 
buffer position
  * 
  *
- * @param in byte[] array of ascii data to Base32 decode.
+ * @param input byte[] array of ascii data to Base32 decode.
  * @param inPos Position to start reading data from.
  * @param inAvail Amount of bytes available from input for decoding.
  * @param context the context to be used
  *
  */
 @Override
-void decode(final byte[] in, int inPos, final int inAvail, final Context 
context) {
+void decode(final byte[] input, int inPos, final int inAvail, final 
Context context) {
 // package protected for access from I/O streams
 
 if (context.eof) {
@@ -360,7 +360,7 @@ public class Base32 extends BaseNCodec {
 context.eof = true;
 }
 for (int i = 0; i < inAvail; i++) {
-final byte b = in[inPos++];
+final byte b = input[inPos++];
 if (b == pad) {
 // We're done.
 context.eof = true;
@@ -442,7 +442,7 @@ public class Base32 extends BaseNCodec {
  * remaining bytes (if not multiple of 5).
  * 
  *
- * @param in
+ * @param input
  *byte[] array of binary data to Base32 encode.
  * @param inPos
  *

[commons-codec] 02/03: Prepare for 1.14.

2019-12-30 Thread ggregory

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

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

commit 150278ac71c9f7acd5594e64eb8d14a9cef2a7ca
Author: Gary Gregory 
AuthorDate: Mon Dec 30 18:01:56 2019 -0500

Prepare for 1.14.
---
 RELEASE-NOTES.txt | 6 +-
 pom.xml   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index c24bf74..be92e2d 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,5 +1,5 @@
   Apache Apache Commons Codec 1.14 RELEASE NOTES
-  December 29 2019
+  December 30 2019
 
 The Apache Commons Codec package contains simple encoder and decoders for
 various formats such as Base64 and Hexadecimal.  In addition to these
@@ -24,9 +24,13 @@ o CODEC-259:  Hex: Only use an available ByteBuffer backing 
array if the length
 o CODEC-265:  BaseNCodec to expand buffer using overflow conscious code.
 o CODEC-270:  Base32/64: Fixed decoding check that all the final trailing bits 
to discard are zero.
 o CODEC-269:  Allow repeat calls to MurmurHash3.IncrementalHash32.end() to 
generate the same value.
+o CODEC-276:  Reliance on default encoding in MurmurHash2 and MurmurHash3. 
Thanks to Gary Gregory.
 
 Changes:
 o CODEC-268:  MurmurHash3: Deprecate hash64 methods and hash methods accepting 
a String that use the default encoding.
+o CODEC-277:  Don't reload standard Charsets in 
org.apache.commons.codec.Charsets. Thanks to Gary Gregory.
+o CODEC-278:  Deprecate Charset constants in org.apache.commons.codec.Charsets 
in favor of java.nio.charset.StandardCharsets. Thanks to Gary Gregory.
+
 
 For complete information on Apache Commons Codec, including instructions on 
how to submit bug reports,
 patches, or suggestions for improvement, see the Apache Apache Commons Codec 
website:
diff --git a/pom.xml b/pom.xml
index 08adfcb..ffa1ff2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ limitations under the License.
   commons-codec
   commons-codec
   
-  1.14
+  1.14-SNAPSHOT
   Apache Commons Codec
   2002

[commons-codec] branch master updated (b46a254 -> 5fcf098)

2019-12-30 Thread ggregory

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

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git.


from b46a254  Exclude test resources file from rat check.
 add 2b0fecf  Prepare for releasing 1.14.
 add 627b5fd  Merge branch 'master' into release
 add f3fe3af  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
 add b207c45  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
 add 3397682  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
 add 6f27ca6  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
 add ae0da81  [CODEC-277] Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
 add 5241656  [CODEC-277] Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
 add 84efbac  [CODEC-277] Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
 add 1a30728  [CODEC-278] Deprecate Charset constants in 
org.apache.commons.codec.Charsets in favor of java.nio.charset.StandardCharsets.
 new b542cf9  Merge remote-tracking branch 'origin/release'
 new 150278a  Prepare for 1.14.
 new 5fcf098  Some Checkstyle fixes.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md  |  4 +-
 RELEASE-NOTES.txt  |  6 +-
 src/changes/changes.xml|  4 +-
 .../java/org/apache/commons/codec/Charsets.java| 91 ++
 .../org/apache/commons/codec/binary/Base32.java| 12 +--
 .../commons/codec/binary/Base32InputStream.java|  6 +-
 .../commons/codec/binary/Base32OutputStream.java   |  6 +-
 .../codec/binary/BaseNCodecInputStream.java|  4 +-
 .../codec/binary/BaseNCodecOutputStream.java   |  6 +-
 .../java/org/apache/commons/codec/binary/Hex.java  |  7 +-
 .../apache/commons/codec/binary/StringUtils.java   | 53 ++---
 .../org/apache/commons/codec/digest/Crypt.java |  5 +-
 .../org/apache/commons/codec/digest/Md5Crypt.java  | 11 ++-
 .../apache/commons/codec/digest/MurmurHash2.java   | 24 +++---
 .../apache/commons/codec/digest/MurmurHash3.java   | 37 -
 .../org/apache/commons/codec/digest/Sha2Crypt.java |  5 +-
 .../org/apache/commons/codec/digest/UnixCrypt.java |  7 +-
 .../java/org/apache/commons/codec/net/BCodec.java  |  4 +-
 .../java/org/apache/commons/codec/net/QCodec.java  |  4 +-
 .../commons/codec/net/QuotedPrintableCodec.java|  7 +-
 src/site/xdoc/download_codec.xml   | 26 +++
 .../org/apache/commons/codec/CharsetsTest.java |  7 ++
 .../apache/commons/codec/binary/Base32Test.java|  4 +-
 .../commons/codec/binary/Base64Codec13Test.java|  4 +-
 .../apache/commons/codec/binary/Base64Test.java|  4 +-
 .../commons/codec/binary/BinaryCodecTest.java  |  4 +-
 .../org/apache/commons/codec/binary/HexTest.java   |  5 +-
 .../apache/commons/codec/digest/Apr1CryptTest.java |  6 +-
 .../apache/commons/codec/digest/Md5CryptTest.java  |  4 +-
 .../commons/codec/digest/MurmurHash3Test.java  |  9 ++-
 .../commons/codec/digest/Sha256CryptTest.java  | 16 ++--
 .../commons/codec/digest/Sha512CryptTest.java  | 12 +--
 .../apache/commons/codec/digest/UnixCryptTest.java |  5 +-
 .../codec/net/QuotedPrintableCodecTest.java|  8 +-
 .../org/apache/commons/codec/net/URLCodecTest.java |  8 +-
 35 files changed, 216 insertions(+), 209 deletions(-)

[commons-codec] 01/03: Merge remote-tracking branch 'origin/release'

2019-12-30 Thread ggregory

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

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

commit b542cf9d098e65a78b71e5671bf700610b03dc07
Merge: b46a254 1a30728
Author: Gary Gregory 
AuthorDate: Mon Dec 30 17:59:01 2019 -0500

Merge remote-tracking branch 'origin/release'

 README.md  |  4 +-
 pom.xml|  2 +-
 src/changes/changes.xml|  4 +-
 .../java/org/apache/commons/codec/Charsets.java| 43 --
 .../java/org/apache/commons/codec/binary/Hex.java  |  7 +--
 .../apache/commons/codec/binary/StringUtils.java   | 53 +++---
 .../org/apache/commons/codec/digest/Crypt.java |  5 +-
 .../org/apache/commons/codec/digest/Md5Crypt.java  | 11 ++---
 .../apache/commons/codec/digest/MurmurHash2.java   | 24 +-
 .../apache/commons/codec/digest/MurmurHash3.java   | 37 +++
 .../org/apache/commons/codec/digest/Sha2Crypt.java |  5 +-
 .../org/apache/commons/codec/digest/UnixCrypt.java |  7 ++-
 .../java/org/apache/commons/codec/net/BCodec.java  |  4 +-
 .../java/org/apache/commons/codec/net/QCodec.java  |  4 +-
 .../commons/codec/net/QuotedPrintableCodec.java|  7 +--
 src/site/xdoc/download_codec.xml   | 26 +--
 .../org/apache/commons/codec/CharsetsTest.java |  7 +++
 .../apache/commons/codec/binary/Base32Test.java|  4 +-
 .../commons/codec/binary/Base64Codec13Test.java|  4 +-
 .../apache/commons/codec/binary/Base64Test.java|  4 +-
 .../commons/codec/binary/BinaryCodecTest.java  |  4 +-
 .../org/apache/commons/codec/binary/HexTest.java   |  5 +-
 .../apache/commons/codec/digest/Apr1CryptTest.java |  6 +--
 .../apache/commons/codec/digest/Md5CryptTest.java  |  4 +-
 .../commons/codec/digest/MurmurHash3Test.java  |  9 ++--
 .../commons/codec/digest/Sha256CryptTest.java  | 16 +++
 .../commons/codec/digest/Sha512CryptTest.java  | 12 ++---
 .../apache/commons/codec/digest/UnixCryptTest.java |  5 +-
 .../codec/net/QuotedPrintableCodecTest.java|  8 ++--
 .../org/apache/commons/codec/net/URLCodecTest.java |  8 ++--
 30 files changed, 171 insertions(+), 168 deletions(-)

[commons-codec] branch master updated: Exclude test resources file from rat check.

2019-12-30 Thread aherbert

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

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


The following commit(s) were added to refs/heads/master by this push:
 new b46a254  Exclude test resources file from rat check.
b46a254 is described below

commit b46a254edaa0952421a3b22ae27bde3211ca39c9
Author: Alex Herbert 
AuthorDate: Mon Dec 30 22:20:21 2019 +

Exclude test resources file from rat check.
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 3cfac9d..ffa1ff2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,6 +281,7 @@ limitations under the License.
   
 src/test/resources/bla.tar.xz
 src/test/resources/empty.bin
+src/test/resources/small.bin

[commons-codec] 02/05: Update the method to get the little-endian int.

2019-12-30 Thread aherbert

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

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

commit bc82d82d2a70200f5c7a084908f3587fbe8cc204
Author: Alex Herbert 
AuthorDate: Mon Dec 30 21:43:31 2019 +

Update the method to get the little-endian int.

The previous version used a generic method for variable length bytes
always with a fixed length of 4.
---
 .../org/apache/commons/codec/digest/XXHash32.java  | 31 --
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/XXHash32.java 
b/src/main/java/org/apache/commons/codec/digest/XXHash32.java
index 0fce378..140d08b 100644
--- a/src/main/java/org/apache/commons/codec/digest/XXHash32.java
+++ b/src/main/java/org/apache/commons/codec/digest/XXHash32.java
@@ -162,8 +162,18 @@ public class XXHash32 implements Checksum {
 return hash & 0xl;
 }
 
+/**
+ * Gets the little-endian int from 4 bytes starting at the specified index.
+ *
+ * @param buffer The data
+ * @param idx The index
+ * @return The little-endian int
+ */
 private static int getInt(final byte[] buffer, final int idx) {
-return (int) (fromLittleEndian(buffer, idx, 4) & 0xl);
+return ((buffer[idx] & 0xff)  ) |
+   ((buffer[idx + 1] & 0xff) <<  8) |
+   ((buffer[idx + 2] & 0xff) << 16) |
+   ((buffer[idx + 3] & 0xff) << 24);
 }
 
 private void initializeState() {
@@ -192,23 +202,4 @@ public class XXHash32 implements Checksum {
 
 stateUpdated = true;
 }
-
-/**
- * Reads the given byte array as a little endian long.
- * @param bytes the byte array to convert
- * @param off the offset into the array that starts the value
- * @param length the number of bytes representing the value
- * @return the number read
- * @throws IllegalArgumentException if len is bigger than eight
- */
-private static long fromLittleEndian(final byte[] bytes, final int off, 
final int length) {
-if (length > 8) {
-throw new IllegalArgumentException("can't read more than eight 
bytes into a long value");
-}
-long l = 0;
-for (int i = 0; i < length; i++) {
-l |= (bytes[off + i] & 0xffl) << (8 * i);
-}
-return l;
-}
 }

[commons-codec] 05/05: Add reference file for XXHash32 using a small number of bytes.

2019-12-30 Thread aherbert

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

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

commit 4c5b1b745dad5176b27ab3f305553a19db535fa0
Author: Alex Herbert 
AuthorDate: Mon Dec 30 22:17:22 2019 +

Add reference file for XXHash32 using a small number of bytes.

This hits the edge cases for completing the hash with leftover bytes and
no processing in the main update method.
---
 src/test/java/org/apache/commons/codec/digest/XXHash32Test.java | 2 ++
 src/test/resources/small.bin| 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java 
b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
index 07c5ce7..c3a5fbf 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
@@ -61,8 +61,10 @@ public class XXHash32Test {
 public static Collection factory() {
 return Arrays.asList(new Object[][] {
 // reference checksums created with xxh32sum
+// http://cyan4973.github.io/xxHash/
 { "bla.tar", "fbb5c8d1" },
 { "bla.tar.xz", "4106a208" },
+{ "small.bin", "f66c26f8" },
 });
 }
 
diff --git a/src/test/resources/small.bin b/src/test/resources/small.bin
new file mode 100644
index 000..56dda0f
--- /dev/null
+++ b/src/test/resources/small.bin
@@ -0,0 +1 @@
+��4e�cǗJ�
\ No newline at end of file

[commons-codec] branch master updated (a387ac8 -> 4c5b1b7)

2019-12-30 Thread aherbert

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

aherbert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git.


from a387ac8  Test incremental hash with huge length array added to 
unprocessed bytes.
 new 33491ff  Overflow safe position counter in XXHash32.
 new bc82d82  Update the method to get the little-endian int.
 new 88e729e  Test for incremental XXHash32.
 new 08bfd44  Test XXHash32 with huge length array added to unprocessed 
bytes.
 new 4c5b1b7  Add reference file for XXHash32 using a small number of bytes.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/commons/codec/digest/XXHash32.java  | 49 +-
 .../commons/codec/digest/XXHash32OverflowTest.java | 59 ++
 .../apache/commons/codec/digest/XXHash32Test.java  | 20 
 src/test/resources/small.bin   |  1 +
 4 files changed, 106 insertions(+), 23 deletions(-)
 create mode 100644 
src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
 create mode 100644 src/test/resources/small.bin

[commons-codec] 01/05: Overflow safe position counter in XXHash32.

2019-12-30 Thread aherbert

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

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

commit 33491ff84299cc1a48031fba066e6e69f21e1861
Author: Alex Herbert 
AuthorDate: Mon Dec 30 21:40:17 2019 +

Overflow safe position counter in XXHash32.
---
 .../java/org/apache/commons/codec/digest/XXHash32.java | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/XXHash32.java 
b/src/main/java/org/apache/commons/codec/digest/XXHash32.java
index 0d81e0a..0fce378 100644
--- a/src/main/java/org/apache/commons/codec/digest/XXHash32.java
+++ b/src/main/java/org/apache/commons/codec/digest/XXHash32.java
@@ -55,6 +55,8 @@ public class XXHash32 implements Checksum {
 
 private int totalLen;
 private int pos;
+/** Set to true when the state array has been updated since the last 
reset. */
+private boolean stateUpdated;
 
 /**
  * Creates an XXHash32 instance with a seed of 0.
@@ -77,6 +79,7 @@ public class XXHash32 implements Checksum {
 initializeState();
 totalLen = 0;
 pos = 0;
+stateUpdated = false;
 }
 
 @Override
@@ -94,12 +97,16 @@ public class XXHash32 implements Checksum {
 
 final int end = off + len;
 
-if (pos + len < BUF_SIZE) {
+// Check if the unprocessed bytes and new bytes can fill a block of 16.
+// Make this overflow safe in the event that len is Integer.MAX_VALUE.
+// Equivalent to: (pos + len < BUF_SIZE)
+if (pos + len - BUF_SIZE < 0) {
 System.arraycopy(b, off, buffer, pos, len);
 pos += len;
 return;
 }
 
+// Process left-over bytes with new bytes
 if (pos > 0) {
 final int size = BUF_SIZE - pos;
 System.arraycopy(b, off, buffer, pos, size);
@@ -113,22 +120,27 @@ public class XXHash32 implements Checksum {
 off += BUF_SIZE;
 }
 
+// Handle left-over bytes
 if (off < end) {
 pos = end - off;
 System.arraycopy(b, off, buffer, 0, pos);
+} else {
+pos = 0;
 }
 }
 
 @Override
 public long getValue() {
 int hash;
-if (totalLen > BUF_SIZE) {
+if (stateUpdated) {
+// Hash with the state
 hash =
 rotateLeft(state[0],  1) +
 rotateLeft(state[1],  7) +
 rotateLeft(state[2], 12) +
 rotateLeft(state[3], 18);
 } else {
+// Hash using the original seed from position 2
 hash = state[2] + PRIME5;
 }
 hash += totalLen;
@@ -178,7 +190,7 @@ public class XXHash32 implements Checksum {
 state[2] = s2;
 state[3] = s3;
 
-pos = 0;
+stateUpdated = true;
 }
 
 /**

[commons-codec] 04/05: Test XXHash32 with huge length array added to unprocessed bytes.

2019-12-30 Thread aherbert

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

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

commit 08bfd445e88464a0d1b3de1f01f0f5903be2118f
Author: Alex Herbert 
AuthorDate: Mon Dec 30 21:58:16 2019 +

Test XXHash32 with huge length array added to unprocessed bytes.
---
 .../commons/codec/digest/XXHash32OverflowTest.java | 59 ++
 1 file changed, 59 insertions(+)

diff --git 
a/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java 
b/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
new file mode 100644
index 000..6e53e8e
--- /dev/null
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.commons.codec.digest;
+
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+
+public class XXHash32OverflowTest {
+
+/**
+ * This test hits an edge case where a very large number of bytes is added 
to the incremental
+ * hash. The data is constructed so that an integer counter of unprocessed 
bytes will
+ * overflow. If this is not handled correctly then the code throws an 
exception when it
+ * copies more data into the unprocessed bytes array.
+ */
+@Test
+public void testIncrementalHashWithUnprocessedBytesAndHugeLengthArray() {
+// Assert the test precondition that a large array added to 
unprocessed bytes
+// will overflow an integer counter. We use the smallest hugeLength 
possible
+// as some VMs cannot allocate maximum length arrays.
+final int bufferSize = 16;
+final int unprocessedSize = bufferSize - 1;
+final int hugeLength = Integer.MAX_VALUE - (unprocessedSize - 1);
+Assert.assertTrue("This should overflow to negative", unprocessedSize 
+ hugeLength < bufferSize);
+
+// Check the test can be run
+byte[] bytes = null;
+try {
+bytes = new byte[hugeLength];
+} catch (OutOfMemoryError ignore) {
+// Some VMs cannot allocate an array this large.
+// Some test environments may not have enough available memory for 
this.
+}
+Assume.assumeTrue("Cannot allocate array of length " + hugeLength, 
bytes != null);
+
+final XXHash32 inc = new XXHash32();
+// Add bytes that should be unprocessed
+inc.update(bytes, 0, unprocessedSize);
+// Add a huge number of bytes to overflow an integer counter of 
unprocessed bytes.
+inc.update(bytes, 0, hugeLength);
+}
+}

[commons-codec] 03/05: Test for incremental XXHash32.

2019-12-30 Thread aherbert

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

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

commit 88e729ecddb4869b61c19f06623d19d347c4e42b
Author: Alex Herbert 
AuthorDate: Mon Dec 30 21:51:25 2019 +

Test for incremental XXHash32.
---
 .../org/apache/commons/codec/digest/XXHash32Test.java  | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java 
b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
index acae79b..07c5ce7 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
@@ -76,6 +76,24 @@ public class XXHash32Test {
 Assert.assertEquals("checksum for " + file.getName(), 
expectedChecksum, Long.toHexString(h.getValue()));
 }
 
+@Test
+public void verifyIncrementalChecksum() throws IOException {
+final XXHash32 h = new XXHash32();
+try (final FileInputStream s = new FileInputStream(file)) {
+final byte[] b = toByteArray(s);
+// Hit the case where the hash should be reset
+h.update(b[0]);
+h.reset();
+// Pass in chunks
+h.update(b[0]);
+h.update(b, 1, b.length - 2);
+h.update(b, b.length - 1, 1);
+// Check the hash ignores negative length
+h.update(b, 0, -1);
+}
+Assert.assertEquals("checksum for " + file.getName(), 
expectedChecksum, Long.toHexString(h.getValue()));
+}
+
 private static byte[] toByteArray(final InputStream input) throws 
IOException {
 final ByteArrayOutputStream output = new ByteArrayOutputStream();
 copy(input, output, 10240);

[commons-dbutils] branch master updated: Remove change record noting breaking change since that was reverted.

2019-12-30 Thread thecarlhall

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

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


The following commit(s) were added to refs/heads/master by this push:
 new ff4b778  Remove change record noting breaking change since that was 
reverted.
ff4b778 is described below

commit ff4b7787add25f543aad39e802e6376480a49837
Author: Carl Hall 
AuthorDate: Mon Dec 30 14:00:33 2019 -0800

Remove change record noting breaking change since that was reverted.
---
 src/changes/changes.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9eaca99..670e321 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,9 +45,6 @@ The  type attribute can be add,update,fix,remove.
   
 
 
-  
-[BREAKING] Reduced visibility of data source to private in parent of 
QueryRunner. This has been deprecated since 2012 in rev=c500789f.
-  
   
 Java 1.7 now required. clirr, checkstyle, and spotbugs configured as 
part of default build.

[commons-dbutils] 02/02: Revert field from private to protected to maintain binary compatibility in the next release. This was the only breaking change.

2019-12-30 Thread thecarlhall

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

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

commit de717d9f619df58efa7a4f0e1b5b82db9e7842ad
Author: Carl Hall 
AuthorDate: Mon Dec 30 13:54:30 2019 -0800

Revert field from private to protected to maintain binary compatibility
in the next release. This was the only breaking change.
---
 src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java 
b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
index f7e5faa..b02bb38 100644
--- a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
+++ b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
@@ -48,8 +48,10 @@ public abstract class AbstractQueryRunner {
 
 /**
  * The DataSource to retrieve connections from.
+ * @deprecated Access to this field should be through {@link 
#getDataSource()}.
  */
-private final DataSource ds;
+@Deprecated
+protected final DataSource ds;
 
 /**
  * Configuration to use when preparing statements.

[commons-dbutils] 01/02: Update versions and maven prereq based on versions scan. Remove deprecated property from checkstyle config https://github.com/checkstyle/checkstyle/issues/7329

2019-12-30 Thread thecarlhall

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

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

commit d68ea02cb96adeaa04e43719e56d475b82ac1f35
Author: Carl Hall 
AuthorDate: Sun Dec 29 21:21:59 2019 -0800

Update versions and maven prereq based on versions scan.
Remove deprecated property from checkstyle config
https://github.com/checkstyle/checkstyle/issues/7329
---
 checkstyle.xml | 1 -
 pom.xml| 8 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index d5c2748..487384f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -91,7 +91,6 @@
   
   
   
-  
   
   
   
diff --git a/pom.xml b/pom.xml
index cf3db32..09d5396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,10 @@
 https://issues.apache.org/jira/browse/DBUTILS
   
 
+  
+3.3.9
+  
+
   
 scm:git:git://git.apache.org/commons-dbutils.git
 
scm:git:https://gitbox.apache.org/repos/asf/commons-dbutils.git
@@ -238,8 +242,8 @@
 1.7
 1.7
 
-3.1.12
-8.27
+3.1.12.2
+8.28
 
 
 
false

[commons-dbutils] branch master updated (dd3cd5d -> de717d9)

2019-12-30 Thread thecarlhall

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

thecarlhall pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git.


from dd3cd5d  Duplicate travis-jacoco profile to force dependency on 
jaxb-api to solve build with coveralls
 new d68ea02  Update versions and maven prereq based on versions scan. 
Remove deprecated property from checkstyle config 
https://github.com/checkstyle/checkstyle/issues/7329
 new de717d9  Revert field from private to protected to maintain binary 
compatibility in the next release. This was the only breaking change.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 checkstyle.xml| 1 -
 pom.xml   | 8 ++--
 src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

[commons-lang] branch master updated: Checkstyle: Remove trailing white spaces on all lines.

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e4e7de4  Checkstyle: Remove trailing white spaces on all lines.
 new 2a3c56e  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/commons-lang.git
e4e7de4 is described below

commit e4e7de4df9e91b31f58eab1a3cc98b69b0875e95
Author: Gary Gregory 
AuthorDate: Mon Dec 30 16:26:12 2019 -0500

Checkstyle: Remove trailing white spaces on all lines.
---
 src/main/java/org/apache/commons/lang3/ArrayUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java 
b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index f719644..c581389 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -159,14 +159,14 @@ public class ArrayUtils {
 
 /**
  * An empty immutable {@code Throwable} array.
- * 
+ *
  * @since 3.10
  */
 public static final Throwable[] EMPTY_THROWABLE_ARRAY = new Throwable[0];
 
 /**
  * An empty immutable {@code Type} array.
- * 
+ *
  * @since 3.10
  */
 public static final Type[] EMPTY_TYPE_ARRAY = new Type[0];

[commons-lang] branch master updated (5ac6433 -> b2a0ac7)

2019-12-30 Thread pascalschumacher

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

pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git.


from 5ac6433  [LANG-1506] Allow a StopWatch to carry an optional message.
 new 94b0752  ArrayUtils: Fix checkstyle violation.
 new b2a0ac7  ArrayUtils: Remove stray comment.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/java/org/apache/commons/lang3/ArrayUtils.java | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

[commons-lang] 02/02: ArrayUtils: Remove stray comment.

2019-12-30 Thread pascalschumacher

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

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

commit b2a0ac79b6281e2cf8274548277dbda9a5db6710
Author: pascalschumacher 
AuthorDate: Mon Dec 30 22:16:26 2019 +0100

ArrayUtils: Remove stray comment.
---
 src/main/java/org/apache/commons/lang3/ArrayUtils.java | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java 
b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index c581389..3cfe46e 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -205,10 +205,6 @@ public class ArrayUtils {
 return newArray;
 }
 
-
-// NOTE: Cannot use {@code} to enclose text which includes {}, but 
 is OK
-
-
 /**
  * Inserts the specified element at the specified position in the array.
  * Shifts the element currently at that position (if any) and any 
subsequent

[commons-lang] 01/02: ArrayUtils: Fix checkstyle violation.

2019-12-30 Thread pascalschumacher

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

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

commit 94b0752726efd33f5a20b4240ef09fea52c9624b
Author: pascalschumacher 
AuthorDate: Mon Dec 30 22:14:08 2019 +0100

ArrayUtils: Fix checkstyle violation.
---
 src/main/java/org/apache/commons/lang3/ArrayUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java 
b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index f719644..c581389 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -159,14 +159,14 @@ public class ArrayUtils {
 
 /**
  * An empty immutable {@code Throwable} array.
- * 
+ *
  * @since 3.10
  */
 public static final Throwable[] EMPTY_THROWABLE_ARRAY = new Throwable[0];
 
 /**
  * An empty immutable {@code Type} array.
- * 
+ *
  * @since 3.10
  */
 public static final Type[] EMPTY_TYPE_ARRAY = new Type[0];

[commons-codec] branch master updated: Test incremental hash with huge length array added to unprocessed bytes.

2019-12-30 Thread aherbert

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a387ac8  Test incremental hash with huge length array added to 
unprocessed bytes.
a387ac8 is described below

commit a387ac85030cf161b41472212dafc41e85fc393f
Author: Alex Herbert 
AuthorDate: Mon Dec 30 20:52:22 2019 +

Test incremental hash with huge length array added to unprocessed bytes.
---
 .../apache/commons/codec/digest/MurmurHash3.java   |  1 +
 .../commons/codec/digest/MurmurHash3Test.java  | 34 ++
 2 files changed, 35 insertions(+)

diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index 4509a8f..eeab953 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -1068,6 +1068,7 @@ public final class MurmurHash3 {
 
 // Check if the unprocessed bytes and new bytes can fill a block 
of 4.
 // Make this overflow safe in the event that length is 
Integer.MAX_VALUE.
+// Equivalent to: (unprocessedLength + length < BLOCK_SIZE)
 if (unprocessedLength + length - BLOCK_SIZE < 0) {
 // Not enough so add to the unprocessed bytes
 System.arraycopy(data, offset, unprocessed, unprocessedLength, 
length);
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java 
b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
index 61df7f2..1d6ccf3 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
@@ -18,6 +18,7 @@
 package org.apache.commons.codec.digest;
 
 import org.junit.Assert;
+import org.junit.Assume;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -890,4 +891,37 @@ public class MurmurHash3Test {
 }
 return Arrays.copyOf(blocks, count);
 }
+
+/**
+ * This test hits an edge case where a very large number of bytes is added 
to the incremental
+ * hash. The data is constructed so that an integer counter of unprocessed 
bytes will
+ * overflow. If this is not handled correctly then the code throws an 
exception when it
+ * copies more data into the unprocessed bytes array.
+ */
+@Test
+public void testIncrementalHashWithUnprocessedBytesAndHugeLengthArray() {
+// Assert the test precondition that a large array added to 
unprocessed bytes
+// will overflow an integer counter. We use the smallest hugeLength 
possible
+// as some VMs cannot allocate maximum length arrays.
+final int unprocessedSize = 3;
+final int hugeLength = Integer.MAX_VALUE - 2;
+Assert.assertTrue("This should overflow to negative", unprocessedSize 
+ hugeLength < 4);
+
+// Check the test can be run
+byte[] bytes = null;
+try {
+bytes = new byte[hugeLength];
+} catch (OutOfMemoryError ignore) {
+// Some VMs cannot allocate an array this large.
+// Some test environments may not have enough available memory for 
this.
+}
+Assume.assumeTrue("Cannot allocate array of length " + hugeLength, 
bytes != null);
+
+final IncrementalHash32x86 inc = new IncrementalHash32x86();
+inc.start(0);
+// Add bytes that should be unprocessed
+inc.add(bytes, 0, unprocessedSize);
+// Add a huge number of bytes to overflow an integer counter of 
unprocessed bytes.
+inc.add(bytes, 0, hugeLength);
+}
 }

[commons-lang] branch master updated: [LANG-1506] Allow a StopWatch to carry an optional message.

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 5ac6433  [LANG-1506] Allow a StopWatch to carry an optional message.
5ac6433 is described below

commit 5ac643368ddeb928af0e7cf8705b52b9beb31053
Author: Gary Gregory 
AuthorDate: Mon Dec 30 14:53:22 2019 -0500

[LANG-1506] Allow a StopWatch to carry an optional message.
---
 src/changes/changes.xml|  1 +
 .../org/apache/commons/lang3/time/StopWatch.java   | 50 ++--
 .../apache/commons/lang3/time/StopWatchTest.java   | 92 --
 3 files changed, 131 insertions(+), 12 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d6983cc..a204b07 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -88,6 +88,7 @@ The  type attribute can be add,update,fix,remove.
 Functions Javadoc #466.
 Add factory methods to Pair classes with Map.Entry input. 
#454.
 Add StopWatch convenience APIs to format times and create a simple 
instance.
+Allow a StopWatch to carry an optional message.
   
 
   
diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java 
b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index 2b6a7ed..3be7545 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -17,8 +17,11 @@
 
 package org.apache.commons.lang3.time;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * 
  * {@code StopWatch} provides a convenient API for timings.
@@ -185,6 +188,13 @@ public class StopWatch {
 }
 
 /**
+ * A message for string presentation.
+ *
+ * @since 3.10
+ */
+private final String message;
+
+/**
  * The current running state of the StopWatch.
  */
 private State runningState = State.UNSTARTED;
@@ -217,7 +227,18 @@ public class StopWatch {
  * 
  */
 public StopWatch() {
-super();
+this(null);
+}
+
+/**
+ * 
+ * Constructor.
+ * 
+ * @param message A message for string presentation.
+ * @since 3.10
+ */
+public StopWatch(final String message) {
+this.message = message;
 }
 
 /**
@@ -241,6 +262,16 @@ public class StopWatch {
 }
 
 /**
+ * Gets the message for string presentation.
+ *
+ * @return the message for string presentation.
+ * @since 3.10
+ */
+public String getMessage() {
+return message;
+}
+
+/**
  * 
  * Gets the time on the stopwatch in nanoseconds.
  * 
@@ -264,7 +295,6 @@ public class StopWatch {
 throw new RuntimeException("Illegal running state has occurred.");
 }
 
-
 /**
  * 
  * Gets the split time on the stopwatch in nanoseconds.
@@ -409,7 +439,6 @@ public class StopWatch {
 this.runningState = State.UNSTARTED;
 this.splitState = SplitState.UNSPLIT;
 }
-
 /**
  * 
  * Resumes the stopwatch after a suspend.
@@ -430,6 +459,7 @@ public class StopWatch {
 this.startTime += System.nanoTime() - this.stopTime;
 this.runningState = State.RUNNING;
 }
+
 /**
  * 
  * Splits the time.
@@ -524,14 +554,17 @@ public class StopWatch {
  * 
  *
  * 
- * The format used is ISO 8601-like, 
hours:minutes:seconds.milliseconds.
+ * The format used is ISO 8601-like, [message 
]hours:minutes:seconds.milliseconds.
  * 
  *
  * @return the split time as a String
  * @since 2.1
+ * @since 3.10 Returns the prefix {@code "message "} if the message is set.
  */
 public String toSplitString() {
-return DurationFormatUtils.formatDurationHMS(getSplitTime());
+final String msgStr = Objects.toString(message, StringUtils.EMPTY);
+final String formattedTime = formatSplitTime();
+return msgStr.isEmpty() ? formattedTime : msgStr + StringUtils.SPACE + 
formattedTime;
 }
 
 /**
@@ -540,14 +573,17 @@ public class StopWatch {
  * 
  *
  * 
- * The format used is ISO 8601-like, 
hours:minutes:seconds.milliseconds.
+ * The format used is ISO 8601-like, [message 
]hours:minutes:seconds.milliseconds.
  * 
  *
  * @return the time as a String
+ * @since 3.10 Returns the prefix {@code "message "} if the message is set.
  */
 @Override
 public String toString() {
-return DurationFormatUtils.formatDurationHMS(getTime());
+final String msgStr = Objects.toString(message, StringUtils.EMPTY);
+final String formattedTime = formatTime();
+return msgStr.isEmpty() ? formattedTime : msgStr + StringUtils.SPACE + 
formattedTime;
 }
 
 /**
diff --git

[commons-lang] branch master updated: [LANG-1505] Add StopWatch convenience APIs to format times and create a simple instance.

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a914a26  [LANG-1505] Add StopWatch convenience APIs to format times 
and create a simple instance.
a914a26 is described below

commit a914a268ba9c3ddc852bcfb0da680ae1103072dd
Author: Gary Gregory 
AuthorDate: Mon Dec 30 14:06:28 2019 -0500

[LANG-1505] Add StopWatch convenience APIs to format times and create a
simple instance.
---
 src/changes/changes.xml|  1 +
 .../org/apache/commons/lang3/time/StopWatch.java   | 31 ++
 .../apache/commons/lang3/time/StopWatchTest.java   | 15 +++
 3 files changed, 47 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b414aa8..d6983cc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -87,6 +87,7 @@ The  type attribute can be add,update,fix,remove.
 BooleanUtils Javadoc #469.
 Functions Javadoc #466.
 Add factory methods to Pair classes with Map.Entry input. 
#454.
+Add StopWatch convenience APIs to format times and create a simple 
instance.
   
 
   
diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java 
b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index 3936b82..2b6a7ed 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -161,6 +161,17 @@ public class StopWatch {
 private static final long NANO_2_MILLIS = 100L;
 
 /**
+ * Creates a stopwatch for convenience.
+ *
+ * @return StopWatch a stopwatch.
+ *
+ * @since 3.10
+ */
+public static StopWatch create() {
+return new StopWatch();
+}
+
+/**
  * Creates a started stopwatch for convenience.
  *
  * @return StopWatch a stopwatch that's already been started.
@@ -210,6 +221,26 @@ public class StopWatch {
 }
 
 /**
+ * Returns the time formatted by {@link 
DurationFormatUtils#formatDurationHMS}.
+ *
+ * @return the time formatted by {@link 
DurationFormatUtils#formatDurationHMS}.
+ * @since 3.10
+ */
+public String formatSplitTime() {
+return DurationFormatUtils.formatDurationHMS(getSplitTime());
+}
+
+/**
+ * Returns the split time formatted by {@link 
DurationFormatUtils#formatDurationHMS}.
+ *
+ * @return the split time formatted by {@link 
DurationFormatUtils#formatDurationHMS}.
+ * @since 3.10
+ */
+public String formatTime() {
+return DurationFormatUtils.formatDurationHMS(getTime());
+}
+
+/**
  * 
  * Gets the time on the stopwatch in nanoseconds.
  * 
diff --git a/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java 
b/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
index b3bf035..d88eca6 100644
--- a/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
@@ -17,6 +17,7 @@
 package org.apache.commons.lang3.time;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -145,6 +146,20 @@ public class StopWatchTest {
 }
 
 @Test
+public void testFormatSplitTime() throws InterruptedException {
+final StopWatch watch = StopWatch.createStarted();
+Thread.sleep(20);
+watch.split();
+assertNotEquals("00:00:00.000", watch.formatSplitTime());
+}
+
+@Test
+public void testFormatTime() {
+final StopWatch watch = StopWatch.create();
+assertEquals("00:00:00.000", watch.formatTime());
+}
+
+@Test
 public void testGetStartTime() {
 final long beforeStopWatch = System.currentTimeMillis();
 final StopWatch watch = new StopWatch();

[commons-lang] branch master updated: Sort members.

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new de7b773  Sort members.
de7b773 is described below

commit de7b773087a4b11c5263998625ce07cf202db08d
Author: Gary Gregory 
AuthorDate: Mon Dec 30 13:46:05 2019 -0500

Sort members.
---
 .../org/apache/commons/lang3/time/StopWatch.java   | 29 +++---
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java 
b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index 876b2ed..3936b82 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -66,26 +66,11 @@ public class StopWatch {
 UNSPLIT
 }
 
-
 /**
  * Enumeration type which indicates the status of stopwatch.
  */
 private enum State {
 
-UNSTARTED {
-@Override
-boolean isStarted() {
-return false;
-}
-@Override
-boolean isStopped() {
-return true;
-}
-@Override
-boolean isSuspended() {
-return false;
-}
-},
 RUNNING {
 @Override
 boolean isStarted() {
@@ -127,6 +112,20 @@ public class StopWatch {
 boolean isSuspended() {
 return true;
 }
+},
+UNSTARTED {
+@Override
+boolean isStarted() {
+return false;
+}
+@Override
+boolean isStopped() {
+return true;
+}
+@Override
+boolean isSuspended() {
+return false;
+}
 };
 
 /**

[commons-lang] branch master updated: Javadoc.

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new c8289bf  Javadoc.
c8289bf is described below

commit c8289bfcc9200ccf832a716cb3f34689c6bc8d83
Author: Gary Gregory 
AuthorDate: Mon Dec 30 13:41:54 2019 -0500

Javadoc.
---
 .../org/apache/commons/lang3/time/StopWatch.java   | 59 ++
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java 
b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index 58f09ad..876b2ed 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -131,30 +131,26 @@ public class StopWatch {
 
 /**
  * 
- * The method is used to find out if the StopWatch is started. A 
suspended
- * StopWatch is also started watch.
+ * Returns whether the StopWatch is started. A suspended StopWatch is 
also started watch.
  * 
-
- * @return boolean
- * If the StopWatch is started.
+ *
+ * @return boolean If the StopWatch is started.
  */
 abstract boolean isStarted();
 
 /**
  * 
- * This method is used to find out whether the StopWatch is stopped. 
The
- * stopwatch which's not yet started and explicitly stopped stopwatch 
is
+ * Returns whether the StopWatch is stopped. The stopwatch which's not 
yet started and explicitly stopped stopwatch is
  * considered as stopped.
  * 
  *
- * @return boolean
- * If the StopWatch is stopped.
+ * @return boolean If the StopWatch is stopped.
  */
 abstract boolean isStopped();
 
 /**
  * 
- * This method is used to find out whether the StopWatch is suspended.
+ * Returns whether the StopWatch is suspended.
  * 
  *
  * @return boolean
@@ -166,7 +162,7 @@ public class StopWatch {
 private static final long NANO_2_MILLIS = 100L;
 
 /**
- * Provides a started stopwatch for convenience.
+ * Creates a started stopwatch for convenience.
  *
  * @return StopWatch a stopwatch that's already been started.
  *
@@ -177,6 +173,7 @@ public class StopWatch {
 sw.start();
 return sw;
 }
+
 /**
  * The current running state of the StopWatch.
  */
@@ -215,7 +212,7 @@ public class StopWatch {
 
 /**
  * 
- * Get the time on the stopwatch in nanoseconds.
+ * Gets the time on the stopwatch in nanoseconds.
  * 
  *
  * 
@@ -240,7 +237,7 @@ public class StopWatch {
 
 /**
  * 
- * Get the split time on the stopwatch in nanoseconds.
+ * Gets the split time on the stopwatch in nanoseconds.
  * 
  *
  * 
@@ -262,7 +259,7 @@ public class StopWatch {
 
 /**
  * 
- * Get the split time on the stopwatch.
+ * Gets the split time on the stopwatch.
  * 
  *
  * 
@@ -280,7 +277,7 @@ public class StopWatch {
 }
 
 /**
- * Returns the time this stopwatch was started.
+ * Gets the time this stopwatch was started.
  *
  * @return the time this stopwatch was started
  * @throws IllegalStateException
@@ -297,7 +294,7 @@ public class StopWatch {
 
 /**
  * 
- * Get the time on the stopwatch.
+ * Gets the time on the stopwatch.
  * 
  *
  * 
@@ -313,7 +310,7 @@ public class StopWatch {
 
 /**
  * 
- * Get the time on the stopwatch in the specified TimeUnit.
+ * Gets the time on the stopwatch in the specified TimeUnit.
  * 
  *
  * 
@@ -333,12 +330,10 @@ public class StopWatch {
 
 /**
  * 
- * The method is used to find out if the StopWatch is started. A suspended
- * StopWatch is also started watch.
+ * Returns whether the StopWatch is started. A suspended StopWatch is also 
started watch.
  * 
  *
- * @return boolean
- * If the StopWatch is started.
+ * @return boolean If the StopWatch is started.
  * @since 3.2
  */
 public boolean isStarted() {
@@ -347,13 +342,11 @@ public class StopWatch {
 
 /**
  * 
- * This method is used to find out whether the StopWatch is stopped. The
- * stopwatch which's not yet started and explicitly stopped stopwatch is
- * considered as stopped.
+ * Returns whether StopWatch is stopped. The stopwatch which's not yet 
started and explicitly stopped stopwatch is considered
+ * as stopped.
  * 
  *
- * @return boolean
- * If the StopWatch is stopped.
+ * @return boolean If the StopWatch is stopped.
  * @since 3.2
  */
 public boolean isStopped() {
@@

[commons-compress] branch master updated: the sentence is incomplete

2019-12-30 Thread bodewig

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 9839a3e  the sentence is incomplete
9839a3e is described below

commit 9839a3ea8e0aa8ecb048447cfb493dd91db9fbee
Author: Stefan Bodewig 
AuthorDate: Mon Dec 30 18:41:59 2019 +0100

the sentence is incomplete
---
 src/site/xdoc/zip.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/xdoc/zip.xml b/src/site/xdoc/zip.xml
index 29ea971..1fd80ac 100644
--- a/src/site/xdoc/zip.xml
+++ b/src/site/xdoc/zip.xml
@@ -107,7 +107,7 @@
   explicitly. For example it will completely fail if the
   stored entry is a ZIP archive itself.  Starting with Compress 1.19
   ZipArchiveInputStream will perform a few sanity
-  for STORED entries with data descriptors and throw an
+  checks for STORED entries with data descriptors and throw an
   exception if they fail.
 
 If possible, you should always prefer 
ZipFile

[commons-codec] branch release updated: [CODEC-278] Deprecate Charset constants in org.apache.commons.codec.Charsets in favor of java.nio.charset.StandardCharsets.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new 1a30728  [CODEC-278] Deprecate Charset constants in 
org.apache.commons.codec.Charsets in favor of java.nio.charset.StandardCharsets.
1a30728 is described below

commit 1a30728418f1d015453c0ad6521de56f4728e7bd
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:44:17 2019 -0500

[CODEC-278] Deprecate Charset constants in
org.apache.commons.codec.Charsets in favor of
java.nio.charset.StandardCharsets.
---
 src/changes/changes.xml|  1 +
 .../java/org/apache/commons/codec/Charsets.java| 30 +-
 .../java/org/apache/commons/codec/binary/Hex.java  |  4 +--
 .../apache/commons/codec/binary/StringUtils.java   | 26 +--
 .../commons/codec/net/QuotedPrintableCodec.java|  2 +-
 .../org/apache/commons/codec/CharsetsTest.java |  6 +
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 223aa1e..e8b30ea 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -57,6 +57,7 @@ The  type attribute can be add,update,fix,remove.
   Add missing note in javadoc when sign extension error is present 
#34.
   Reliance on default encoding in MurmurHash2 and MurmurHash3.
   Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
+  Deprecate Charset constants in org.apache.commons.codec.Charsets in 
favor of java.nio.charset.StandardCharsets.
 
 
 
diff --git a/src/main/java/org/apache/commons/codec/Charsets.java 
b/src/main/java/org/apache/commons/codec/Charsets.java
index 7a34f1d..4a6c42f 100644
--- a/src/main/java/org/apache/commons/codec/Charsets.java
+++ b/src/main/java/org/apache/commons/codec/Charsets.java
@@ -92,12 +92,11 @@ public class Charsets {
  * 
  * Every implementation of the Java platform is required to support this 
character encoding.
  * 
- * 
- * On Java 7 or later, use {@link 
java.nio.charset.StandardCharsets#ISO_8859_1} instead.
- * 
  *
+ * @deprecated Use {@link java.nio.charset.StandardCharsets#ISO_8859_1} 
instead.
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
+@Deprecated
 public static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1;
 
 /**
@@ -105,12 +104,11 @@ public class Charsets {
  * 
  * Every implementation of the Java platform is required to support this 
character encoding.
  * 
- * 
- * On Java 7 or later, use {@link 
java.nio.charset.StandardCharsets#ISO_8859_1} instead.
- * 
  *
+ * @deprecated Use {@link java.nio.charset.StandardCharsets#US_ASCII} 
instead.
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
+@Deprecated
 public static final Charset US_ASCII = StandardCharsets.US_ASCII;
 
 /**
@@ -119,12 +117,11 @@ public class Charsets {
  * 
  * Every implementation of the Java platform is required to support this 
character encoding.
  * 
- * 
- * On Java 7 or later, use {@link 
java.nio.charset.StandardCharsets#ISO_8859_1} instead.
- * 
  *
+ * @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_16} 
instead.
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
+@Deprecated
 public static final Charset UTF_16 = StandardCharsets.UTF_16;
 
 /**
@@ -132,12 +129,11 @@ public class Charsets {
  * 
  * Every implementation of the Java platform is required to support this 
character encoding.
  * 
- * 
- * On Java 7 or later, use {@link 
java.nio.charset.StandardCharsets#ISO_8859_1} instead.
- * 
  *
+ * @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_16BE} 
instead.
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
+@Deprecated
 public static final Charset UTF_16BE = StandardCharsets.UTF_16BE;
 
 /**
@@ -145,12 +141,11 @@ public class Charsets {
  * 
  * Every implementation of the Java platform is required to support this 
character encoding.
  * 
- * 
- * On Java 7 or later, use {@link 
java.nio.charset.StandardCharsets#ISO_8859_1} instead.
- * 
  *
+ * @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_16LE} 
instead.
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
+@Deprecated
 public static final Charset UTF_16LE = StandardCharsets.UTF_16LE;
 
 /**
@@ -158,11 +153,10 @@ public class Charsets {
  * 
  * Every implementation of the Java platform is required

[commons-codec] branch release updated: [CODEC-277] Don't reload standard Charsets in org.apache.commons.codec.Charsets.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new 84efbac  [CODEC-277] Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
84efbac is described below

commit 84efbacaee58c6232223f6125682de89c09e5ba9
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:30:04 2019 -0500

[CODEC-277] Don't reload standard Charsets in
org.apache.commons.codec.Charsets.

Oops, still need to test Charsets.
---
 src/test/java/org/apache/commons/codec/CharsetsTest.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/commons/codec/CharsetsTest.java 
b/src/test/java/org/apache/commons/codec/CharsetsTest.java
index 8272ccd..246062a 100644
--- a/src/test/java/org/apache/commons/codec/CharsetsTest.java
+++ b/src/test/java/org/apache/commons/codec/CharsetsTest.java
@@ -39,32 +39,32 @@ public class CharsetsTest {
 
 @Test
 public void testIso8859_1() {
-Assert.assertEquals("ISO-8859-1", StandardCharsets.ISO_8859_1.name());
+Assert.assertEquals("ISO-8859-1", Charsets.ISO_8859_1.name());
 }
 
 @Test
 public void testUsAscii() {
-Assert.assertEquals("US-ASCII", StandardCharsets.US_ASCII.name());
+Assert.assertEquals("US-ASCII", Charsets.US_ASCII.name());
 }
 
 @Test
 public void testUtf16() {
-Assert.assertEquals("UTF-16", StandardCharsets.UTF_16.name());
+Assert.assertEquals("UTF-16", Charsets.UTF_16.name());
 }
 
 @Test
 public void testUtf16Be() {
-Assert.assertEquals("UTF-16BE", StandardCharsets.UTF_16BE.name());
+Assert.assertEquals("UTF-16BE", Charsets.UTF_16BE.name());
 }
 
 @Test
 public void testUtf16Le() {
-Assert.assertEquals("UTF-16LE", StandardCharsets.UTF_16LE.name());
+Assert.assertEquals("UTF-16LE", Charsets.UTF_16LE.name());
 }
 
 @Test
 public void testUtf8() {
-Assert.assertEquals("UTF-8", StandardCharsets.UTF_8.name());
+Assert.assertEquals("UTF-8", Charsets.UTF_8.name());
 }
 
 }

[commons-codec] branch release updated: [CODEC-277] Don't reload standard Charsets in org.apache.commons.codec.Charsets.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new 5241656  [CODEC-277] Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
5241656 is described below

commit 5241656633c0b1f098deea410119a3435f41ea59
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:29:19 2019 -0500

[CODEC-277] Don't reload standard Charsets in
org.apache.commons.codec.Charsets.

Use Java 7's java.nio.charset.StandardCharsets instead of our Charsets.
---
 .../java/org/apache/commons/codec/binary/Hex.java  |  3 ++-
 .../apache/commons/codec/binary/StringUtils.java   | 27 +++---
 .../org/apache/commons/codec/digest/Crypt.java |  5 ++--
 .../org/apache/commons/codec/digest/Md5Crypt.java  | 11 -
 .../org/apache/commons/codec/digest/Sha2Crypt.java |  5 ++--
 .../org/apache/commons/codec/digest/UnixCrypt.java |  7 +++---
 .../java/org/apache/commons/codec/net/BCodec.java  |  4 ++--
 .../java/org/apache/commons/codec/net/QCodec.java  |  4 ++--
 .../commons/codec/net/QuotedPrintableCodec.java|  5 ++--
 .../org/apache/commons/codec/CharsetsTest.java | 13 ++-
 .../apache/commons/codec/binary/Base32Test.java|  4 ++--
 .../commons/codec/binary/Base64Codec13Test.java|  4 ++--
 .../apache/commons/codec/binary/Base64Test.java|  4 ++--
 .../commons/codec/binary/BinaryCodecTest.java  |  4 ++--
 .../org/apache/commons/codec/binary/HexTest.java   |  5 ++--
 .../apache/commons/codec/digest/Apr1CryptTest.java |  6 ++---
 .../apache/commons/codec/digest/Md5CryptTest.java  |  4 ++--
 .../commons/codec/digest/Sha256CryptTest.java  | 16 ++---
 .../commons/codec/digest/Sha512CryptTest.java  | 12 +-
 .../apache/commons/codec/digest/UnixCryptTest.java |  5 ++--
 .../codec/net/QuotedPrintableCodecTest.java|  8 +++
 .../org/apache/commons/codec/net/URLCodecTest.java |  8 +++
 22 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/binary/Hex.java 
b/src/main/java/org/apache/commons/codec/binary/Hex.java
index fa303e9..6a0f038 100644
--- a/src/main/java/org/apache/commons/codec/binary/Hex.java
+++ b/src/main/java/org/apache/commons/codec/binary/Hex.java
@@ -19,6 +19,7 @@ package org.apache.commons.codec.binary;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.codec.BinaryDecoder;
 import org.apache.commons.codec.BinaryEncoder;
@@ -42,7 +43,7 @@ public class Hex implements BinaryEncoder, BinaryDecoder {
  *
  * @since 1.7
  */
-public static final Charset DEFAULT_CHARSET = Charsets.UTF_8;
+public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
 /**
  * Default charset name is {@link CharEncoding#UTF_8}
diff --git a/src/main/java/org/apache/commons/codec/binary/StringUtils.java 
b/src/main/java/org/apache/commons/codec/binary/StringUtils.java
index adb7ad8..ae0493d 100644
--- a/src/main/java/org/apache/commons/codec/binary/StringUtils.java
+++ b/src/main/java/org/apache/commons/codec/binary/StringUtils.java
@@ -20,6 +20,7 @@ package org.apache.commons.codec.binary;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.codec.Charsets;
@@ -127,7 +128,7 @@ public class StringUtils {
  * @since 1.11
  */
 public static ByteBuffer getByteBufferUtf8(final String string) {
-return getByteBuffer(string, Charsets.UTF_8);
+return getByteBuffer(string, StandardCharsets.UTF_8);
 }
 
 /**
@@ -145,7 +146,7 @@ public class StringUtils {
  * @see #getBytesUnchecked(String, String)
  */
 public static byte[] getBytesIso8859_1(final String string) {
-return getBytes(string, Charsets.ISO_8859_1);
+return getBytes(string, StandardCharsets.ISO_8859_1);
 }
 
 
@@ -194,7 +195,7 @@ public class StringUtils {
  * @see #getBytesUnchecked(String, String)
  */
 public static byte[] getBytesUsAscii(final String string) {
-return getBytes(string, Charsets.US_ASCII);
+return getBytes(string, StandardCharsets.US_ASCII);
 }
 
 /**
@@ -212,7 +213,7 @@ public class StringUtils {
  * @see #getBytesUnchecked(String, String)
  */
 public static byte[] getBytesUtf16(final String string) {
-return getBytes(string, Charsets.UTF_16);
+return getBytes(string, StandardCharsets.UTF_16);
 }
 
 /**
@@ -230,7 +231,7 @@ public class StringUtils {
  * @see #getBytesUnchecked(String, String)
  */
 public static byte[] getBytesUtf16Be(final String string) {
-return

[commons-codec] branch release updated: [CODEC-277] Don't reload standard Charsets in org.apache.commons.codec.Charsets.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new ae0da81  [CODEC-277] Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
ae0da81 is described below

commit ae0da813d949a850a5937e73b7f57a673a712040
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:25:43 2019 -0500

[CODEC-277] Don't reload standard Charsets in
org.apache.commons.codec.Charsets.
---
 src/changes/changes.xml  |  3 ++-
 src/main/java/org/apache/commons/codec/Charsets.java | 13 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9e1c3c4..223aa1e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -55,7 +55,8 @@ The  type attribute can be add,update,fix,remove.
   Add Path APIs to org.apache.commons.codec.digest.DigestUtils similar 
to File APIs.
   Add SHA-512/224 and SHA-512/256 to DigestUtils for Java 9 and 
up.
   Add missing note in javadoc when sign extension error is present 
#34.
-  Reliance on default encoding in MurmurHash2 and MurmurHash3.
+  Reliance on default encoding in MurmurHash2 and MurmurHash3.
+  Don't reload standard Charsets in 
org.apache.commons.codec.Charsets.
 
 
 
diff --git a/src/main/java/org/apache/commons/codec/Charsets.java 
b/src/main/java/org/apache/commons/codec/Charsets.java
index aad811a..7a34f1d 100644
--- a/src/main/java/org/apache/commons/codec/Charsets.java
+++ b/src/main/java/org/apache/commons/codec/Charsets.java
@@ -17,6 +17,7 @@
 package org.apache.commons.codec;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Charsets required of every implementation of the Java platform.
@@ -97,7 +98,7 @@ public class Charsets {
  *
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
-public static final Charset ISO_8859_1 = 
Charset.forName(CharEncoding.ISO_8859_1);
+public static final Charset ISO_8859_1 = StandardCharsets.ISO_8859_1;
 
 /**
  * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin 
block of the Unicode character set.
@@ -110,7 +111,7 @@ public class Charsets {
  *
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
-public static final Charset US_ASCII = 
Charset.forName(CharEncoding.US_ASCII);
+public static final Charset US_ASCII = StandardCharsets.US_ASCII;
 
 /**
  * Sixteen-bit Unicode Transformation Format, The byte order specified by 
a mandatory initial byte-order mark
@@ -124,7 +125,7 @@ public class Charsets {
  *
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
-public static final Charset UTF_16 = Charset.forName(CharEncoding.UTF_16);
+public static final Charset UTF_16 = StandardCharsets.UTF_16;
 
 /**
  * Sixteen-bit Unicode Transformation Format, big-endian byte order.
@@ -137,7 +138,7 @@ public class Charsets {
  *
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
-public static final Charset UTF_16BE = 
Charset.forName(CharEncoding.UTF_16BE);
+public static final Charset UTF_16BE = StandardCharsets.UTF_16BE;
 
 /**
  * Sixteen-bit Unicode Transformation Format, little-endian byte order.
@@ -150,7 +151,7 @@ public class Charsets {
  *
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
-public static final Charset UTF_16LE = 
Charset.forName(CharEncoding.UTF_16LE);
+public static final Charset UTF_16LE = StandardCharsets.UTF_16LE;
 
 /**
  * Eight-bit Unicode Transformation Format.
@@ -163,5 +164,5 @@ public class Charsets {
  *
  * @see http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
-public static final Charset UTF_8 = Charset.forName(CharEncoding.UTF_8);
+public static final Charset UTF_8 = StandardCharsets.UTF_8;
 }

[commons-codec] branch release updated: [CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new 6f27ca6  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
6f27ca6 is described below

commit 6f27ca6680174e91122aa98c188c47407370ca19
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:14:25 2019 -0500

[CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

Standardize on US English spelling.
---
 .../java/org/apache/commons/codec/digest/MurmurHash3.java  | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index fd37bb5..fd008fa 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -216,7 +216,7 @@ public final class MurmurHash3 {
  * int hash = MurmurHash3.hash32(data, offset, data.length, seed);
  * 
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests if 
any of these
  * bytes are negative.
  *
@@ -245,7 +245,7 @@ public final class MurmurHash3 {
  * int hash = MurmurHash3.hash32(bytes, offset, bytes.length, seed);
  * 
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests if 
any of these
  * bytes are negative.
  *
@@ -271,7 +271,7 @@ public final class MurmurHash3 {
  * int hash = MurmurHash3.hash32(data, offset, length, seed);
  * 
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests if 
any of these
  * bytes are negative.
  *
@@ -295,7 +295,7 @@ public final class MurmurHash3 {
  * int hash = MurmurHash3.hash32(data, offset, length, seed);
  * 
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests if 
any of these
  * bytes are negative.
  *
@@ -317,7 +317,7 @@ public final class MurmurHash3 {
  * This is an implementation of the 32-bit hash function {@code 
MurmurHash3_x86_32}
  * from from Austin Applyby's original MurmurHash3 {@code c++} code in 
SMHasher.
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests if 
any of these
  * bytes are negative.
  *
@@ -1188,7 +1188,7 @@ public final class MurmurHash3 {
  * This is an implementation of the 32-bit hash function {@code 
MurmurHash3_x86_32}
  * from from Austin Applyby's original MurmurHash3 {@code c++} code in 
SMHasher.
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests if 
any of these
  * bytes are negative.
  *
@@ -1200,7 +1200,7 @@ public final class MurmurHash3 {
 /**
  * {@inheritDoc}
  *
- * This implementation contains a sign-extension bug in the 
finalisation step of
+ * This implementation contains a sign-extension bug in the 
finalization step of
  * any bytes left over from dividing the length by 4. This manifests 
if any of these
  * bytes are negative.
  *

[commons-codec] branch release updated: [CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new 3397682  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
3397682 is described below

commit 3397682996c8dc618469b4ca910dd130540451e3
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:13:18 2019 -0500

[CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

Reuse our StringUtils.getBytesUtf8(text).
---
 .../org/apache/commons/codec/digest/MurmurHash2.java|  4 ++--
 .../org/apache/commons/codec/digest/MurmurHash3.java| 17 ++---
 .../apache/commons/codec/digest/MurmurHash3Test.java|  9 +
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
index 98698ad..4708ec6 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
@@ -130,7 +130,7 @@ public final class MurmurHash2 {
 /**
  * Generates a 32-bit hash from a string with a default seed.
  * 
- * Before 1.14 the string was converted using default encoding. 
+ * Before 1.14 the string was converted using default encoding.
  * Since 1.14 the string is converted to bytes using UTF-8 encoding.
  * 
  * This is a helper method that will produce the same result as:
@@ -244,7 +244,7 @@ public final class MurmurHash2 {
 /**
  * Generates a 64-bit hash from a string with a default seed.
  * 
- * Before 1.14 the string was converted using default encoding. 
+ * Before 1.14 the string was converted using default encoding.
  * Since 1.14 the string is converted to bytes using UTF-8 encoding.
  * 
  * This is a helper method that will produce the same result as:
diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index 059f9af..fd37bb5 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -20,6 +20,8 @@ package org.apache.commons.codec.digest;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.commons.codec.binary.StringUtils;
+
 /**
  * Implementation of the MurmurHash3 32-bit and 128-bit hash functions.
  *
@@ -59,13 +61,6 @@ import java.nio.charset.StandardCharsets;
 public final class MurmurHash3 {
 
 /**
- * Default Charset used to convert strings into bytes.
- * 
- * Consider private; package private for tests only.
- */
-static final Charset GET_BYTES_CHARSET = StandardCharsets.UTF_8;
-
-/**
  * A random number to use for a hash code.
  *
  * @deprecated This is not used internally and will be removed in a future 
release.
@@ -238,7 +233,7 @@ public final class MurmurHash3 {
 /**
  * Generates 32-bit hash from a string with a default seed.
  * 
- * Before 1.14 the string was converted using default encoding. 
+ * Before 1.14 the string was converted using default encoding.
  * Since 1.14 the string is converted to bytes using UTF-8 encoding.
  * 
  * This is a helper method that will produce the same result as:
@@ -262,7 +257,7 @@ public final class MurmurHash3 {
  */
 @Deprecated
 public static int hash32(final String data) {
-final byte[] bytes = data.getBytes(GET_BYTES_CHARSET);
+final byte[] bytes = StringUtils.getBytesUtf8(data);
 return hash32(bytes, 0, bytes.length, DEFAULT_SEED);
 }
 
@@ -759,7 +754,7 @@ public final class MurmurHash3 {
 /**
  * Generates 128-bit hash from a string with a default seed.
  * 
- * Before 1.14 the string was converted using default encoding. 
+ * Before 1.14 the string was converted using default encoding.
  * Since 1.14 the string is converted to bytes using UTF-8 encoding.
  * 
  * This is a helper method that will produce the same result as:
@@ -782,7 +777,7 @@ public final class MurmurHash3 {
  */
 @Deprecated
 public static long[] hash128(final String data) {
-final byte[] bytes = data.getBytes(GET_BYTES_CHARSET);
+final byte[] bytes = StringUtils.getBytesUtf8(data);
 return hash128(bytes, 0, bytes.length, DEFAULT_SEED);
 }
 
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java 
b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
index 61df7f2..21515b2 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
@@ -23,6 +23,7 @@ import

[commons-codec] branch release updated: [CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new b207c45  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
b207c45 is described below

commit b207c452cd354583fa8c4bf10dfa9e70f24dbe55
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:09:00 2019 -0500

[CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

Reuse our StringUtils.getBytesUtf8(text).
---
 .../java/org/apache/commons/codec/digest/MurmurHash2.java  | 14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
index 12c1c2d..98698ad 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
@@ -17,8 +17,7 @@
 
 package org.apache.commons.codec.digest;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import org.apache.commons.codec.binary.StringUtils;
 
 /**
  * Implementation of the MurmurHash2 32-bit and 64-bit hash functions.
@@ -51,13 +50,6 @@ import java.nio.charset.StandardCharsets;
  */
 public final class MurmurHash2 {
 
-/**
- * Default Charset used to convert strings into bytes.
- * 
- * Consider private; package private for tests only.
- */
-static final Charset GET_BYTES_CHARSET = StandardCharsets.UTF_8;
-
 // Constants for 32-bit variant
 private static final int M32 = 0x5bd1e995;
 private static final int R32 = 24;
@@ -154,7 +146,7 @@ public final class MurmurHash2 {
  * @see #hash32(byte[], int, int)
  */
 public static int hash32(final String text) {
-final byte[] bytes = text.getBytes(GET_BYTES_CHARSET);
+final byte[] bytes = StringUtils.getBytesUtf8(text);
 return hash32(bytes, bytes.length);
 }
 
@@ -268,7 +260,7 @@ public final class MurmurHash2 {
  * @see #hash64(byte[], int, int)
  */
 public static long hash64(final String text) {
-final byte[] bytes = text.getBytes(GET_BYTES_CHARSET);
+final byte[] bytes = StringUtils.getBytesUtf8(text);
 return hash64(bytes, bytes.length);
 }

[commons-codec] branch release updated: [CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

2019-12-30 Thread ggregory

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

ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/release by this push:
 new f3fe3af  [CODEC-276] Reliance on default encoding in MurmurHash2 and 
MurmurHash3.
f3fe3af is described below

commit f3fe3afb3f301f236328801bfcd272de57dbccd5
Author: Gary Gregory 
AuthorDate: Mon Dec 30 09:00:32 2019 -0500

[CODEC-276] Reliance on default encoding in MurmurHash2 and MurmurHash3.

Update Javadoc with fix from Alex Herbert.
---
 src/main/java/org/apache/commons/codec/digest/MurmurHash2.java | 10 --
 src/main/java/org/apache/commons/codec/digest/MurmurHash3.java | 10 --
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
index 4dfeca9..12c1c2d 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash2.java
@@ -137,7 +137,10 @@ public final class MurmurHash2 {
 
 /**
  * Generates a 32-bit hash from a string with a default seed.
- * The string is converted to bytes using the default encoding.
+ * 
+ * Before 1.14 the string was converted using default encoding. 
+ * Since 1.14 the string is converted to bytes using UTF-8 encoding.
+ * 
  * This is a helper method that will produce the same result as:
  *
  * 
@@ -248,7 +251,10 @@ public final class MurmurHash2 {
 
 /**
  * Generates a 64-bit hash from a string with a default seed.
- * The string is converted to bytes using the default encoding.
+ * 
+ * Before 1.14 the string was converted using default encoding. 
+ * Since 1.14 the string is converted to bytes using UTF-8 encoding.
+ * 
  * This is a helper method that will produce the same result as:
  *
  * 
diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java 
b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index 4509a8f..059f9af 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -237,7 +237,10 @@ public final class MurmurHash3 {
 
 /**
  * Generates 32-bit hash from a string with a default seed.
- * The string is converted to bytes using the default encoding.
+ * 
+ * Before 1.14 the string was converted using default encoding. 
+ * Since 1.14 the string is converted to bytes using UTF-8 encoding.
+ * 
  * This is a helper method that will produce the same result as:
  *
  * 
@@ -755,7 +758,10 @@ public final class MurmurHash3 {
 
 /**
  * Generates 128-bit hash from a string with a default seed.
- * The string is converted to bytes using the default encoding.
+ * 
+ * Before 1.14 the string was converted using default encoding. 
+ * Since 1.14 the string is converted to bytes using UTF-8 encoding.
+ * 
  * This is a helper method that will produce the same result as:
  *
  *

[commons-csv] branch master updated: Fix typos in site and test #53.

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new de07d75  Fix typos in site and test #53.
de07d75 is described below

commit de07d7533b76514a84e6017c56c27d6bbfd9d9f9
Author: Gary Gregory 
AuthorDate: Mon Dec 30 08:45:23 2019 -0500

Fix typos in site and test #53.
---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d7d7851..3c038ce 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -52,6 +52,7 @@
   Update tests from H2 1.4.199 to 1.4.200.
   Update tests from Hamcrest 2.1 to 2.2.
   Update tests from Mockito 3.1.0 to 3.2.4.
+  Fix 
typos in site and test #53.
 
 
   Add predefined CSVFormats for printing MongoDB CSV and TSV.

[commons-csv] branch master updated: Fix typos in site and test #53

2019-12-30 Thread ggregory

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8ecd465  Fix typos in site and test #53
8ecd465 is described below

commit 8ecd4657efe32f37f6b2524f3b76444b22750a37
Author: Chen <50514813+dot...@users.noreply.github.com>
AuthorDate: Mon Dec 30 21:43:55 2019 +0800

Fix typos in site and test #53
---
 pom.xml | 2 +-
 src/site/xdoc/mail-lists.xml| 2 +-
 src/test/java/org/apache/commons/csv/CSVParserTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d3290f..2ed591e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,7 +337,7 @@ CSV files of various types.
 
   
   
-Noteable Markers
+Notable Markers
 
   
 NOTE
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 3648b98..d234a0c 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -152,7 +152,7 @@ limitations under the License.
   
 Commons Commits List
 
-Only for e-mails automatically generated by the source control sytem.
+Only for e-mails automatically generated by the source control system.
 
   
   mailto:commits-subscr...@commons.apache.org;>Subscribe
diff --git a/src/test/java/org/apache/commons/csv/CSVParserTest.java 
b/src/test/java/org/apache/commons/csv/CSVParserTest.java
index 0d8dd31..6b0dfc3 100644
--- a/src/test/java/org/apache/commons/csv/CSVParserTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVParserTest.java
@@ -162,7 +162,7 @@ public class CSVParserTest {
 final String[][] res = { { "one", "two", "three" }, { "on\\\"e", "two" 
}, { "on\"e", "two" },
 { "one", "tw\"o" }, { "one", "t\\,wo" }, // backslash in 
quotes only escapes a delimiter (",")
 { "one", "two", "th,ree" }, { "a" }, // backslash in 
quotes only escapes a delimiter (",")
-{ "a\\", "b" }, // a backslash must be returnd
+{ "a\\", "b" }, // a backslash must be returned
 { "a,b" } // backslash in quotes only escapes a delimiter 
(",")
 };
 try (final CSVParser parser = CSVParser.parse(code, 
CSVFormat.DEFAULT)) {

43 matches

Mail list logo