This is an automated email from the ASF dual-hosted git repository. Cole-Greer pushed a commit to branch 3.8-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 1b288dcac8ba66b1ac61d50efc4fb0a2b4e290d1 Merge: 2ca64b04e1 95dbf6720a Author: Cole Greer <[email protected]> AuthorDate: Thu Jul 2 19:19:14 2026 -0700 Merge branch '3.7-dev' into 3.8-dev .gitignore | 3 +- bin/process-docs.sh | 316 +++++++-- bin/validate-distribution.sh | 2 +- docs/postprocessor/postprocess.sh | 38 -- docs/postprocessor/processor.awk | 53 -- docs/preprocessor/awk/cleanup.awk | 36 - docs/preprocessor/awk/ignore.awk | 23 - docs/preprocessor/awk/init-code-blocks.awk | 73 -- docs/preprocessor/awk/language-variants.awk | 44 -- docs/preprocessor/awk/prepare.awk | 83 --- docs/preprocessor/awk/progressbar.awk | 36 - docs/preprocessor/awk/tabify.awk | 132 ---- docs/preprocessor/control-characters.sh | 25 - docs/preprocessor/install-plugins.groovy | 44 -- docs/preprocessor/install-plugins.sh | 74 -- docs/preprocessor/preprocess-file.sh | 174 ----- docs/preprocessor/preprocess.sh | 155 ----- docs/preprocessor/uninstall-plugins.sh | 36 - .../dev/developer/development-environment.asciidoc | 135 ++-- docs/src/dev/developer/for-committers.asciidoc | 6 +- docs/src/recipes/olap-spark-yarn.asciidoc | 56 +- docs/src/recipes/traversal-induced-values.asciidoc | 2 +- docs/src/reference/gremlin-variants.asciidoc | 4 + .../reference/implementations-hadoop-end.asciidoc | 7 +- .../implementations-hadoop-start.asciidoc | 5 +- docs/src/reference/implementations-neo4j.asciidoc | 3 + docs/src/reference/implementations-spark.asciidoc | 3 + docs/src/reference/index.asciidoc | 7 +- docs/src/reference/the-traversal.asciidoc | 2 +- .../language/corpus/DocumentationReader.java | 2 +- pom.xml | 64 ++ tools/tinkerpop-docs/pom.xml | 77 +++ .../gremlin/docs/ConsoleRestartHandler.java | 43 ++ .../tinkerpop/gremlin/docs/GremlinConsole.java | 286 ++++++++ .../gremlin/docs/GremlinDocsExtension.java | 28 +- .../gremlin/docs/GremlinPostprocessor.java | 71 ++ .../gremlin/docs/GremlinTreeprocessor.java | 745 +++++++++++++++++++++ .../docs/PluginDirectoryRestartHandler.java | 130 ++++ .../tinkerpop/gremlin/docs/TabbedHtmlBuilder.java | 291 ++++++++ ...ciidoctor.jruby.extension.spi.ExtensionRegistry | 1 + .../src/main/resources/hadoop-conf/core-site.xml | 33 + .../resources/hadoop-conf/hadoop-docs.properties | 16 +- .../tinkerpop/gremlin/docs/GremlinConsoleTest.java | 320 +++++++++ .../tinkerpop/gremlin/docs/GremlinDocsTest.java | 81 +++ .../gremlin/docs/GremlinPostprocessorTest.java | 103 +++ .../gremlin/docs/GremlinTreeprocessorTest.java | 629 +++++++++++++++++ .../tinkerpop/gremlin/docs/IntegrationTest.java | 131 ++++ .../docs/PluginDirectoryRestartHandlerTest.java | 138 ++++ .../gremlin/docs/TabbedHtmlBuilderTest.java | 286 ++++++++ .../test/resources/integration-fixture.asciidoc | 98 +++ 50 files changed, 3904 insertions(+), 1246 deletions(-) diff --cc docs/src/reference/implementations-hadoop-start.asciidoc index 8e481820ea,686eaaf47e..bcc0c4bfb1 --- a/docs/src/reference/implementations-hadoop-start.asciidoc +++ b/docs/src/reference/implementations-hadoop-start.asciidoc @@@ -148,9 -151,9 +151,9 @@@ which is the OLAP Gremlin machine [gremlin-groovy] ---- hdfs.copyFromLocal('data/tinkerpop-modern.kryo', 'tinkerpop-modern.kryo') - hdfs.ls() + hdfs.ls('tinkerpop-modern.kryo') graph = GraphFactory.open('conf/hadoop/hadoop-gryo.properties') -g = traversal().withEmbedded(graph) +g = traversal().with(graph) g.V().count() g.V().out().out().values('name') g.V().group().by{it.value('name')[1]}.by('name').next() diff --cc docs/src/reference/the-traversal.asciidoc index 1ddb0dfd74,5876c36758..efaf2d424f --- a/docs/src/reference/the-traversal.asciidoc +++ b/docs/src/reference/the-traversal.asciidoc @@@ -640,13 -643,19 +640,13 @@@ the step inside `local()` [gremlin-groovy,modern] ---- -g.V().aggregate(global, 'x').limit(1).cap('x') -g.V().aggregate(local, 'x').limit(1).cap('x') -g.withoutStrategies(EarlyLimitStrategy).V().aggregate(local,'x').limit(1).cap('x') +g.V().aggregate('x').limit(1).cap('x') +g.V().local(aggregate('x')).limit(1).cap('x') ---- -It is important to note that `EarlyLimitStrategy` introduced in 3.3.5 alters the behavior of `aggregate(local)`. -Without that strategy (which is installed by default), there are two results in the `aggregate()` side-effect even -though the interval selection is for 1 object. Realize that when the second object is on its way to the `range()` -filter (i.e. `[0..1]`), it passes through `aggregate()` and thus, stored before filtered. - [gremlin-groovy,modern] ---- - g.E().local(aggregate('x')).by('weight').cap('x') -g.E().aggregate(local,'x').by('weight').cap('x') ++g.E().local(aggregate('x').by('weight')).cap('x') ---- *Additional References* diff --cc tools/tinkerpop-docs/pom.xml index 0000000000,b22779fb32..6c95a45e85 mode 000000,100644..100644 --- a/tools/tinkerpop-docs/pom.xml +++ b/tools/tinkerpop-docs/pom.xml @@@ -1,0 -1,77 +1,77 @@@ + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tinkerpop</groupId> + <artifactId>tinkerpop</artifactId> - <version>3.7.7-SNAPSHOT</version> ++ <version>3.8.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>tinkerpop-docs</artifactId> + <name>Apache TinkerPop :: Docs Extension</name> + <description>AsciidoctorJ extension for processing gremlin code blocks in TinkerPop documentation</description> + <packaging>jar</packaging> + + <properties> + <asciidoctorj.version>2.5.13</asciidoctorj.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + <version>${asciidoctorj.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.14.0</version> + <configuration> + <!-- AsciidoctorJ 2.5.x requires Java 11+ --> + <release>11</release> + </configuration> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </project>
