This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch TINKERPOP-2373 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 35dc0dd7abd980ffffd4d2a416550662fe1b17dd Author: Stephen Mallette <[email protected]> AuthorDate: Thu Jan 12 14:01:52 2023 -0500 TINKERPOP-2373 Bump to groovy 3.x - WIP --- gremlin-annotations/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- gremlin-console/pom.xml | 10 ++++++++++ gremlin-groovy/pom.xml | 4 ++-- gremlin-tools/gremlin-benchmark/pom.xml | 2 ++ pom.xml | 8 ++++---- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/gremlin-annotations/pom.xml b/gremlin-annotations/pom.xml index faa19f4f96..8d0407054f 100644 --- a/gremlin-annotations/pom.xml +++ b/gremlin-annotations/pom.xml @@ -136,9 +136,9 @@ limitations under the License. <profiles> <profile> - <id>jdk11</id> + <id>jdk11plus</id> <activation> - <jdk>11</jdk> + <jdk>(11,18]</jdk> </activation> <build> <plugins> diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml index 1dabb27fb4..e4cc635bef 100644 --- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml +++ b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml @@ -71,9 +71,9 @@ limitations under the License. <profiles> <profile> - <id>jdk11</id> + <id>jdk11plus</id> <activation> - <jdk>11</jdk> + <jdk>(11,18]</jdk> </activation> <build> <plugins> diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml index 2e57f1c273..aa94feb45b 100644 --- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml +++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml @@ -81,9 +81,9 @@ limitations under the License. <profiles> <profile> - <id>jdk11</id> + <id>jdk11plus</id> <activation> - <jdk>11</jdk> + <jdk>(11,18]</jdk> </activation> <build> <plugins> diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml index 27f32093e0..c2767388e4 100644 --- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml +++ b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml @@ -65,9 +65,9 @@ limitations under the License. <profiles> <profile> - <id>jdk11</id> + <id>jdk11plus</id> <activation> - <jdk>11</jdk> + <jdk>(11,18]</jdk> </activation> <build> <plugins> diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index 392bb125a8..a75e8f8bf9 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -31,6 +31,16 @@ limitations under the License. <artifactId>gremlin-groovy</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>2.14.6</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-cli-picocli</artifactId> + <version>${groovy.version}</version> + </dependency> <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>tinkergraph-gremlin</artifactId> diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml index 2d5d46fce6..f016a09e15 100644 --- a/gremlin-groovy/pom.xml +++ b/gremlin-groovy/pom.xml @@ -179,9 +179,9 @@ limitations under the License. <profiles> <profile> - <id>jdk11</id> + <id>jdk11plus</id> <activation> - <jdk>11</jdk> + <jdk>(11,18]</jdk> </activation> <build> <plugins> diff --git a/gremlin-tools/gremlin-benchmark/pom.xml b/gremlin-tools/gremlin-benchmark/pom.xml index 24b7b1f309..287175a0ab 100644 --- a/gremlin-tools/gremlin-benchmark/pom.xml +++ b/gremlin-tools/gremlin-benchmark/pom.xml @@ -31,6 +31,8 @@ limitations under the License. <!-- Skip benchmarks by default because they are time consuming. --> <skipBenchmarks>true</skipBenchmarks> <skipTests>${skipBenchmarks}</skipTests> + <!-- JDK17 fails javadoc generation here in benchmarks - not needed in any event --> + <maven.javadoc.skip>true</maven.javadoc.skip> </properties> <dependencies> diff --git a/pom.xml b/pom.xml index 6daeef426c..e426fbec87 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ limitations under the License. <!-- 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> + <groovy.version>3.0.14</groovy.version> <guice.version>4.2.3</guice.version> <hadoop.version>3.3.3</hadoop.version> <hamcrest.version>2.2</hamcrest.version> @@ -227,7 +227,7 @@ limitations under the License. <rules> <DependencyConvergence/> <requireJavaVersion> - <version>[1.8,12)</version> + <version>[1.8,18)</version> </requireJavaVersion> <requireMavenVersion> <version>[3.5.3,)</version> @@ -826,9 +826,9 @@ limitations under the License. <profiles> <profile> - <id>jdk11</id> + <id>jdk11plus</id> <activation> - <jdk>11</jdk> + <jdk>(11,18]</jdk> </activation> <properties> <suresafeArgs>--illegal-access=permit</suresafeArgs>
