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 2017/01/12 13:25:33 UTC
[1/7] tinkerpop git commit: Introduce Revapi API checks into the
build.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1443 [created] fa2b00585
Introduce Revapi API checks into the build.
The API checker is set up to only check classes in org.apache.tinkerpop
package (and sub packages) and is set up to ignore breaking changes
on a minor version increase.
It always reports non-public classes that leak into the API though.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f35041fe
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f35041fe
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f35041fe
Branch: refs/heads/TINKERPOP-1443
Commit: f35041fe52173f4ce73ad4385d1ad011306e3df1
Parents: fbefd8c
Author: Lukas Krejci <lk...@redhat.com>
Authored: Mon Nov 14 23:55:23 2016 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Mon Nov 14 23:55:23 2016 +0100
----------------------------------------------------------------------
gremlin-groovy-test/pom.xml | 3 +++
gremlin-python/pom.xml | 1 +
gremlin-test/pom.xml | 3 +++
pom.xml | 50 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f35041fe/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index 1df9a88..6f0423a 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -25,6 +25,9 @@ limitations under the License.
</parent>
<artifactId>gremlin-groovy-test</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy Test</name>
+ <properties>
+ <revapi.skip>true</revapi.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f35041fe/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 923380d..f9c47cd 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -75,6 +75,7 @@
<maven.test.skip>false</maven.test.skip>
<skipTests>${maven.test.skip}</skipTests>
<gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
+ <revapi.skip>true</revapi.skip>
</properties>
<build>
<directory>${basedir}/target</directory>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f35041fe/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index cdea5c9..eb05a9c 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -25,6 +25,9 @@ limitations under the License.
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
+ <properties>
+ <revapi.skip>true</revapi.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f35041fe/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e58bf07..9af0ab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,6 +314,56 @@ limitations under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.revapi</groupId>
+ <artifactId>revapi-maven-plugin</artifactId>
+ <version>0.7.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.revapi</groupId>
+ <artifactId>revapi-java</artifactId>
+ <version>0.11.2</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+
+ <analysisConfiguration><![CDATA[
+ {
+ "revapi": {
+ "java": {
+ "filter": {
+ //gremlin-shaded includes a lot of stuff from 3rd party libraries that break their API between
+ //versions. Let's just not consider them part of Tinkerpop API. -->
+ "packages": {
+ "regex": true,
+ "exclude": ["org\\.apache\\.tinkerpop\\.shaded(\\..+)?"],
+ "include": ["org\\.apache\\.tinkerpop(\\..+)?"]
+ }
+ }
+ },
+ "semver": {
+ "ignore": {
+ "enabled": true,
+ "versionIncreaseAllows": {
+ "major": "breaking",
+ "minor": "breaking",
+ "patch": "nonBreaking"
+ },
+ "passThroughDifferences": ["java.class.nonPublicPartOfAPI"]
+ }
+ }
+ }
+ }
+ ]]></analysisConfiguration>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
[5/7] tinkerpop git commit: Merge remote-tracking branch
'upstream/tp32' into api-check-tp32
Posted by sp...@apache.org.
Merge remote-tracking branch 'upstream/tp32' into api-check-tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c4d4e8ef
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c4d4e8ef
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c4d4e8ef
Branch: refs/heads/TINKERPOP-1443
Commit: c4d4e8ef30c13dc4020dfcc360e21396fec386e6
Parents: aa6593a 9c44f0d
Author: Lukas Krejci <lk...@redhat.com>
Authored: Fri Jan 6 23:16:53 2017 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Fri Jan 6 23:16:53 2017 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 36 ++
docker/build.sh | 2 +-
docker/scripts/build.sh | 7 +
.../developer/development-environment.asciidoc | 20 +-
docs/src/dev/io/graphson.asciidoc | 4 +-
docs/src/dev/provider/index.asciidoc | 2 +-
.../src/reference/gremlin-applications.asciidoc | 24 +-
docs/src/reference/gremlin-variants.asciidoc | 5 -
.../reference/implementations-neo4j.asciidoc | 2 +-
docs/src/reference/the-graph.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 35 +-
.../gremlin-language-variants/index.asciidoc | 3 -
.../upgrade/release-3.2.x-incubating.asciidoc | 124 +++++-
.../groovy/plugin/GiraphGremlinPlugin.java | 2 +
.../giraph/jsr223/GiraphGremlinPlugin.java | 58 +++
.../src/test/resources/giraph-site.xml | 12 +
.../archetype-resources/src/main/java/App.java | 2 +-
.../src/main/java/Service.java | 4 +-
.../src/test/java/ServiceTest.java | 4 +-
.../src/test/resources/gremlin-server.yaml | 2 +-
.../tinkerpop/gremlin/console/Console.groovy | 31 +-
.../ConsoleImportCustomizerProvider.groovy | 2 +
.../tinkerpop/gremlin/console/Mediator.groovy | 4 +-
.../console/commands/InstallCommand.groovy | 14 +-
.../console/jsr223/GephiRemoteAcceptor.groovy | 369 +++++++++++++++++
.../console/plugin/ConsolePluginAcceptor.groovy | 2 +-
.../console/plugin/GephiRemoteAcceptor.groovy | 2 +
.../gremlin/console/plugin/PluggedIn.groovy | 112 ++++++
.../groovy/plugin/DriverGremlinPlugin.java | 2 +
.../groovy/plugin/DriverRemoteAcceptor.java | 2 +
.../groovy/plugin/GephiGremlinPlugin.java | 1 +
.../groovy/plugin/UtilitiesGremlinPlugin.java | 1 +
.../console/jsr223/DriverGremlinPlugin.java | 104 +++++
.../console/jsr223/DriverRemoteAcceptor.java | 238 +++++++++++
.../console/jsr223/GephiGremlinPlugin.java | 41 ++
.../console/jsr223/UtilitiesGremlinPlugin.java | 106 +++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 3 +
.../jsr223/UtilitiesGremlinPluginScript.groovy | 52 +++
.../groovy/plugin/GremlinPluginAdapterTest.java | 130 ++++++
.../plugin/gremlin-server-integration.yaml | 2 +-
.../gremlin/console/groovy/plugin/remote.yaml | 2 +-
.../groovy/plugin/script-customizer-1.groovy | 3 +
.../groovy/plugin/script-customizer-2.groovy | 2 +
.../gremlin/jsr223/AbstractGremlinPlugin.java | 58 +++
.../gremlin/jsr223/BindingsCustomizer.java | 33 ++
.../CachedGremlinScriptEngineManager.java | 1 +
.../gremlin/jsr223/CoreGremlinModule.java | 25 +-
.../gremlin/jsr223/CoreGremlinPlugin.java | 62 +++
.../tinkerpop/gremlin/jsr223/CoreImports.java | 250 ++++++++++++
.../tinkerpop/gremlin/jsr223/Customizer.java | 4 +-
.../jsr223/DefaultBindingsCustomizer.java | 40 ++
.../DefaultGremlinScriptEngineManager.java | 38 +-
.../gremlin/jsr223/DefaultImportCustomizer.java | 102 +++++
.../gremlin/jsr223/DefaultScriptCustomizer.java | 56 +++
.../tinkerpop/gremlin/jsr223/GremlinModule.java | 13 +
.../tinkerpop/gremlin/jsr223/GremlinPlugin.java | 61 +++
.../jsr223/GremlinScriptEngineManager.java | 8 +
.../gremlin/jsr223/ImportCustomizer.java | 83 +---
.../gremlin/jsr223/ImportGremlinPlugin.java | 190 +++++++++
.../gremlin/jsr223/LazyBindingsCustomizer.java | 39 ++
.../gremlin/jsr223/ScriptCustomizer.java | 34 ++
.../gremlin/jsr223/ScriptEngineCache.java | 54 +++
.../gremlin/jsr223/ScriptFileGremlinPlugin.java | 77 ++++
.../SingleGremlinScriptEngineManager.java | 9 +-
.../jsr223/console/ConsoleCustomizer.java | 33 ++
.../jsr223/console/GremlinShellEnvironment.java | 37 ++
.../gremlin/jsr223/console/PluginAcceptor.java | 62 +++
.../gremlin/jsr223/console/RemoteAcceptor.java | 83 ++++
.../gremlin/jsr223/console/RemoteException.java | 40 ++
.../process/remote/RemoteConnection.java | 28 +-
.../remote/traversal/RemoteTraversal.java | 8 +-
.../remote/traversal/step/map/RemoteStep.java | 32 +-
.../gremlin/process/traversal/Bindings.java | 39 +-
.../gremlin/process/traversal/Bytecode.java | 19 +-
.../gremlin/process/traversal/Traversal.java | 23 ++
.../process/traversal/TraversalEngine.java | 2 +-
.../process/traversal/TraversalSideEffects.java | 8 +-
.../process/traversal/TraversalSource.java | 7 +-
.../traversal/dsl/graph/GraphTraversal.java | 130 ++++--
.../dsl/graph/GraphTraversalSource.java | 4 +-
.../gremlin/process/traversal/dsl/graph/__.java | 43 +-
.../traversal/step/map/GroupStepV3d0.java | 2 +-
.../step/map/LambdaCollectingBarrierStep.java | 2 +-
.../traversal/step/util/HasContainer.java | 26 +-
.../strategy/decoration/SubgraphStrategy.java | 4 +-
.../optimization/FilterRankingStrategy.java | 43 +-
.../IncidentToAdjacentStrategy.java | 4 +-
.../optimization/InlineFilterStrategy.java | 20 +-
.../process/traversal/util/TraversalHelper.java | 19 +-
.../process/traversal/util/TraversalRing.java | 8 +-
.../gremlin/structure/io/IoRegistry.java | 2 +-
.../structure/io/graphson/GraphSONModule.java | 24 +-
.../io/graphson/GraphSONSerializersV2d0.java | 24 ++
.../GraphSONTraversalSerializersV2d0.java | 9 +-
.../io/graphson/GraphSONTypeSerializer.java | 100 +++--
.../structure/io/gryo/GryoClassResolver.java | 13 +
.../gremlin/structure/io/gryo/GryoMapper.java | 402 +------------------
.../gremlin/structure/io/gryo/GryoPool.java | 23 +-
.../structure/io/gryo/GryoSerializers.java | 43 +-
.../gremlin/structure/io/gryo/GryoTypeReg.java | 140 +++++++
.../gremlin/structure/io/gryo/GryoVersion.java | 332 +++++++++++++++
.../structure/io/gryo/UtilSerializers.java | 64 +++
.../structure/io/gryo/kryoshim/InputShim.java | 2 +
.../structure/io/gryo/kryoshim/OutputShim.java | 2 +
.../kryoshim/shaded/ShadedInputAdapter.java | 5 +
.../kryoshim/shaded/ShadedOutputAdapter.java | 8 +-
.../gremlin/structure/util/ElementHelper.java | 6 +-
.../gremlin/structure/util/StringFactory.java | 19 +-
.../tinkerpop/gremlin/util/CoreImports.java | 35 +-
.../gremlin/util/ScriptEngineCache.java | 4 +-
.../jsr223/DefaultImportCustomizerTest.java | 76 ++++
.../jsr223/DefaultScriptCustomizerTest.java | 55 +++
.../gremlin/jsr223/ImportGremlinPluginTest.java | 149 +++++++
.../gremlin/jsr223/ScriptEngineCacheTest.java | 46 +++
.../jsr223/ScriptFileGremlinPluginTest.java | 62 +++
.../jsr223/SingleScriptEngineManagerTest.java | 45 +++
.../optimization/GraphFilterStrategyTest.java | 2 +-
.../gremlin/process/traversal/BytecodeTest.java | 32 +-
.../process/traversal/TraversalTest.java | 328 +++++++++++++++
.../traversal/step/filter/HasStepTest.java | 12 +-
.../optimization/FilterRankingStrategyTest.java | 27 +-
.../optimization/InlineFilterStrategyTest.java | 12 +-
.../gremlin/structure/io/IoXIoRegistry.java | 2 +-
.../gremlin/structure/io/IoYIoRegistry.java | 2 +-
.../structure/io/gryo/GryoMapperTest.java | 41 +-
.../structure/util/ElementHelperTest.java | 73 +++-
.../gremlin/jsr223/script-customizer-1.groovy | 3 +
.../gremlin/jsr223/script-customizer-2.groovy | 2 +
gremlin-driver/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 5 +-
.../tinkerpop/gremlin/driver/Connection.java | 6 +-
.../driver/remote/DriverRemoteConnection.java | 24 +-
.../driver/remote/DriverRemoteTraversal.java | 16 +-
.../DriverRemoteTraversalSideEffects.java | 22 +-
.../ser/AbstractGryoMessageSerializerV1d0.java | 4 +-
.../driver/ser/AbstractMessageSerializer.java | 26 +-
.../DriverRemoteTraversalSideEffectsTest.java | 12 +-
.../ser/GryoBaseMessageSerializerV1d0Test.java | 93 +++++
.../step/filter/GroovyWhereTest.groovy | 11 +
.../traversal/step/map/GroovyPathTest.groovy | 5 +
.../dsl/credential/CredentialGraphTest.java | 121 ++++++
.../dsl/credential/CredentialGraphTest.java | 2 +-
gremlin-groovy/pom.xml | 10 +-
.../groovy/util/DependencyGrabber.groovy | 84 ++--
.../gremlin/groovy/engine/GremlinExecutor.java | 139 ++++++-
.../gremlin/groovy/engine/ScriptEngines.java | 2 +
.../jsr223/CompileStaticGroovyCustomizer.java | 60 +++
.../jsr223/ConfigurationGroovyCustomizer.java | 82 ++++
.../groovy/jsr223/DependencyManager.java | 3 +
.../jsr223/GremlinGroovyScriptEngine.java | 102 +++--
.../jsr223/GroovyCompilerGremlinPlugin.java | 132 ++++++
.../gremlin/groovy/jsr223/GroovyCustomizer.java | 33 ++
.../groovy/jsr223/ImportGroovyCustomizer.java | 66 +++
.../jsr223/InterpreterModeGroovyCustomizer.java | 36 ++
.../jsr223/ScriptEnginePluginAcceptor.java | 2 +
.../groovy/jsr223/SugarGremlinPlugin.java | 41 ++
.../jsr223/ThreadInterruptGroovyCustomizer.java | 35 ++
.../jsr223/TimedInterruptGroovyCustomizer.java | 62 +++
.../jsr223/TimedInterruptTimeoutException.java | 38 ++
.../jsr223/TypeCheckedGroovyCustomizer.java | 65 +++
.../CompileStaticCustomizerProvider.java | 3 +
.../ConfigurationCustomizerProvider.java | 3 +
.../InterpreterModeCustomizerProvider.java | 5 +
.../ThreadInterruptCustomizerProvider.java | 3 +
.../TimedInterruptCustomizerProvider.java | 3 +
.../TimedInterruptTimeoutException.java | 4 +
.../TypeCheckedCustomizerProvider.java | 3 +
.../VariableIdentificationCustomizer.java | 2 +
.../jsr223/dsl/credential/CredentialGraph.java | 121 ++++++
.../CredentialGraphGremlinPlugin.java | 51 +++
.../dsl/credential/CredentialGraphTokens.java | 31 ++
.../groovy/plugin/AbstractGremlinPlugin.java | 2 +
.../gremlin/groovy/plugin/Artifact.java | 2 +
.../gremlin/groovy/plugin/GremlinPlugin.java | 1 +
.../groovy/plugin/GremlinPluginException.java | 2 +
.../plugin/IllegalEnvironmentException.java | 2 +
.../gremlin/groovy/plugin/PluginAcceptor.java | 2 +
.../plugin/PluginInitializationException.java | 2 +
.../gremlin/groovy/plugin/RemoteAcceptor.java | 2 +
.../gremlin/groovy/plugin/RemoteException.java | 2 +
.../groovy/plugin/SugarGremlinPlugin.java | 2 +
.../plugin/dsl/credential/CredentialGraph.java | 2 +
.../CredentialGraphGremlinPlugin.java | 2 +
.../dsl/credential/CredentialGraphTokens.java | 2 +
.../tinkerpop/gremlin/groovy/util/Artifact.java | 86 ++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 2 +
...aultDefaultImportCustomizerProviderTest.java | 90 +++++
.../DefaultImportCustomizerProviderTest.java | 90 -----
...mlinGroovyScriptEngineCompileStaticTest.java | 72 +++-
.../GremlinGroovyScriptEngineConfigTest.java | 11 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 52 ++-
...inGroovyScriptEngineThreadInterruptTest.java | 23 +-
...linGroovyScriptEngineTimedInterruptTest.java | 65 ++-
...remlinGroovyScriptEngineTypeCheckedTest.java | 72 +++-
.../jsr223/GroovyCompilerGremlinPluginTest.java | 128 ++++++
.../gremlin/groovy/plugin/ArtifactTest.java | 2 -
.../gremlin/groovy/util/ArtifactTest.java | 85 ++++
.../util/DependencyGrabberIntegrateTest.java | 2 +-
gremlin-python/pom.xml | 7 +-
.../python/GraphTraversalSourceGenerator.groovy | 15 +-
.../python/TraversalSourceGenerator.groovy | 35 +-
.../jsr223/GremlinJythonScriptEngine.java | 172 +++++---
.../GremlinJythonScriptEngineFactory.java | 9 +-
.../driver/driver_remote_connection.py | 23 +-
.../gremlin_python/driver/remote_connection.py | 19 +-
.../gremlin_python/process/graph_traversal.py | 19 +-
.../jython/gremlin_python/process/traversal.py | 33 ++
.../gremlin_python/structure/io/graphson.py | 10 +
.../driver/test_driver_remote_connection.py | 78 +++-
.../main/jython/tests/process/test_traversal.py | 26 ++
.../jython/tests/structure/io/test_graphson.py | 10 +
.../jsr223/GremlinJythonScriptEngineTest.java | 12 +-
.../python/jsr223/JythonScriptEngineSetup.java | 2 +-
.../python/jsr223/JythonTranslatorTest.java | 10 -
.../jsr223/PythonGraphSONJavaTranslator.java | 2 +-
.../gremlin/python/jsr223/PythonProvider.java | 5 +-
.../driver/gremlin-server-modern-secure-py.yaml | 4 +-
.../gremlin/server/AbstractChannelizer.java | 2 +-
.../tinkerpop/gremlin/server/Settings.java | 8 +
.../handler/SaslAuthenticationHandler.java | 2 +-
.../jsr223/GremlinServerGremlinPlugin.java | 42 ++
.../server/op/AbstractEvalOpProcessor.java | 5 +
.../gremlin/server/op/AbstractOpProcessor.java | 9 +-
.../op/traversal/TraversalOpProcessor.java | 11 +-
.../server/util/ServerGremlinExecutor.java | 16 +-
.../driver/remote/RemoteGraphProvider.java | 5 +-
.../AbstractGremlinServerPerformanceTest.java | 2 +-
.../server/GremlinAdditionPerformanceTest.java | 2 +-
.../server/GremlinDriverIntegrateTest.java | 98 ++---
.../server/GremlinResultSetIntegrateTest.java | 4 +-
.../server/GremlinServerAuthIntegrateTest.java | 24 +-
.../GremlinServerAuthOldIntegrateTest.java | 25 +-
.../server/GremlinServerHttpIntegrateTest.java | 94 ++---
.../server/GremlinServerIntegrateTest.java | 103 +++--
.../GremlinServerSessionIntegrateTest.java | 22 +-
.../server/GremlinTraversalPerformanceTest.java | 2 +-
.../gremlin/server/TestClientFactory.java | 60 +++
.../remote/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
.../apache/tinkerpop/gremlin/TestHelper.java | 16 +
.../jsr223/GremlinEnabledScriptEngineTest.java | 37 +-
.../gremlin/process/ProcessComputerSuite.java | 6 +-
.../gremlin/process/ProcessStandardSuite.java | 4 +-
.../TraversalInterruptionComputerTest.java | 15 +-
.../process/traversal/step/ComplexTest.java | 205 ++++++++++
.../traversal/step/filter/WhereTest.java | 31 ++
.../process/traversal/step/map/PathTest.java | 35 +-
.../traversal/step/map/PeerPressureTest.java | 2 +
.../gremlin/structure/PropertyTest.java | 1 +
.../groovy/plugin/HadoopGremlinPlugin.java | 2 +
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +
.../hadoop/jsr223/HadoopGremlinPlugin.java | 159 ++++++++
.../hadoop/jsr223/HadoopRemoteAcceptor.java | 127 ++++++
.../hadoop/structure/HadoopConfiguration.java | 4 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../neo4j/groovy/plugin/Neo4jGremlinPlugin.java | 2 +
.../neo4j/jsr223/Neo4jGremlinPlugin.java | 71 ++++
.../step/sideEffect/Neo4jGraphStep.java | 11 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../Neo4jGraphStepStrategyTest.java | 12 +-
pom.xml | 25 +-
.../spark/groovy/plugin/SparkGremlinPlugin.java | 2 +
.../spark/jsr223/SparkGremlinPlugin.java | 92 +++++
.../io/gryo/IoRegistryAwareKryoSerializer.java | 6 -
.../kryoshim/unshaded/UnshadedInputAdapter.java | 32 +-
.../kryoshim/unshaded/UnshadedKryoAdapter.java | 30 +-
.../unshaded/UnshadedKryoShimService.java | 6 -
.../unshaded/UnshadedOutputAdapter.java | 35 +-
.../unshaded/UnshadedSerializerAdapter.java | 9 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../SparkGraphComputerProcessIntegrateTest.java | 32 ++
.../computer/SparkGraphComputerProcessTest.java | 32 --
...GraphComputerGroovyProcessIntegrateTest.java | 33 ++
.../SparkGraphComputerGroovyProcessTest.java | 33 --
.../PersistedInputOutputRDDIntegrateTest.java | 358 +++++++++++++++++
.../io/PersistedInputOutputRDDTest.java | 358 -----------------
.../groovy/plugin/TinkerGraphGremlinPlugin.java | 3 +-
.../jsr223/TinkerGraphGremlinPlugin.java | 72 ++++
.../step/sideEffect/TinkerGraphStep.java | 9 +-
.../tinkergraph/structure/TinkerGraph.java | 2 +-
.../tinkergraph/structure/TinkerIoRegistry.java | 18 +-
.../structure/TinkerIoRegistryV2d0.java | 18 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../TinkerGraphStepStrategyTest.java | 10 +-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 4 +-
.../tinkergraph/structure/TinkerGraphTest.java | 27 +-
287 files changed, 9290 insertions(+), 1874 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c4d4e8ef/pom.xml
----------------------------------------------------------------------
[7/7] tinkerpop git commit: Merge branch 'pr-494' into TINKERPOP-1443
Posted by sp...@apache.org.
Merge branch 'pr-494' into TINKERPOP-1443
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa2b0058
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa2b0058
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa2b0058
Branch: refs/heads/TINKERPOP-1443
Commit: fa2b005854c118d11946eb54b0134bdb1fc84f70
Parents: 31439c0 fe71e50
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 08:21:15 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jan 12 08:21:15 2017 -0500
----------------------------------------------------------------------
.travis.install-maven.sh | 19 ++++++++++
.travis.yml | 12 +++++++
gremlin-core/api-changes.json | 28 +++++++++++++++
gremlin-core/api-contents.json | 22 ++++++++++++
gremlin-core/pom.xml | 3 ++
pom.xml | 69 +++++++++++++++++++++++++++++++++++++
6 files changed, 153 insertions(+)
----------------------------------------------------------------------
[4/7] tinkerpop git commit: Finalize Revapi setup: * Switched off by
default with only gremlin-core having it active * Explicitly sets the
severity of problems to fail the build with to "potentiallyBreaking". * The
parent pom only includes common setup
Posted by sp...@apache.org.
Finalize Revapi setup:
* Switched off by default with only gremlin-core having it active
* Explicitly sets the severity of problems to fail the build with to
"potentiallyBreaking".
* The parent pom only includes common setup.
* Other setup (like what packages to include in a check and what changes
to ignore because they are intentional) is externalized into
per-module configuration files.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aa6593a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa6593a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aa6593a2
Branch: refs/heads/TINKERPOP-1443
Commit: aa6593a2b6a640f7d7e3985998c3c0dd77222cfd
Parents: 8ce1204
Author: Lukas Krejci <lk...@redhat.com>
Authored: Mon Nov 28 23:28:06 2016 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Mon Nov 28 23:28:06 2016 +0100
----------------------------------------------------------------------
gremlin-core/api-changes.json | 28 ++++++++++++++++++++++++
gremlin-core/api-contents.json | 22 +++++++++++++++++++
gremlin-core/pom.xml | 3 +++
gremlin-groovy-test/pom.xml | 3 ---
gremlin-python/pom.xml | 1 -
gremlin-test/pom.xml | 3 ---
pom.xml | 43 ++++++++++++++++++++++++++-----------
7 files changed, 84 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/gremlin-core/api-changes.json
----------------------------------------------------------------------
diff --git a/gremlin-core/api-changes.json b/gremlin-core/api-changes.json
new file mode 100644
index 0000000..95b8038
--- /dev/null
+++ b/gremlin-core/api-changes.json
@@ -0,0 +1,28 @@
+// Example:
+// {
+// "3.3.0": {
+// "revapi": {
+// "ignore": [
+// {
+// "code": "java.method.addedToInterface",
+// "new": "method void org.apache.tinkerpop.gremlin.structure.Graph::solveWorldHunger()",
+// "justification": "Gremlin became sentient and self-aware. This is what it/she/he did first."
+// }
+// ]
+// }
+// },
+// "3.3.1": {
+// "revapi": {
+// "ignore": [
+// {
+// "code": "java.method.removed",
+// "old": "method void org.apache.tinkerpop.gremlin.structure.Graph::solveWorldHunger()",
+// "justification": "Gremlin has a strange sense of humour."
+// }
+// ]
+// }
+// },
+// ...
+// }
+{
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/gremlin-core/api-contents.json
----------------------------------------------------------------------
diff --git a/gremlin-core/api-contents.json b/gremlin-core/api-contents.json
new file mode 100644
index 0000000..aca7f54
--- /dev/null
+++ b/gremlin-core/api-contents.json
@@ -0,0 +1,22 @@
+{
+ "revapi": {
+ "java": {
+ "filter": {
+ "packages": {
+ "regex": true,
+ //gremlin-shaded includes a lot of stuff from 3rd party libraries that break their API between
+ //versions. Let's just not consider them part of Tinkerpop API. -->
+ "exclude": ["org\\.apache\\.tinkerpop\\.shaded(\\..+)?"],
+ "include": [
+ //Be aware that the definitions below do NOT include the subpackages...
+ "org\\.apache\\.tinkerpop\\.gremlin\\.structure",
+ "org\\.apache\\.tinkerpop\\.gremlin\\.structure\\.io",
+ "org\\.apache\\.tinkerpop\\.gremlin\\.process\\.computer",
+ "org\\.apache\\.tinkerpop\\.gremlin\\.process\\.traversal",
+ "org\\.apache\\.tinkerpop\\.gremlin\\.process\\.traversal.dsl.graph"
+ ]
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index e8f3a34..c4e2430 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -24,6 +24,9 @@ limitations under the License.
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
+ <properties>
+ <revapi.skip>false</revapi.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index 6f0423a..1df9a88 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -25,9 +25,6 @@ limitations under the License.
</parent>
<artifactId>gremlin-groovy-test</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy Test</name>
- <properties>
- <revapi.skip>true</revapi.skip>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index f9c47cd..923380d 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -75,7 +75,6 @@
<maven.test.skip>false</maven.test.skip>
<skipTests>${maven.test.skip}</skipTests>
<gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
- <revapi.skip>true</revapi.skip>
</properties>
<build>
<directory>${basedir}/target</directory>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index eb05a9c..cdea5c9 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -25,9 +25,6 @@ limitations under the License.
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
- <properties>
- <revapi.skip>true</revapi.skip>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa6593a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20969e1..c4d08be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,6 +154,9 @@ limitations under the License.
<log4j-silent.properties>file:target/test-classes/log4j-silent.properties</log4j-silent.properties>
<muteTestLogs>false</muteTestLogs>
+
+ <!-- By default API checks are not run. Modules can opt in by setting this property to false in their poms. -->
+ <revapi.skip>true</revapi.skip>
</properties>
<build>
<directory>${basedir}/target</directory>
@@ -315,6 +318,20 @@ limitations under the License.
</dependency>
</dependencies>
</plugin>
+ <!-- Needed to figure out the version components when reading revapi API check config below -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
@@ -327,21 +344,11 @@ limitations under the License.
</dependency>
</dependencies>
<configuration>
-
+ <skip>${revapi.skip}</skip>
+ <failSeverity>potentiallyBreaking</failSeverity>
<analysisConfiguration><![CDATA[
{
"revapi": {
- "java": {
- "filter": {
- //gremlin-shaded includes a lot of stuff from 3rd party libraries that break their API between
- //versions. Let's just not consider them part of Tinkerpop API. -->
- "packages": {
- "regex": true,
- "exclude": ["org\\.apache\\.tinkerpop\\.shaded(\\..+)?"],
- "include": ["org\\.apache\\.tinkerpop(\\..+)?"]
- }
- }
- },
"semver": {
"ignore": {
"enabled": true,
@@ -356,6 +363,18 @@ limitations under the License.
}
}
]]></analysisConfiguration>
+ <analysisConfigurationFiles>
+ <configurationFile>
+ <path>${project.basedir}/api-changes.json</path>
+ <roots>
+ <root>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</root>
+ </roots>
+ </configurationFile>
+ <configurationFile>
+ <path>${project.basedir}/api-contents.json</path>
+ </configurationFile>
+ </analysisConfigurationFiles>
+ <failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
</configuration>
<executions>
<execution>
[2/7] tinkerpop git commit: Merge remote-tracking branch
'upstream/tp32' into api-check
Posted by sp...@apache.org.
Merge remote-tracking branch 'upstream/tp32' into api-check
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/992800be
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/992800be
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/992800be
Branch: refs/heads/TINKERPOP-1443
Commit: 992800be33d28f55372cb219e90447dd4f33accb
Parents: f35041f ad01fa1
Author: Lukas Krejci <lk...@redhat.com>
Authored: Tue Nov 15 09:57:59 2016 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Tue Nov 15 09:57:59 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 ++
docs/src/dev/provider/index.asciidoc | 33 ++++--
.../process/traversal/step/map/GroupStep.java | 34 +++---
.../process/traversal/step/map/MatchStep.java | 22 ++--
.../step/sideEffect/GroupSideEffectStep.java | 18 +--
.../optimization/RangeByIsCountStrategy.java | 116 +++++++++++--------
.../traversal/util/DefaultTraversalMetrics.java | 76 ++++++------
.../RangeByIsCountStrategyTest.java | 32 ++---
gremlin-driver/pom.xml | 15 ++-
.../DriverRemoteTraversalSideEffects.java | 21 ++--
.../driver/util/ProfilingApplication.java | 58 ++++++++--
.../DriverRemoteTraversalSideEffectsTest.java | 2 -
.../traversal/step/map/GroovyMatchTest.groovy | 15 ++-
.../traversal/step/map/GroovyProfileTest.groovy | 5 +
.../step/sideEffect/GroovyGroupTest.groovy | 5 +
gremlin-server/conf/gremlin-server-classic.yaml | 2 +-
.../conf/gremlin-server-modern-py.yaml | 2 +-
.../conf/gremlin-server-modern-readonly.yaml | 2 +-
gremlin-server/conf/gremlin-server-modern.yaml | 2 +-
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
.../conf/gremlin-server-rest-modern.yaml | 2 +-
.../conf/gremlin-server-rest-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-spark.yaml | 2 +-
gremlin-server/conf/gremlin-server.yaml | 2 +-
.../remote/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-integration.yaml | 2 +-
.../process/traversal/step/map/MatchTest.java | 46 +++++---
.../process/traversal/step/map/ProfileTest.java | 17 +++
.../traversal/step/sideEffect/GroupTest.java | 23 ++++
.../gremlin/hadoop/structure/HadoopGraph.java | 20 ++++
.../neo4j/process/NativeNeo4jCypherCheck.java | 16 +--
32 files changed, 399 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
[3/7] tinkerpop git commit: Make Travis use a newer version of Maven.
Posted by sp...@apache.org.
Make Travis use a newer version of Maven.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ce12041
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ce12041
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ce12041
Branch: refs/heads/TINKERPOP-1443
Commit: 8ce120415b5ef0e08ed18bae3fa38dd01558e2ce
Parents: 992800b
Author: Lukas Krejci <lk...@redhat.com>
Authored: Tue Nov 15 11:21:34 2016 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Tue Nov 15 11:21:34 2016 +0100
----------------------------------------------------------------------
.travis.install-maven.sh | 19 +++++++++++++++++++
.travis.yml | 12 ++++++++++++
pom.xml | 1 +
3 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ce12041/.travis.install-maven.sh
----------------------------------------------------------------------
diff --git a/.travis.install-maven.sh b/.travis.install-maven.sh
new file mode 100644
index 0000000..66affe6
--- /dev/null
+++ b/.travis.install-maven.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -xe
+
+MVN_VERSION="$1"
+MVN_INSTALL_DIR="$2"
+
+if [ ! -f "${MVN_INSTALL_DIR}/lib/maven-artifact-${MVN_VERSION}.jar" ]; then
+ rm -Rf "${MVN_INSTALL_DIR}"
+ mkdir -p "${MVN_INSTALL_DIR}"
+
+ APACHE_MIRROR="$(curl -sL https://www.apache.org/dyn/closer.cgi?asjson=1 | python -c 'import sys, json; print json.load(sys.stdin)["preferred"]')"
+ curl -o "${HOME}/apache-maven-$MVN_VERSION-bin.tar.gz" "$APACHE_MIRROR/maven/maven-3/$MVN_VERSION/binaries/apache-maven-$MVN_VERSION-bin.tar.gz"
+ cd "${MVN_INSTALL_DIR}"
+ tar -xzf "${HOME}/apache-maven-$MVN_VERSION-bin.tar.gz" --strip 1
+ chmod +x "${MVN_INSTALL_DIR}/bin/mvn"
+else
+ echo "Using cached Maven ${MVN_VERSION}"
+fi
+${MVN_INSTALL_DIR}/bin/mvn -version
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ce12041/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 56c729d..12a55d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,18 @@ jdk:
- oraclejdk8
sudo: required
dist: trusty
+cache:
+ directories:
+ - $HOME/mvn-home
+
+install:
+ # install maven 3.3.9 if it is not in cache already
+ - bash .travis.install-maven.sh "3.3.9" "${HOME}/mvn-home"
+ - export M2_HOME=${HOME}/mvn-home
+ - export PATH=${HOME}/mvn-home/bin:${PATH}
+ # visual check that we have the correct maven version installed
+ - mvn -version
+
addons:
apt:
packages:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ce12041/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9af0ab6..20969e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,6 +271,7 @@ limitations under the License.
<excludeSubProjects>false</excludeSubProjects>
<excludes>
<exclude>.travis.yml</exclude>
+ <exclude>.travis.*.sh</exclude>
<exclude>.dockerignore</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
[6/7] tinkerpop git commit: Upgrade to latest revapi versions.
Posted by sp...@apache.org.
Upgrade to latest revapi versions.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe71e506
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe71e506
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe71e506
Branch: refs/heads/TINKERPOP-1443
Commit: fe71e5061e176427fe594dcb576f23f97ab16af9
Parents: c4d4e8e
Author: Lukas Krejci <lk...@redhat.com>
Authored: Fri Jan 6 23:24:57 2017 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Fri Jan 6 23:24:57 2017 +0100
----------------------------------------------------------------------
pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe71e506/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f9a119..2fe36d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,17 +337,16 @@ limitations under the License.
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
- <version>0.7.0</version>
+ <version>0.8.0</version>
<dependencies>
<dependency>
<groupId>org.revapi</groupId>
<artifactId>revapi-java</artifactId>
- <version>0.11.2</version>
+ <version>0.13.0</version>
</dependency>
</dependencies>
<configuration>
<skip>${revapi.skip}</skip>
- <failSeverity>potentiallyBreaking</failSeverity>
<analysisConfiguration><![CDATA[
{
"revapi": {