You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2018/03/19 20:17:07 UTC
[1/2] hbase-thirdparty git commit: HBASE-20222 Shade
commons-collections into shaded-miscellaneous
Repository: hbase-thirdparty
Updated Branches:
refs/heads/master 939ce1afe -> c685d9a9c
HBASE-20222 Shade commons-collections into shaded-miscellaneous
Signed-off-by: Umesh Agashe <ua...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/56bd56c0
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/56bd56c0
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/56bd56c0
Branch: refs/heads/master
Commit: 56bd56c02a0516bec8b396e620c0e949236ec620
Parents: 939ce1a
Author: Josh Elser <el...@apache.org>
Authored: Mon Mar 19 11:24:11 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 19 16:14:33 2018 -0400
----------------------------------------------------------------------
hbase-shaded-miscellaneous/pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/56bd56c0/hbase-shaded-miscellaneous/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml
index 2ed9fda..d59c84e 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -77,8 +77,8 @@
</excludes>
</relocation>
<relocation>
- <pattern>org.apache.commons.cli</pattern>
- <shadedPattern>${rename.offset}.org.apache.commons.cli</shadedPattern>
+ <pattern>org.apache.commons</pattern>
+ <shadedPattern>${rename.offset}.org.apache.commons</shadedPattern>
</relocation>
</relocations>
<artifactSet>
@@ -157,5 +157,10 @@
<artifactId>commons-cli</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ </dependency>
</dependencies>
</project>
[2/2] hbase-thirdparty git commit: HBASE-20221 Bump protobuf to 3.5.1
Posted by el...@apache.org.
HBASE-20221 Bump protobuf to 3.5.1
Required fixing the FIXED_XX_SIZE constants as they were renamed
Signed-off-by: Umesh Agashe <ua...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/c685d9a9
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/c685d9a9
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/c685d9a9
Branch: refs/heads/master
Commit: c685d9a9cbb6ff6612c56b6be2bd87418c73b384
Parents: 56bd56c
Author: Josh Elser <el...@apache.org>
Authored: Mon Mar 19 11:54:58 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 19 16:15:19 2018 -0400
----------------------------------------------------------------------
hbase-shaded-protobuf/pom.xml | 2 +-
.../src/main/patches/HBASE-15789_V2.patch | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/c685d9a9/hbase-shaded-protobuf/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index 9f5ff77..5e2721b 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -32,7 +32,7 @@
Pulls down protobuf, patches it, compiles, and then relocates/shades.
</description>
<properties>
- <protobuf.version>3.3.1</protobuf.version>
+ <protobuf.version>3.5.1</protobuf.version>
</properties>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/c685d9a9/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
----------------------------------------------------------------------
diff --git a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
index e91559c..cef5cfc 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
@@ -457,7 +457,7 @@ index 12d70ce..e4c8e05 100644
+ skipRawVarint();
+ return true;
+ case WireFormat.WIRETYPE_FIXED64:
-+ skipRawBytes(FIXED_64_SIZE);
++ skipRawBytes(FIXED64_SIZE);
+ return true;
+ case WireFormat.WIRETYPE_LENGTH_DELIMITED:
+ skipRawBytes(readRawVarint32());
@@ -470,7 +470,7 @@ index 12d70ce..e4c8e05 100644
+ case WireFormat.WIRETYPE_END_GROUP:
+ return false;
+ case WireFormat.WIRETYPE_FIXED32:
-+ skipRawBytes(FIXED_32_SIZE);
++ skipRawBytes(FIXED32_SIZE);
+ return true;
+ default:
+ throw InvalidProtocolBufferException.invalidWireType();
@@ -869,11 +869,11 @@ index 12d70ce..e4c8e05 100644
+ public int readRawLittleEndian32() throws IOException {
+ int tempPos = pos;
+
-+ if (limit - tempPos < FIXED_32_SIZE) {
++ if (limit - tempPos < FIXED32_SIZE) {
+ throw InvalidProtocolBufferException.truncatedMessage();
+ }
+
-+ pos = tempPos + FIXED_32_SIZE;
++ pos = tempPos + FIXED32_SIZE;
+ return (((buffer.read(tempPos) & 0xff))
+ | ((buffer.read(tempPos + 1) & 0xff) << 8)
+ | ((buffer.read(tempPos + 2) & 0xff) << 16)
@@ -884,11 +884,11 @@ index 12d70ce..e4c8e05 100644
+ public long readRawLittleEndian64() throws IOException {
+ int tempPos = pos;
+
-+ if (limit - tempPos < FIXED_64_SIZE) {
++ if (limit - tempPos < FIXED64_SIZE) {
+ throw InvalidProtocolBufferException.truncatedMessage();
+ }
+
-+ pos = tempPos + FIXED_64_SIZE;
++ pos = tempPos + FIXED64_SIZE;
+ return (((buffer.read(tempPos) & 0xffL))
+ | ((buffer.read(tempPos + 1) & 0xffL) << 8)
+ | ((buffer.read(tempPos + 2) & 0xffL) << 16)