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 2019/07/10 18:43:25 UTC
[tinkerpop] 01/01: Merge pull request #1154 from
apache/TINKERPOP-2185
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 ed0e19e8cdc66fc6205e628c16d6d5aa94c60b40
Merge: 55db28c 607224a
Author: stephen mallette <sp...@users.noreply.github.com>
AuthorDate: Wed Jul 10 14:43:19 2019 -0400
Merge pull request #1154 from apache/TINKERPOP-2185
TINKERPOP-2185 Upgrade to commons-configuration2
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.5.x.asciidoc | 27 +++++
gremlin-core/pom.xml | 8 +-
.../tinkerpop/gremlin/jsr223/CoreImports.java | 24 ++--
.../tinkerpop/gremlin/jsr223/JavaTranslator.java | 4 +-
.../gremlin/process/computer/GraphComputer.java | 2 +-
.../gremlin/process/computer/MapReduce.java | 2 +-
.../gremlin/process/computer/VertexProgram.java | 2 +-
.../connected/ConnectedComponentVertexProgram.java | 6 +-
.../peerpressure/ClusterCountMapReduce.java | 2 +-
.../peerpressure/ClusterPopulationMapReduce.java | 2 +-
.../peerpressure/PeerPressureVertexProgram.java | 2 +-
.../ranking/pagerank/PageRankMapReduce.java | 2 +-
.../ranking/pagerank/PageRankVertexProgram.java | 2 +-
.../search/path/ShortestPathVertexProgram.java | 2 +-
.../computer/traversal/TraversalVertexProgram.java | 2 +-
.../step/map/ProgramVertexProgramStep.java | 4 +-
.../strategy/decoration/VertexProgramStrategy.java | 5 +-
.../util/AbstractVertexProgramBuilder.java | 13 +-
.../process/computer/util/ComputerGraph.java | 2 +-
.../process/computer/util/StaticMapReduce.java | 2 +-
.../process/computer/util/StaticVertexProgram.java | 2 +-
.../process/computer/util/VertexProgramHelper.java | 6 +-
.../gremlin/process/remote/RemoteConnection.java | 2 +-
.../traversal/AnonymousTraversalSource.java | 11 +-
.../gremlin/process/traversal/Traversal.java | 2 +-
.../process/traversal/TraversalStrategy.java | 4 +-
.../traversal/dsl/graph/GraphTraversalSource.java | 2 -
.../traversal/strategy/TraversalStrategyProxy.java | 2 +-
.../strategy/decoration/ElementIdStrategy.java | 4 +-
.../decoration/HaltedTraverserStrategy.java | 4 +-
.../strategy/decoration/OptionsStrategy.java | 4 +-
.../strategy/decoration/PartitionStrategy.java | 4 +-
.../strategy/decoration/SubgraphStrategy.java | 4 +-
.../finalization/MatchAlgorithmStrategy.java | 4 +-
.../EdgeLabelVerificationStrategy.java | 4 +-
.../process/traversal/util/PureTraversal.java | 2 +-
.../apache/tinkerpop/gremlin/structure/Graph.java | 7 +-
.../io/graphson/TraversalSerializersV2d0.java | 4 +-
.../io/graphson/TraversalSerializersV3d0.java | 4 +-
.../io/gryo/kryoshim/KryoShimService.java | 2 +-
.../io/gryo/kryoshim/KryoShimServiceLoader.java | 6 +-
.../structure/io/util/IoRegistryHelper.java | 2 +-
.../gremlin/structure/util/GraphFactory.java | 45 ++++---
.../gremlin/structure/util/empty/EmptyGraph.java | 2 +-
.../gremlin/structure/util/star/StarGraph.java | 4 +-
.../apache/tinkerpop/gremlin/util/SystemUtil.java | 5 +-
.../gremlin/util/config/YamlConfiguration.java | 127 -------------------
.../gremlin/process/TraversalStrategiesTest.java | 4 +-
.../dsl/graph/GraphTraversalSourceTest.java | 2 +-
.../gremlin/structure/io/gryo/GryoPoolTest.java | 6 +-
.../gremlin/structure/util/GraphFactoryTest.java | 4 +-
.../tinkerpop/gremlin/util/SystemUtilTest.java | 2 +-
.../gremlin/util/config/YamlConfigurationTest.java | 135 ---------------------
.../apache/tinkerpop/gremlin/driver/Cluster.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Settings.java | 2 +-
.../driver/remote/DriverRemoteConnection.java | 2 +-
.../driver/remote/DriverRemoteTraversal.java | 2 +-
.../driver/ser/binary/types/GraphSerializer.java | 5 +-
.../binary/types/TraversalStrategySerializer.java | 4 +-
.../tinkerpop/gremlin/driver/SettingsTest.java | 4 +-
.../gremlin/groovy/jsr223/GroovyTranslator.java | 4 +-
.../groovy/jsr223/GroovyTranslatorTest.java | 2 +-
.../gremlin/util/TinkerGraphProvider.java | 2 +-
.../gremlin/python/jsr223/JythonTranslator.java | 4 +-
.../gremlin/python/jsr223/PythonTranslator.java | 2 +-
.../gremlin/python/jsr223/PythonProvider.java | 2 +-
.../driver/remote/AbstractRemoteGraphProvider.java | 2 +-
.../gremlin/server/GremlinServerIntegrateTest.java | 4 +-
.../gremlin/AbstractFileGraphProvider.java | 2 +-
.../tinkerpop/gremlin/AbstractGraphProvider.java | 4 +-
.../tinkerpop/gremlin/AbstractGremlinTest.java | 2 +-
.../org/apache/tinkerpop/gremlin/GraphManager.java | 2 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 17 ++-
.../generator/CommunityGeneratorTest.java | 2 +-
.../generator/DistributionGeneratorTest.java | 2 +-
.../process/computer/GraphComputerTest.java | 6 +-
.../process/traversal/step/map/ProgramTest.java | 2 +-
.../traversal/step/sideEffect/SubgraphTest.java | 2 +-
.../decoration/PartitionStrategyProcessTest.java | 2 +-
.../decoration/SubgraphStrategyProcessTest.java | 2 +-
.../gremlin/structure/GraphConstructionTest.java | 2 +-
.../tinkerpop/gremlin/structure/RemoteGraph.java | 7 +-
.../gremlin/structure/TransactionTest.java | 2 +-
.../gremlin/structure/io/IoCustomTest.java | 2 +-
.../gremlin/structure/io/IoGraphTest.java | 2 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 2 +-
.../gremlin/structure/util/star/StarGraphTest.java | 2 +-
.../tinkerpop/gremlin/structure/io/Model.java | 4 +-
hadoop-gremlin/pom.xml | 11 +-
.../hadoop/process/computer/HadoopCombine.java | 2 +-
.../gremlin/hadoop/process/computer/HadoopMap.java | 2 +-
.../hadoop/process/computer/HadoopReduce.java | 2 +-
.../process/computer/util/MapReduceHelper.java | 3 +-
.../hadoop/structure/HadoopConfiguration.java | 33 +++--
.../gremlin/hadoop/structure/HadoopGraph.java | 11 +-
.../hadoop/structure/io/FileSystemStorage.java | 4 +-
.../hadoop/structure/io/GraphFilterAware.java | 2 +-
.../hadoop/structure/io/HadoopPoolShimService.java | 2 +-
.../gremlin/hadoop/structure/io/HadoopPools.java | 4 +-
.../hadoop/structure/io/InputOutputHelper.java | 4 +-
.../structure/io/ObjectWritableComparator.java | 4 +-
.../gremlin/hadoop/structure/util/ConfUtil.java | 9 +-
.../gremlin/neo4j/structure/Neo4jGraph.java | 6 +-
.../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +-
pom.xml | 20 ++-
.../spark/process/computer/SparkExecutor.java | 2 +-
.../spark/process/computer/SparkGraphComputer.java | 12 +-
.../tinkerpop/gremlin/spark/structure/Spark.java | 2 +-
.../gremlin/spark/structure/io/InputFormatRDD.java | 2 +-
.../spark/structure/io/InputOutputHelper.java | 4 +-
.../gremlin/spark/structure/io/InputRDD.java | 2 +-
.../spark/structure/io/OutputFormatRDD.java | 2 +-
.../gremlin/spark/structure/io/OutputRDD.java | 2 +-
.../spark/structure/io/PersistedInputRDD.java | 2 +-
.../spark/structure/io/PersistedOutputRDD.java | 2 +-
.../spark/structure/io/SparkContextStorage.java | 4 +-
.../spark/structure/io/gryo/GryoSerializer.java | 5 +-
.../kryoshim/unshaded/UnshadedKryoShimService.java | 2 +-
.../tinkerpop/gremlin/spark/AbstractSparkTest.java | 5 +-
.../spark/process/computer/LocalPropertyTest.java | 4 +-
.../optimization/SparkInterceptorStrategyTest.java | 2 +-
.../SparkSingleIterationStrategyTest.java | 2 +-
.../gremlin/spark/structure/SparkTest.java | 4 +-
.../spark/structure/io/ExampleInputRDD.java | 2 +-
.../spark/structure/io/ExampleOutputRDD.java | 2 +-
.../spark/structure/io/InputOutputRDDTest.java | 4 +-
.../gremlin/spark/structure/io/InputRDDTest.java | 4 +-
.../gremlin/spark/structure/io/OutputRDDTest.java | 4 +-
.../io/PersistedInputOutputRDDIntegrateTest.java | 2 +-
.../spark/structure/io/ToyGraphInputRDD.java | 2 +-
.../io/gryo/GryoSerializerIntegrateTest.java | 2 +-
.../tinkergraph/structure/TinkerFactory.java | 4 +-
.../gremlin/tinkergraph/structure/TinkerGraph.java | 4 +-
.../structure/TinkerIoRegistryV1d0.java | 4 +-
.../structure/TinkerIoRegistryV2d0.java | 4 +-
.../structure/TinkerIoRegistryV3d0.java | 4 +-
.../gremlin/tinkergraph/TinkerGraphProvider.java | 2 +-
.../process/TinkerGraphComputerProvider.java | 2 +-
.../decoration/HaltedTraverserStrategyTest.java | 2 +-
.../structure/TinkerGraphIdManagerTest.java | 4 +-
.../tinkergraph/structure/TinkerGraphTest.java | 4 +-
142 files changed, 322 insertions(+), 564 deletions(-)
diff --cc CHANGELOG.asciidoc
index 6d809b7,395bcd4..b5976c7
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,11 -26,10 +26,12 @@@ image::https://raw.githubusercontent.co
This release also includes changes from <<release-3-4-3, 3.4.3>>.
* Modified `null` handling in mutations to be consistent for a new `Vertex` as well as update to an existing one.
+ * Upgraded to Apache Commons Configuration2.
* Removed previously deprecated `TraversalSource.withRemote()`.
+* Removed previously deprecated `VertexProgram` related infrastructure.
* Removed previously deprecated SSL settings: `keyCertChainFile`, `keyFile`, `keyPassword` and `trustCertChainFile` and related infrastructure.
* Removed previously deprecated `BulkDumperVertexProgram` and `BulkLoaderVertexProgram`.
+* Upgrade to Neo4j 3.4.11
== TinkerPop 3.4.0 (Avant-Gremlin Construction #3 for Theremin and Flowers)
diff --cc tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index a0a0ce7,0f025c0..233fe87
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@@ -18,11 -18,10 +18,11 @@@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.structure;
- 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.GraphHelper;
import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;