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 a2dfcd0f8174ce59d617efd47b8b596797bcd2b8 Merge: 4240b35 ef941e3 Author: stephen <[email protected]> AuthorDate: Fri Nov 8 07:23:36 2019 -0500 Merge branch 'tp34' docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java | 101 +++++++++-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 188 +++++++++++++++++++++ .../SerializerTest.java => AssertHelper.java} | 27 +-- .../org/apache/tinkerpop/gremlin/TestHelper.java | 147 ---------------- .../jsr223/DefaultScriptCustomizerTest.java | 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 8 +- .../jsr223/ScriptFileGremlinPluginTest.java | 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../StandardVerificationStrategyTest.java | 6 +- .../gremlin/structure/io/GraphMigratorTest.java | 4 +- .../tinkerpop/gremlin/structure/io/IoCoreTest.java | 4 +- .../structure/io/graphson/GraphSONTokensTest.java | 4 +- .../structure/io/graphson/GraphSONUtilTest.java | 4 +- .../gremlin/structure/util/ComparatorsTest.java | 4 +- .../gremlin/structure/util/ElementHelperTest.java | 4 +- .../gremlin/structure/util/GraphFactoryTest.java | 32 ++-- .../structure/util/GraphVariableHelperTest.java | 4 +- .../gremlin/structure/util/StringFactoryTest.java | 4 +- .../apache/tinkerpop/gremlin/util/GremlinTest.java | 4 +- .../tinkerpop/gremlin/util/SerializerTest.java | 4 +- .../tinkerpop/gremlin/util/TimeUtilTest.java | 4 +- .../gremlin/util/function/FunctionUtilsTest.java | 5 +- .../gremlin/util/iterator/IteratorUtilsTest.java | 4 +- .../tinkerpop/gremlin/util/tools/MultiMapTest.java | 5 +- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 ++++---- .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 +++++---- .../gremlin/util/TinkerGraphProvider.java | 4 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +++++-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../gremlin/AbstractFileGraphProvider.java | 12 +- .../apache/tinkerpop/gremlin/GraphProvider.java | 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 142 ++-------------- .../gremlin/jsr223/BindingsScriptEngineTest.java | 3 +- .../gremlin/structure/io/IoGraphTest.java | 8 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 31 ++-- hadoop-gremlin/README.md | 52 ++++++ hadoop-gremlin/pom.xml | 29 ++++ .../apache/tinkerpop/gremlin/hadoop/Constants.java | 22 +++ .../computer/AbstractHadoopGraphComputer.java | 12 +- .../hadoop/structure/io/FileSystemStorage.java | 101 ++++++----- .../hadoop/structure/io/InputOutputHelper.java | 2 +- .../computer/AbstractHadoopGraphComputerTest.java | 59 ++++--- .../structure/io/RecordReaderWriterTest.java | 5 +- pom.xml | 18 +- .../tinkerpop/gremlin/spark/structure/Spark.java | 7 +- .../spark/structure/io/SparkContextStorage.java | 107 +++++++++--- .../structure/io/AbstractIoRegistryCheck.java | 7 +- .../hadoop/structure/io/AbstractStorageCheck.java | 48 +++--- .../structure/io/FileSystemStorageCheck.java | 24 ++- .../spark/process/computer/LocalPropertyTest.java | 2 +- .../SparkHadoopGraphGryoSerializerProvider.java | 1 + .../gremlin/spark/structure/SparkTest.java | 3 +- .../structure/io/SparkContextStorageCheck.java | 26 +-- .../io/gryo/GryoSerializerIntegrateTest.java | 4 +- .../gremlin/tinkergraph/TinkerGraphProvider.java | 4 +- .../tinkergraph/TinkerGraphUUIDProvider.java | 4 +- .../structure/IoDataGenerationTest.java | 127 +++++++------- .../tinkergraph/structure/TinkerGraphTest.java | 13 +- 71 files changed, 1036 insertions(+), 741 deletions(-) diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactoryTest.java index c146f72,514b28c..5fc6951 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactoryTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactoryTest.java @@@ -18,9 -18,9 +18,9 @@@ */ package org.apache.tinkerpop.gremlin.structure.util; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; - import org.apache.tinkerpop.gremlin.TestHelper; + import org.apache.tinkerpop.gremlin.AssertHelper; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractFileGraphProvider.java index 636ea3d,18e9a0d..cedbf38 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractFileGraphProvider.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractFileGraphProvider.java @@@ -18,8 -18,9 +18,9 @@@ */ package org.apache.tinkerpop.gremlin; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.tinkerpop.gremlin.structure.Graph; + import org.apache.tinkerpop.gremlin.structure.io.Storage; import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONResourceAccess; import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoResourceAccess; import org.apache.tinkerpop.gremlin.structure.io.script.ScriptResourceAccess;
