You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2018/06/28 06:02:45 UTC
directory-kerby git commit: Update hadoop patch.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 23437f942 -> 73356def1
Update hadoop patch.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/73356def
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/73356def
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/73356def
Branch: refs/heads/trunk
Commit: 73356def19ff9835fb343d6755765813dd4872e5
Parents: 23437f9
Author: plusplusjiajia <ji...@intel.com>
Authored: Thu Jun 28 14:02:32 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Thu Jun 28 14:02:32 2018 +0800
----------------------------------------------------------------------
has-project/supports/hadoop/hadoop-2.7.2.patch | 20 +++++++++++++++-----
has-project/supports/hbase/README.md | 4 ++--
2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/73356def/has-project/supports/hadoop/hadoop-2.7.2.patch
----------------------------------------------------------------------
diff --git a/has-project/supports/hadoop/hadoop-2.7.2.patch b/has-project/supports/hadoop/hadoop-2.7.2.patch
index 85c7c3f..86f968a 100644
--- a/has-project/supports/hadoop/hadoop-2.7.2.patch
+++ b/has-project/supports/hadoop/hadoop-2.7.2.patch
@@ -1,21 +1,31 @@
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
-index aa3c2c7..e4f1fd2 100644
+index aa3c2c761a5..abdcdf388a9 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
-@@ -143,6 +143,11 @@
+@@ -143,6 +143,21 @@
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>has-client</artifactId>
-+ <version>1.0.0-SNAPSHOT</version>
++ <version>2.0.0-SNAPSHOT</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.kerby</groupId>
++ <artifactId>has-plugins</artifactId>
++ <version>2.0.0-SNAPSHOT</version>
++ </dependency>
++ <dependency>
++ <groupId>org.drizzle.jdbc</groupId>
++ <artifactId>drizzle-jdbc</artifactId>
++ <version>1.4</version>
+ </dependency>
</dependencies>
<build>
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
-index f7f5f63..80b7aca 100644
+index f7f5f63e829..05f2d8fb7ca 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java
@@ -44,7 +44,8 @@
@@ -29,7 +39,7 @@ index f7f5f63..80b7aca 100644
public static Oid getOidInstance(String oidName)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
-index 65e4166..f5224bb 100644
+index 65e4166d602..f5224bb5eb8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
@@ -89,6 +89,8 @@
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/73356def/has-project/supports/hbase/README.md
----------------------------------------------------------------------
diff --git a/has-project/supports/hbase/README.md b/has-project/supports/hbase/README.md
index ce3a2bf..5b1b826 100644
--- a/has-project/supports/hbase/README.md
+++ b/has-project/supports/hbase/README.md
@@ -13,13 +13,13 @@ git apply hbase-hadoop-2.5.1.patch
mvn clean package -DskipTests
```
-## 3. Copy the hadoop-auth jar and hadoop-common jar to hbase lib
+## 3. Copy the hadoop-auth jar and hadoop-common jar to HBase lib
```
cp hadoop/hadoop-common-project/hadoop-auth/target/hadoop-auth-2.5.1.jar $HBASE_HOME/lib/
cp hadoop/hadoop-common-project/hadoop-common/target/hadoop-common-2.5.1.jar $HBASE_HOME/lib/
```
-## 4. Update hbase security configuration
+## 4. Update HBase security configuration
### Update conf/hbase-site.xml
```