svn commit: r1847014 - in /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document: MongoUtils.java mongo/MongoDockerRule.java

[mreutegg]

Author: mreutegg
Date: Tue Nov 20 14:55:34 2018
New Revision: 1847014

URL: http://svn.apache.org/viewvc?rev=1847014&view=rev
Log:
OAK-7889: Test failure: Unable to start Docker container

Break circular dependency between MongoDockerRule and MongoUtils

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java?rev=1847014&r1=1847013&r2=1847014&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
 Tue Nov 20 14:55:34 2018
@@ -51,9 +51,6 @@ public class MongoUtils {
     public static final String DB =
             System.getProperty("mongo.db", "MongoMKDB");
 
-    public static final String VERSION =
-            System.getProperty("mongo.version", "3.6");
-
     private static final String OPTIONS = 
"connectTimeoutMS=3000&serverSelectionTimeoutMS=3000";
 
     public static final String URL = createMongoURL();

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java?rev=1847014&r1=1847013&r2=1847014&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java
 Tue Nov 20 14:55:34 2018
@@ -34,7 +34,9 @@ public class MongoDockerRule extends Doc
 
     private static final String CONFIG_NAME = "MongoDB";
 
-    private static final String IMAGE = "mongo:" + MongoUtils.VERSION;
+    private static final String VERSION = System.getProperty("mongo.version", 
"3.6");
+
+    private static final String IMAGE = "mongo:" + VERSION;
 
     private static final boolean DOCKER_AVAILABLE;