This is an automated email from the ASF dual-hosted git repository. xiazcy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit f9e36b767afc10ad05c0f09fea9ff27227db1113 Merge: d468061bba 940aea08b3 Author: Yang Xia <[email protected]> AuthorDate: Mon Mar 30 17:55:26 2026 -0700 Merge branch '3.8-dev' # Conflicts: # LICENSE # bin/publish-docs.sh # gremlin-console/src/main/static/LICENSE # gremlin-server/src/main/static/LICENSE bin/publish-docs.sh | 12 ++++++------ gremlin-console/src/main/static/LICENSE | 1 + gremlin-console/src/main/static/NOTICE | 6 +++--- .../src/main/static/licenses/reactive-streams | 18 ++++++++++++++++++ gremlin-driver/src/main/static/LICENSE | 1 + .../src/main/static/licenses/reactive-streams | 18 ++++++++++++++++++ gremlin-server/src/main/static/LICENSE | 2 +- gremlin-server/src/main/static/NOTICE | 4 ++-- 8 files changed, 50 insertions(+), 12 deletions(-) diff --cc bin/publish-docs.sh index c48d0c8edc,38ca6bccd5..e1166ae003 --- a/bin/publish-docs.sh +++ b/bin/publish-docs.sh @@@ -56,13 -56,13 +56,13 @@@ mkdir -p "javadocs/${VERSION}/full mkdir -p "jsdocs/${VERSION}" mkdir -p "dotnetdocs/${VERSION}" - mkdir -p ../jsdocs - rm -rf ../jsdocs/* - cp -R ../../gremlin-js/gremlin-javascript/doc/ ../jsdocs/ + mkdir -p ../jsdocs/doc + rm -rf ../jsdocs/doc/* -cp -R ../../gremlin-javascript/src/main/javascript/gremlin-javascript/doc/ ../jsdocs/doc/ ++cp -R ../../gremlin-js/gremlin-javascript/doc/ ../jsdocs/doc/ - mkdir -p ../dotnetdocs - rm -rf ../dotnetdocs/* - cp -R ../../gremlin-dotnet/src/_site/ ../dotnetdocs/ + mkdir -p ../dotnetdocs/_site + rm -rf ../dotnetdocs/_site/* + cp -R ../../gremlin-dotnet/src/_site/ ../dotnetdocs/_site/ diff -rq -I '^Last updated' docs/${VERSION}/ ../docs/htmlsingle/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.docs diff -rq -I 'Generated by javadoc' -I '^<meta name="date"' javadocs/${VERSION}/ ../site/apidocs/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.javadocs diff --cc gremlin-console/src/main/static/LICENSE index 41076162e9,e78ad04e12..cb05899a98 --- a/gremlin-console/src/main/static/LICENSE +++ b/gremlin-console/src/main/static/LICENSE @@@ -223,7 -223,8 +223,8 @@@ MIT License The Apache TinkerPop project bundles the following components under the MIT License: - JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j - SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) - for details, see licenses/slf4j + SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - for details, see licenses/slf4j ++ Reactive Streams (org.reactivestreams:reactive-streams:1.0.4 - https://www.reactive-streams.org/) - for details, see licenses/reactive-streams Foundation stylesheet for CodeRay (http://foundation.zurb.com) - for details, see licenses/foundation normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize diff --cc gremlin-console/src/main/static/NOTICE index 9588044c66,2be233e054..b13c0651ae --- a/gremlin-console/src/main/static/NOTICE +++ b/gremlin-console/src/main/static/NOTICE @@@ -5,7 -5,7 +5,7 @@@ This product includes software develope The Apache Software Foundation (http://www.apache.org/). ------------------------------------------------------------------------ --Apache Commons Codec 1.15 (AL ASF) ++Apache Commons Codec 1.20.0 (AL ASF) ------------------------------------------------------------------------ src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains test data from http://aspell.net/test/orig/batch0.tab. diff --cc gremlin-console/src/main/static/licenses/reactive-streams index 0000000000,0000000000..116ca79eca new file mode 100644 --- /dev/null +++ b/gremlin-console/src/main/static/licenses/reactive-streams @@@ -1,0 -1,0 +1,18 @@@ ++MIT No Attribution ++ ++Copyright 2014 Reactive Streams ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. diff --cc gremlin-driver/src/main/static/LICENSE index a5e016eca2,2a6fc08ed0..fb45351ca7 --- a/gremlin-driver/src/main/static/LICENSE +++ b/gremlin-driver/src/main/static/LICENSE @@@ -221,9 -221,9 +221,10 @@@ MIT License The Apache TinkerPop project bundles the following components under the MIT License: - SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org) + SLF4J API Module (org.slf4j:slf4j-api:2.0.16 - http://www.slf4j.org) - shaded to org.shaded.slf4j - for details, see licenses/slf4j ++ Reactive Streams (org.reactivestreams:reactive-streams:1.0.4 - https://www.reactive-streams.org/) - for details, see licenses/reactive-streams ======================================================================== Other Licenses diff --cc gremlin-driver/src/main/static/licenses/reactive-streams index 0000000000,0000000000..116ca79eca new file mode 100644 --- /dev/null +++ b/gremlin-driver/src/main/static/licenses/reactive-streams @@@ -1,0 -1,0 +1,18 @@@ ++MIT No Attribution ++ ++Copyright 2014 Reactive Streams ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. diff --cc gremlin-server/src/main/static/LICENSE index bc3a28a2f8,2833af482f..a42a3cff82 --- a/gremlin-server/src/main/static/LICENSE +++ b/gremlin-server/src/main/static/LICENSE @@@ -207,7 -207,7 +207,7 @@@ BSD-style License The Apache TinkerPop project bundles the following components under the BSD License: -- Antlr4 (org.antlr:antlr4-runtime:4.9.1 - https://www.antlr.org) - for details, see licenses/antlr4 ++ Antlr4 (org.antlr:antlr4-runtime:4.13.2 - https://www.antlr.org) - for details, see licenses/antlr4 JLine (jline:jline:2.14.6 - https://github.com/jline/jline2) - for details, see licenses/jline2 Kryo (com.esotericsoftware:kryo-shaded:3.0.3 - https://github.com/EsotericSoftware/kryo) - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.kryo
