[tinkerpop] 02/03: Merge branch '3.4-dev'

[sp...@apache.org]

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

commit d13c9e5179832f4d191bd67858c023792c9d7b0c
Merge: 4174ee6 d639bb1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Apr 26 16:13:22 2021 -0400

    Merge branch '3.4-dev'

 .../tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index 873fcaa,74fcc42..bc981ed
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
@@@ -82,13 -82,12 +82,13 @@@ public class GremlinServerAuditLogInteg
          rootLogger.addAppender(recordingAppender);
  
          try {
 -            final String buildDir = System.getProperty("build.dir");
 -            kdcServer = new KdcFixture(buildDir +
 -                    "/test-classes/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf");
 +            final String moduleBaseDir = System.getProperty("basedir", ".");
 +            final String authConfigName = moduleBaseDir + "/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf";
 +            System.setProperty("java.security.auth.login.config", authConfigName);
 +            kdcServer = new KdcFixture(moduleBaseDir);
              kdcServer.setUp();
-         } catch(Exception e)  {
-             logger.warn(e.getMessage());
+         } catch(Exception ex)  {
+             logger.warn(String.format("Could not start Kerberos Server for %s", name.getMethodName()), ex);
          }
          super.setUp();
      }