From e86d582cf909db363b7fe8d2df012a53776a128c Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Thu, 19 Nov 2015 15:21:15 +0000 Subject: Update to version 1.1.2. PR: 204495 Submitted by: kevin.bowling@kev009.com --- databases/hbase/files/extra-patch-PoolMap.java | 17 ----------------- .../hbase/files/extra-patch-hbase-annotations-pom.xml | 11 +++++++++++ databases/hbase/files/extra-patch-pom.xml | 10 ---------- databases/hbase/files/patch-bin-hbase | 6 +++--- databases/hbase/files/patch-hbase-daemon.sh | 14 +++++++------- databases/hbase/files/patch-hbase-env.sh | 14 +++++++------- databases/hbase/files/patch-pom.xml | 14 ++++++++++++++ 7 files changed, 42 insertions(+), 44 deletions(-) delete mode 100644 databases/hbase/files/extra-patch-PoolMap.java create mode 100644 databases/hbase/files/extra-patch-hbase-annotations-pom.xml delete mode 100644 databases/hbase/files/extra-patch-pom.xml create mode 100644 databases/hbase/files/patch-pom.xml (limited to 'databases/hbase/files') diff --git a/databases/hbase/files/extra-patch-PoolMap.java b/databases/hbase/files/extra-patch-PoolMap.java deleted file mode 100644 index ee80f39f80a1..000000000000 --- a/databases/hbase/files/extra-patch-PoolMap.java +++ /dev/null @@ -1,17 +0,0 @@ ---- hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java.orig 2014-12-16 06:16:53 UTC -+++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java -@@ -93,14 +93,6 @@ public class PoolMap implements Ma - return null; - } - -- /** -- * @deprecated Will be removed for Java 8, use {@link #removeValue} instead -- */ -- @Deprecated -- public boolean remove(K key, V value) { -- return removeValue(key, value); -- } -- - public boolean removeValue(K key, V value) { - Pool pool = pools.get(key); - boolean res = false; diff --git a/databases/hbase/files/extra-patch-hbase-annotations-pom.xml b/databases/hbase/files/extra-patch-hbase-annotations-pom.xml new file mode 100644 index 000000000000..c4627775b897 --- /dev/null +++ b/databases/hbase/files/extra-patch-hbase-annotations-pom.xml @@ -0,0 +1,11 @@ +--- hbase-annotations/pom.xml.orig 2015-11-19 17:45:45.996448000 +0300 ++++ hbase-annotations/pom.xml 2015-11-19 17:45:58.778797000 +0300 +@@ -35,7 +35,7 @@ + + jdk.tools + jdk.tools +- 1.7 ++ 1.8 + system + ${java.home}/../lib/tools.jar + diff --git a/databases/hbase/files/extra-patch-pom.xml b/databases/hbase/files/extra-patch-pom.xml deleted file mode 100644 index ea5679340918..000000000000 --- a/databases/hbase/files/extra-patch-pom.xml +++ /dev/null @@ -1,10 +0,0 @@ ---- pom.xml.orig 2015-10-02 13:51:13.974582000 +0000 -+++ pom.xml 2015-10-02 13:51:17.416694000 +0000 -@@ -2064,6 +2064,7 @@ - 2.9.1 - - 2048m -+ -Xdoclint:none - - - diff --git a/databases/hbase/files/patch-bin-hbase b/databases/hbase/files/patch-bin-hbase index 694ccbe908bb..62838b5a91ae 100644 --- a/databases/hbase/files/patch-bin-hbase +++ b/databases/hbase/files/patch-bin-hbase @@ -1,6 +1,6 @@ ---- bin/hbase.orig 2014-07-14 09:50:03.000000000 +0400 -+++ bin/hbase 2014-11-17 15:26:40.000000000 +0300 -@@ -55,6 +55,7 @@ +--- bin/hbase.orig 2015-11-11 22:16:01.759936000 -0700 ++++ bin/hbase 2015-11-11 22:17:30.695969000 -0700 +@@ -57,6 +57,7 @@ bin=`dirname "$0"` bin=`cd "$bin">/dev/null; pwd` diff --git a/databases/hbase/files/patch-hbase-daemon.sh b/databases/hbase/files/patch-hbase-daemon.sh index 94364f002b33..97b81e5db387 100644 --- a/databases/hbase/files/patch-hbase-daemon.sh +++ b/databases/hbase/files/patch-hbase-daemon.sh @@ -1,14 +1,14 @@ ---- bin/hbase-daemon.sh.orig 2014-07-14 09:50:03.000000000 +0400 -+++ bin/hbase-daemon.sh 2014-07-23 18:49:15.000000000 +0400 -@@ -89,7 +89,6 @@ +--- bin/hbase-daemon.sh.orig 2015-11-11 22:19:14.786233000 -0700 ++++ bin/hbase-daemon.sh 2015-11-11 22:19:45.137538000 -0700 +@@ -93,7 +93,6 @@ check_before_start(){ #ckeck if the process is not running - mkdir -p "$HBASE_PID_DIR" - if [ -f $pid ]; then - if kill -0 `cat $pid` > /dev/null 2>&1; then - echo $command running as process `cat $pid`. Stop it first. -@@ -120,7 +119,6 @@ + if [ -f $HBASE_PID ]; then + if kill -0 `cat $HBASE_PID` > /dev/null 2>&1; then + echo $command running as process `cat $HBASE_PID`. Stop it first. +@@ -124,7 +123,6 @@ if [ "$HBASE_LOG_DIR" = "" ]; then export HBASE_LOG_DIR="$HBASE_HOME/logs" fi diff --git a/databases/hbase/files/patch-hbase-env.sh b/databases/hbase/files/patch-hbase-env.sh index ad7406df819b..fae00d81d028 100644 --- a/databases/hbase/files/patch-hbase-env.sh +++ b/databases/hbase/files/patch-hbase-env.sh @@ -1,6 +1,6 @@ ---- conf/hbase-env.sh.bak 2014-07-15 05:23:39.000000000 +0400 -+++ conf/hbase-env.sh 2014-07-28 23:05:05.000000000 +0400 -@@ -19,6 +19,8 @@ +--- conf/hbase-env.sh.orig 2015-11-11 22:32:08.539865000 -0700 ++++ conf/hbase-env.sh 2015-11-11 22:34:34.423285000 -0700 +@@ -17,6 +17,8 @@ # * limitations under the License. # */ @@ -9,16 +9,16 @@ # Set environment variables here. # This script sets variables multiple times over the course of starting an hbase process, -@@ -26,7 +28,7 @@ +@@ -24,7 +26,7 @@ # into the startup scripts (bin/hbase, etc.) - # The java implementation to use. Java 1.6 required. + # The java implementation to use. Java 1.7+ required. -# export JAVA_HOME=/usr/java/jdk1.6.0/ -+# export JAVA_HOME=/usr/java/jdk1.6.0/ --> Defined in hbase-env-dist.sh ++# export JAVA_HOME=/usr/java/jdk1.6.0/ --> Defined in hbase-env-dist.sh # Extra Java CLASSPATH elements. Optional. # export HBASE_CLASSPATH= -@@ -121,7 +123,7 @@ +@@ -125,7 +127,7 @@ # export HBASE_SLAVE_SLEEP=0.1 # Tell HBase whether it should manage it's own instance of Zookeeper or not. diff --git a/databases/hbase/files/patch-pom.xml b/databases/hbase/files/patch-pom.xml new file mode 100644 index 000000000000..165cd4b538e1 --- /dev/null +++ b/databases/hbase/files/patch-pom.xml @@ -0,0 +1,14 @@ +--- pom.xml.orig 2015-11-11 22:13:24.366024000 -0700 ++++ pom.xml 2015-11-12 02:03:55.927461000 -0700 +@@ -1021,6 +1021,11 @@ + asciidoctorj-pdf + 1.5.0-alpha.6 + ++ ++ org.jruby ++ jruby-complete ++ 9.0.3.0 ++ + + + target/site -- cgit v1.2.3