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 2022/12/13 18:31:55 UTC
[tinkerpop] branch master updated (955fa068ec -> cc2ab6be55)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 955fa068ec Merge branch '3.6-dev'
new f4c5bd727e Downgraded to groovy 2.5.15
new b8f59e0143 Merge branch '3.5-dev' into 3.6-dev
new cc2ab6be55 Merge branch '3.6-dev'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 5 ++++-
4 files changed, 7 insertions(+), 4 deletions(-)
[tinkerpop] 01/03: Downgraded to groovy 2.5.15
Posted by sp...@apache.org.
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 f4c5bd727e570ef6e258b91a9ea69fed2a0a93bb
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Dec 13 13:29:40 2022 -0500
Downgraded to groovy 2.5.15
There were performance problems with newer versions. 2.5.15 was the last one now to show these issues. See TINKERPOP-2373 for more details CTR
---
CHANGELOG.asciidoc | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 5 ++++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bbc51f9bfd..8bd682689e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -46,7 +46,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added `addDefaultXModule` to `GraphSONMapper` as a shortcut for including a version matched GraphSON extension module.
* Modified `GraphSONRecordReader` and `GraphSONRecordWriter` to include the GraphSON extension module by default.
* Bumped `jackson-databind` to 2.14.0 to fix security vulnerability.
-* Bumped to Groovy 2.5.19.
+* Bumped to Groovy 2.5.15.
* Bumped to Netty 4.1.85.
* Bumped `ivy` to 2.5.1 to fix security vulnerability
* Removed default SSL handshake timeout. The SSL handshake timeout will instead be capped by setting `connectionSetupTimeoutMillis`.
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 28800e7adf..c9f1534367 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
------------------------------------------------------------------------
-Apache Groovy 2.5.19 (AL ASF)
+Apache Groovy 2.5.15 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index 21ce1640c2..7da4672cf0 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -5,7 +5,7 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
------------------------------------------------------------------------
-Apache Groovy 2.5.19 (AL ASF)
+Apache Groovy 2.5.15 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
diff --git a/pom.xml b/pom.xml
index 27767f572b..87b8700143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,10 @@ limitations under the License.
<commons.lang3.version>3.11</commons.lang3.version>
<commons.text.version>1.10.0</commons.text.version>
<exp4j.version>0.4.8</exp4j.version>
- <groovy.version>2.5.19</groovy.version>
+ <!-- performance after 2.5.15 is similar to the poor performance of 3.x and 4.x - we can't upgrade past this
+ version without a accepting a major performance hit. details related to this issue along with links
+ to attempts to solve the problem with the Groovy community can be found on: TINKERPOP-2373 -->
+ <groovy.version>2.5.15</groovy.version>
<hadoop.version>2.7.7</hadoop.version>
<hamcrest.version>2.2</hamcrest.version>
<java.tuples.version>1.2</java.tuples.version>
[tinkerpop] 03/03: Merge branch '3.6-dev'
Posted by sp...@apache.org.
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 cc2ab6be55182fa96e26eb18fe1e47aa48274fd7
Merge: 955fa068ec b8f59e0143
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Dec 13 13:31:39 2022 -0500
Merge branch '3.6-dev'
CHANGELOG.asciidoc | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 5 ++++-
4 files changed, 7 insertions(+), 4 deletions(-)
[tinkerpop] 02/03: Merge branch '3.5-dev' into 3.6-dev
Posted by sp...@apache.org.
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 b8f59e0143e28f3271c3421df5806dacd5d2a197
Merge: fbee9ee749 f4c5bd727e
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Dec 13 13:31:30 2022 -0500
Merge branch '3.5-dev' into 3.6-dev
CHANGELOG.asciidoc | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 5 ++++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --cc pom.xml
index 41ff2971a5,87b8700143..5f05d61cde
--- a/pom.xml
+++ b/pom.xml
@@@ -158,11 -157,12 +158,14 @@@ limitations under the License
<commons.io.version>2.8.0</commons.io.version>
<commons.lang3.version>3.11</commons.lang3.version>
<commons.text.version>1.10.0</commons.text.version>
+ <cucumber.version>6.11.0</cucumber.version>
<exp4j.version>0.4.8</exp4j.version>
- <groovy.version>2.5.19</groovy.version>
+ <!-- performance after 2.5.15 is similar to the poor performance of 3.x and 4.x - we can't upgrade past this
+ version without a accepting a major performance hit. details related to this issue along with links
+ to attempts to solve the problem with the Groovy community can be found on: TINKERPOP-2373 -->
+ <groovy.version>2.5.15</groovy.version>
- <hadoop.version>2.7.7</hadoop.version>
+ <guice.version>4.2.3</guice.version>
+ <hadoop.version>3.3.3</hadoop.version>
<hamcrest.version>2.2</hamcrest.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>3.3.1</javadoc-plugin.version>