[01/12] hbase git commit: HBASE-19552 Update hbase-thirdparty version
Repository: hbase
Updated Branches:
refs/heads/branch-2 4dc38aeb2 -> 64cb777a8
HBASE-19552 Update hbase-thirdparty version
Some manual cleanup of changing package names in pom files and getting
rid of the no-longer-needed netty system property.
This commit will break compilation, package renames in source code are
done in follow-on commits using straightforward find and replace.
's/org.apache.hadoop.hbase.shaded.com.google/org.apache.hbase.thirdparty.com.google/'
's/org.apache.hadoop.hbase.shaded.io.netty/org.apache.hbase.thirdparty.io.netty/'
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/968b938f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/968b938f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/968b938f
Branch: refs/heads/branch-2
Commit: 968b938fdefeeaee1e829a03979d3117eabda5ea
Parents: 4dc38ae
Author: Mike Drob
Authored: Wed Dec 27 10:58:47 2017 -0600
Committer: Mike Drob
Committed: Thu Dec 28 11:58:49 2017 -0600
--
bin/hbase | 13 ++-
.../src/main/resources/hbase/checkstyle.xml | 2 +-
hbase-mapreduce/pom.xml | 3 --
hbase-protocol-shaded/pom.xml | 2 +-
hbase-server/pom.xml| 1 -
hbase-spark/pom.xml | 9 +
pom.xml | 24 +++-
src/main/asciidoc/_chapters/developer.adoc | 40 ++--
8 files changed, 16 insertions(+), 78 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/968b938f/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 1fc5102..f2d4251 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -474,16 +474,9 @@ fi
HEAP_SETTINGS="$JAVA_HEAP_MAX $JAVA_OFFHEAP_MAX"
# Exec unless HBASE_NOEXEC is set.
export CLASSPATH
-# Netty is shaded in hbase. The shaded netty is pulled in with
org.apache.hbase.thirdparty:hbase-shaded-netty.
-# It has a .so in it. Shading requires rename of the .so and then passing a
system property so netty finds the
-# renamed .so and associates it w/ the relocated netty files.
-# So we can find the relocated .so, we need to add a system property pointing
at new location. Trick is from:
-#
https://stackoverflow.com/questions/33825743/rename-files-inside-a-jar-using-some-maven-plugin
-# See toward the end of this issue for how to pass config:
https://github.com/netty/netty/issues/6665
-#
-NETTY_PROP="-Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded."
+
if [ "${HBASE_NOEXEC}" != "" ]; then
- "$JAVA" -Dproc_$COMMAND "$NETTY_PROP" -XX:OnOutOfMemoryError="kill -9 %p"
$HEAP_SETTINGS $HBASE_OPTS $CLASS "$@"
+ "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS
$HBASE_OPTS $CLASS "$@"
else
- exec "$JAVA" -Dproc_$COMMAND "$NETTY_PROP" -XX:OnOutOfMemoryError="kill -9
%p" $HEAP_SETTINGS $HBASE_OPTS $CLASS "$@"
+ exec "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p"
$HEAP_SETTINGS $HBASE_OPTS $CLASS "$@"
fi
http://git-wip-us.apache.org/repos/asf/hbase/blob/968b938f/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
--
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index bdfea28..4643709 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -67,7 +67,7 @@
http://checkstyle.sourceforge.net/config_imports.html -->
-
+
http://git-wip-us.apache.org/repos/asf/hbase/blob/968b938f/hbase-mapreduce/pom.xml
--
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index 7ba9a7c..0073440 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -76,9 +76,6 @@
org.apache.hadoop.hbase.ServerResourceCheckerJUnitListener
-
-
org.apache.hadoop.hbase.shaded.
-
http://git-wip-us.apache.org/repos/asf/hbase/blob/968b938f/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 70af5d5..a9258db 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -120,7 +120,7 @@
([^\.])com.google.protobuf
-
$1org.apache.hadoop.hbase.shaded.com.google.protobuf
+
$1org.apache.hbase.thirdparty.com.google.proto
[01/12] hbase git commit: HBASE-19552 Update hbase-thirdparty version
Repository: hbase
Updated Branches:
refs/heads/master 78013a0c1 -> c3b4f788b
HBASE-19552 Update hbase-thirdparty version
Some manual cleanup of changing package names in pom files and getting
rid of the no-longer-needed netty system property.
This commit will break compilation, package renames in source code are
done in follow-on commits using straightforward find and replace.
's/org.apache.hadoop.hbase.shaded.com.google/org.apache.hbase.thirdparty.com.google/'
's/org.apache.hadoop.hbase.shaded.io.netty/org.apache.hbase.thirdparty.io.netty/'
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ea7d5fc8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ea7d5fc8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ea7d5fc8
Branch: refs/heads/master
Commit: ea7d5fc88454cc8d623d837e2d8975643e354bda
Parents: 78013a0
Author: Mike Drob
Authored: Wed Dec 27 10:58:47 2017 -0600
Committer: Mike Drob
Committed: Thu Dec 28 11:41:42 2017 -0600
--
bin/hbase | 13 ++-
.../src/main/resources/hbase/checkstyle.xml | 2 +-
hbase-mapreduce/pom.xml | 3 --
hbase-protocol-shaded/pom.xml | 2 +-
hbase-server/pom.xml| 1 -
hbase-spark/pom.xml | 9 +
pom.xml | 24 +++-
src/main/asciidoc/_chapters/developer.adoc | 40 ++--
8 files changed, 16 insertions(+), 78 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/ea7d5fc8/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index d98e7bc..85cc874 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -480,16 +480,9 @@ fi
HEAP_SETTINGS="$JAVA_HEAP_MAX $JAVA_OFFHEAP_MAX"
# Exec unless HBASE_NOEXEC is set.
export CLASSPATH
-# Netty is shaded in hbase. The shaded netty is pulled in with
org.apache.hbase.thirdparty:hbase-shaded-netty.
-# It has a .so in it. Shading requires rename of the .so and then passing a
system property so netty finds the
-# renamed .so and associates it w/ the relocated netty files.
-# So we can find the relocated .so, we need to add a system property pointing
at new location. Trick is from:
-#
https://stackoverflow.com/questions/33825743/rename-files-inside-a-jar-using-some-maven-plugin
-# See toward the end of this issue for how to pass config:
https://github.com/netty/netty/issues/6665
-#
-NETTY_PROP="-Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded."
+
if [ "${HBASE_NOEXEC}" != "" ]; then
- "$JAVA" -Dproc_$COMMAND "$NETTY_PROP" -XX:OnOutOfMemoryError="kill -9 %p"
$HEAP_SETTINGS $HBASE_OPTS $CLASS "$@"
+ "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS
$HBASE_OPTS $CLASS "$@"
else
- exec "$JAVA" -Dproc_$COMMAND "$NETTY_PROP" -XX:OnOutOfMemoryError="kill -9
%p" $HEAP_SETTINGS $HBASE_OPTS $CLASS "$@"
+ exec "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p"
$HEAP_SETTINGS $HBASE_OPTS $CLASS "$@"
fi
http://git-wip-us.apache.org/repos/asf/hbase/blob/ea7d5fc8/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
--
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index bdfea28..4643709 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -67,7 +67,7 @@
http://checkstyle.sourceforge.net/config_imports.html -->
-
+
http://git-wip-us.apache.org/repos/asf/hbase/blob/ea7d5fc8/hbase-mapreduce/pom.xml
--
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index 645c0e1..38a0684 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -76,9 +76,6 @@
org.apache.hadoop.hbase.ServerResourceCheckerJUnitListener
-
-
org.apache.hadoop.hbase.shaded.
-
http://git-wip-us.apache.org/repos/asf/hbase/blob/ea7d5fc8/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index e71a21b..ab04e98 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -120,7 +120,7 @@
([^\.])com.google.protobuf
-
$1org.apache.hadoop.hbase.shaded.com.google.protobuf
+
$1org.apache.hbase.thirdparty.com.google.protobuf
