This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 515bf483c8fd9124973cdee7cf38ea11d03119e3
Merge: ceeeaa2133 7c06364d15
Author: Cole-Greer <cole.gr...@improving.com>
AuthorDate: Mon Nov 20 13:14:16 2023 -0800
Merge branch '3.6-dev' into 3.7-dev
gremlin-console/pom.xml | 11 ++++++++-
gremlin-console/src/main/static/NOTICE | 26 +++++++++++++++++++-
gremlin-console/src/main/static/licenses/bigint | 23 ++++++++++++++++++
.../src/main/static/licenses/ganymed-ssh | 28 ++++++++++++++++++++++
gremlin-driver/pom.xml | 7 +++++-
gremlin-driver/src/main/static/NOTICE | 22 ++++++++++++++++-
gremlin-driver/src/main/static/licenses/bigint | 23 ++++++++++++++++++
gremlin-server/src/main/static/NOTICE | 28 ++++++++++++++++++++--
gremlin-server/src/main/static/licenses/bigint | 23 ++++++++++++++++++
.../src/main/static/licenses/ganymed-ssh | 28 ++++++++++++++++++++++
gremlin-shaded/pom.xml | 4 ++++
gremlin-shaded/src/main/static/NOTICE | 22 ++++++++++++++++-
gremlin-shaded/src/main/static/licenses/bigint | 23 ++++++++++++++++++
13 files changed, 261 insertions(+), 7 deletions(-)
diff --cc gremlin-server/src/main/static/NOTICE
index 3aac6f7ff6,02d78b6d73..4f6521d8b1
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@@ -5,13 -5,18 +5,13 @@@ This product includes software develope
The Apache Software Foundation (http://www.apache.org/).
------------------------------------------------------------------------
-Apache Groovy 2.5.22 (AL ASF)
+Apache Groovy 4.0.9 (AL ASF)
------------------------------------------------------------------------
-This product includes/uses ANTLR (http://www.antlr2.org/)
-developed by Terence Parr 1989-2006
-
-This product bundles icons from the famfamfam.com silk icons set
-http://www.famfamfam.com/lab/icons/silk/
-Licensed under the Creative Commons Attribution Licence v2.5
-http://creativecommons.org/licenses/by/2.5/
+This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
+Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
------------------------------------------------------------------------
- Apache Ivy 2.3.0 (AL ASF)
+ Apache Ivy 2.5.1 (AL ASF)
------------------------------------------------------------------------
Portions of Ivy were originally developed by
Jayasoft SARL (http://www.jayasoft.fr/)
diff --cc gremlin-shaded/src/main/static/NOTICE
index 99728668c8,aa0c1d929c..23fdb19a8e
--- a/gremlin-shaded/src/main/static/NOTICE
+++ b/gremlin-shaded/src/main/static/NOTICE
@@@ -5,13 -5,36 +5,33 @@@ This product includes software develope
The Apache Software Foundation (http://www.apache.org/).
------------------------------------------------------------------------
- Jackson-Databind 2.14.0 and Jackson-Core - shaded in gremlin-shaded to
org.apache.tinkerpop.shaded.jackson
+ Jackson-Databind, Jackson-Annotation and Jackson-Core 2.15.2
------------------------------------------------------------------------
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has
been in development since 2007.
It is currently developed by a community of developers.
+ * FastDoubleParser
+
+ jackson-core bundles a shaded copy of FastDoubleParser
<https://github.com/wrandelshofer/FastDoubleParser>.
+ That code is available under an MIT license
<https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
+ under the following copyright.
+
+ Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.
+
+ Some portions of the code have been derived from other projects.
+
+ fast_double_parser, Copyright (c) 2022 Daniel Lemire. Apache 2.0
License.
+ https://github.com/fastfloat/fast_float
+
+ fast_float, Copyright (c) 2021 The fast_float authors. Apache 2.0
License.
+ https://github.com/fastfloat/fast_float
+
+ bigint, Copyright 2020 Tim Buktu. 2-clause BSD License.
+ https://github.com/tbuktu/bigint/tree/floatfft
+ (We only use those portions of the bigint project that can be
licensed under 2-clause BSD License.)
+
------------------------------------------------------------------------
-Objenesis 2.4
+Objenesis 3.3 - shaded in gremlin-shaded to
org.apache.tinkerpop.shaded.objenesis
------------------------------------------------------------------------
-Copyright 2006-2016 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
