This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new a30ff44 Bump to kerby 1.0.0 CTR
new 22eaae7 Merge branch 'tp33'
a30ff44 is described below
commit a30ff44128157ac8620f3bdb51eb3ed27e62b600
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Feb 11 14:48:15 2019 -0500
Bump to kerby 1.0.0 CTR
---
NOTICE | 4 ++--
gremlin-server/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java | 15 +++++++++------
gremlin-test/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 9 +++++++++
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/NOTICE b/NOTICE
index 738fb3f..f915549 100644
--- a/NOTICE
+++ b/NOTICE
@@ -18,8 +18,8 @@
https://github.com/Activiti/Activiti/tree/activiti-5.16/modules/activiti-bpmn-co
Apache Kerby
------------------------------------------------------------------------
Apache Kerby
-Copyright 2015-2016 The Apache Software Foundation
+Copyright 2015-2017 The Apache Software Foundation
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
from
-https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0-RC2/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
+https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 125b64b..1c0aa88 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -103,7 +103,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
- <version>1.0.0-RC2</version>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
index ecc4599..48c4546 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.tinkerpop.gremlin.server.auth;
@@ -51,7 +51,8 @@ public final class JaasKrbUtil {
private JaasKrbUtil() { }
- public static Subject loginUsingPassword(String principal, String
password) throws LoginException {
+ public static Subject loginUsingPassword(
+ String principal, String password) throws LoginException {
Set<Principal> principals = new HashSet<Principal>();
principals.add(new KerberosPrincipal(principal));
@@ -66,7 +67,8 @@ public final class JaasKrbUtil {
return loginContext.getSubject();
}
- public static Subject loginUsingTicketCache(String principal, File
cacheFile) throws LoginException {
+ public static Subject loginUsingTicketCache(
+ String principal, File cacheFile) throws LoginException {
Set<Principal> principals = new HashSet<Principal>();
principals.add(new KerberosPrincipal(principal));
@@ -80,7 +82,8 @@ public final class JaasKrbUtil {
return loginContext.getSubject();
}
- public static Subject loginUsingKeytab(String principal, File keytabFile)
throws LoginException {
+ public static Subject loginUsingKeytab(
+ String principal, File keytabFile) throws LoginException {
Set<Principal> principals = new HashSet<Principal>();
principals.add(new KerberosPrincipal(principal));
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 8b55d37..c953776 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -34,7 +34,7 @@ limitations under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 4352ade..b8b2929 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -76,6 +76,10 @@ limitations under the License.
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
@@ -96,6 +100,11 @@ limitations under the License.
</dependency>
<!-- consistent dependencies -->
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.6</version>
