You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2021/04/23 10:51:35 UTC
[tinkerpop] branch master updated (a0b82c6 -> 02d1ee6)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from a0b82c6 Merge branch '3.4-dev'
add 247d097 Manually backport #1417 which made some improvements to integration test setup CTR
new cd8719c Merge branch '3.4-dev'
add 66bf504 Avoids addContactPoint from gremlin-driver Cluster to avoid failures in docker containers with cpu < 1
new 02d1ee6 Merge branch 'pr-1417'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker/scripts/build.sh | 1 -
...emlinServerAuditLogDeprecatedIntegrateTest.java | 26 ++++++--------
.../server/GremlinServerAuditLogIntegrateTest.java | 42 ++++------------------
.../server/GremlinServerAuthKrb5IntegrateTest.java | 42 +++++++++++-----------
.../gremlin/server/TestClientFactory.java | 15 ++++----
5 files changed, 48 insertions(+), 78 deletions(-)
[tinkerpop] 02/02: Merge branch 'pr-1417'
Posted by 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 02d1ee6c000583fee5cfc9b7778782aab8643fb1
Merge: cd8719c 66bf504
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Apr 23 06:50:18 2021 -0400
Merge branch 'pr-1417'
...emlinServerAuditLogDeprecatedIntegrateTest.java | 26 ++++++---------
.../server/GremlinServerAuditLogIntegrateTest.java | 39 ++++------------------
.../server/GremlinServerAuthKrb5IntegrateTest.java | 34 +++++++++----------
.../gremlin/server/TestClientFactory.java | 4 +++
4 files changed, 38 insertions(+), 65 deletions(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
index 06ec8c9,1d82214..07a41c9
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
@@@ -34,13 -34,13 +34,17 @@@ public final class TestClientFactory
public static final String RESOURCE_PATH = "conf/remote-objects.yaml";
public static Cluster.Builder build() {
- return Cluster.build("localhost").port(45940);
+ return build("localhost");
+ }
+
+ public static Cluster.Builder build(final String address) {
+ return Cluster.build(address).port(45940);
}
+ public static Cluster.Builder build(final String address) {
+ return Cluster.build(address).port(45940);
+ }
+
public static Cluster open() {
return build().create();
}
[tinkerpop] 01/02: Merge branch '3.4-dev'
Posted by 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 cd8719c01d7cb970b2bedb594b8377ae86bf512d
Merge: a0b82c6 247d097
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Apr 23 06:50:11 2021 -0400
Merge branch '3.4-dev'
docker/scripts/build.sh | 1 -
.../gremlin/server/GremlinServerAuditLogIntegrateTest.java | 3 +--
.../gremlin/server/GremlinServerAuthKrb5IntegrateTest.java | 8 ++++----
.../apache/tinkerpop/gremlin/server/TestClientFactory.java | 11 +++++------
4 files changed, 10 insertions(+), 13 deletions(-)
diff --cc docker/scripts/build.sh
index 7222a73,fb7d16e..d616aba
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -76,8 -76,7 +76,7 @@@ if [ -r "settings.xml" ]; the
cp settings.xml ~/.m2/
fi
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-
mvn clean install process-resources --batch-mode ${TINKERPOP_BUILD_OPTIONS} || exit 1
[ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index 28ad1e1,5a8b351..e73e9e9
--- 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
@@@ -93,9 -92,9 +93,8 @@@ public class GremlinServerAuditLogInteg
super.setUp();
}
- @After
@Override
public void tearDown() throws Exception {
- super.tearDown();
final Logger rootLogger = Logger.getRootLogger();
rootLogger.removeAppender(recordingAppender);
kdcServer.close();
@@@ -150,7 -151,7 +149,7 @@@
@Test
public void shouldAuditLogWithAllowAllAuthenticator() throws Exception {
- final Cluster cluster = TestClientFactory.build().addContactPoint(kdcServer.gremlinHostname).create();
- final Cluster cluster = TestClientFactory.build(kdcServer.hostname).create();
++ final Cluster cluster = TestClientFactory.build(kdcServer.gremlinHostname).create();
final Client client = cluster.connect();
try {