Merge remote-tracking branch 'upstream/v0.6'

JanusGraph · Oct 23, 2021 · d92fe83 · d92fe83
2 parents f479483 + 4fd1ed0
commit d92fe83
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/docs.Dockerfile b/docs.Dockerfile
@@ -13,13 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.12
+FROM python:3.8
 
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/bin
 
 COPY requirements.txt /mkdocs/
 WORKDIR /mkdocs
 VOLUME /mkdocs
 
-RUN apk --no-cache --no-progress add py3-regex py3-pip py3-wheel \
-  && pip3 install --user -r requirements.txt
+RUN pip3 install --user -r requirements.txt
diff --git a/janusgraph-core/src/main/java/org/janusgraph/core/ConfiguredGraphFactory.java b/janusgraph-core/src/main/java/org/janusgraph/core/ConfiguredGraphFactory.java
@@ -16,6 +16,7 @@
 
 import com.google.common.base.Preconditions;
 import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.janusgraph.diskstorage.BackendException;
 import org.janusgraph.diskstorage.configuration.backend.CommonsConfiguration;
@@ -87,7 +88,7 @@ public static synchronized JanusGraph create(final String graphName) {
         Preconditions.checkNotNull(jgm, JANUS_GRAPH_MANAGER_EXPECTED_STATE_MSG);
         final CommonsConfiguration config = new CommonsConfiguration(ConfigurationUtil.loadMapConfiguration(templateConfigMap));
         final JanusGraph g = (JanusGraph) jgm.openGraph(graphName, (String gName) -> new StandardJanusGraph(new GraphDatabaseConfigurationBuilder().build(config)));
-        configManagementGraph.createConfiguration(ConfigurationUtil.loadMapConfiguration(templateConfigMap));
+        configManagementGraph.createConfiguration(new MapConfiguration(templateConfigMap));
         return g;
     }
 

diff --git a/janusgraph-cql/src/test/java/org/janusgraph/core/cql/CQLConfiguredGraphFactoryTest.java b/janusgraph-cql/src/test/java/org/janusgraph/core/cql/CQLConfiguredGraphFactoryTest.java
@@ -32,7 +32,6 @@
 import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.STORAGE_BACKEND;
 import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.STORAGE_HOSTS;
 import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.STORAGE_PORT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -84,9 +83,11 @@ public void templateConfigurationShouldSupportMultiHosts() throws Exception {
         try {
             ConfiguredGraphFactory.createTemplateConfiguration(getTemplateConfigWithMultiHosts());
             final StandardJanusGraph graph = (StandardJanusGraph) ConfiguredGraphFactory.create("graph1");
-            final StandardJanusGraph graph1 = (StandardJanusGraph) ConfiguredGraphFactory.open("graph1");
             assertNotNull(graph);
-            assertEquals(graph, graph1);
+            graph.close();
+
+            final StandardJanusGraph graph1 = (StandardJanusGraph) ConfiguredGraphFactory.open("graph1");
+            assertNotNull(graph1);
         } finally {
             ConfiguredGraphFactory.removeConfiguration("graph1");
             ConfiguredGraphFactory.close("graph1");

diff --git a/janusgraph-hbase/docker/Dockerfile b/janusgraph-hbase/docker/Dockerfile
@@ -15,7 +15,7 @@
 FROM debian:buster as builder
 
 ARG HBASE_VERSION=2.2.7
-ARG HBASE_DIST="http://ftp.halifax.rwth-aachen.de/apache/hbase"
+ARG HBASE_DIST="http://archive.apache.org/dist/hbase"
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends curl=7.64.0-4+deb10u2