Repository: hadoop Updated Branches: refs/heads/branch-3.0 4e458e93f -> 5f6e387ba
HADOOP-14797. Update re2j version to 1.1. (rchiang) (cherry picked from commit 288c3b12d46fccdb9638d823b1b6b0cbc076ec16) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f6e387b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f6e387b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f6e387b Branch: refs/heads/branch-3.0 Commit: 5f6e387ba9306db9e42f9932afc56862954fef74 Parents: 4e458e9 Author: Ray Chiang <rchi...@apache.org> Authored: Tue Sep 12 11:34:53 2017 -0700 Committer: Ray Chiang <rchi...@apache.org> Committed: Tue Sep 12 11:35:15 2017 -0700 ---------------------------------------------------------------------- LICENSE.txt | 2 +- hadoop-project/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f6e387b/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 3800adc..3f50521 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -359,7 +359,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The binary distribution of this product bundles these dependencies under the following license: -re2j 1.0 +re2j 1.1 --------------------------------------------------------------------- (GO license) This is a work derived from Russ Cox's RE2 in Go, whose license http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f6e387b/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index c34b1c9..d6c5d66 100755 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -76,7 +76,7 @@ <slf4j.version>1.7.25</slf4j.version> <!-- com.google.re2j version --> - <re2j.version>1.0</re2j.version> + <re2j.version>1.1</re2j.version> <!-- ProtocolBuffer version, used to verify the protoc version and --> <!-- define the protobuf JAR version --> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org