This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch TINKERPOP-2703 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 3c7dff8e4fe0480bcf21074e410420923da49522 Author: Stephen Mallette <[email protected]> AuthorDate: Fri Feb 11 07:56:37 2022 -0500 wip: jdk17 starter build doesn't work - failing with gmavenplus script execution on first glv (javascript) and kryo is a problem --- gremlin-dotnet/src/pom.xml | 4 +- gremlin-dotnet/test/pom.xml | 2 +- gremlin-groovy/pom.xml | 91 +++++++++++++++++------------------ gremlin-javascript/pom.xml | 2 +- gremlin-python/pom.xml | 2 +- gremlin-server/pom.xml | 7 +++ gremlin-tools/gremlin-io-test/pom.xml | 2 +- gremlint/pom.xml | 2 +- pom.xml | 31 +++++++++++- 9 files changed, 87 insertions(+), 56 deletions(-) diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml index d77705b..a70633a 100644 --- a/gremlin-dotnet/src/pom.xml +++ b/gremlin-dotnet/src/pom.xml @@ -38,7 +38,7 @@ limitations under the License. <artifactId>gmavenplus-plugin</artifactId> <dependencies> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> @@ -312,7 +312,7 @@ file.write(file.getText("UTF-8").replaceFirst(/<version>(.*)<\/version& <scope>runtime</scope> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml index 2e3a16e..f87a33c 100644 --- a/gremlin-dotnet/test/pom.xml +++ b/gremlin-dotnet/test/pom.xml @@ -139,7 +139,7 @@ limitations under the License. <scope>runtime</scope> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml index 2ea4c51..cfcb24e 100644 --- a/gremlin-groovy/pom.xml +++ b/gremlin-groovy/pom.xml @@ -43,63 +43,19 @@ limitations under the License. <version>2.5.0</version> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy</artifactId> <version>${groovy.version}</version> - <classifier>indy</classifier> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-groovysh</artifactId> <version>${groovy.version}</version> - <classifier>indy</classifier> - <exclusions> - <!-- exclude non-indy type --> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-cli-picocli</artifactId> - <version>${groovy.version}</version> - <classifier>indy</classifier> - </dependency> - <!-- - not sure why jline won't come in with groovy-groovysh but it messes up build of gremlin-console - --> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>2.14.6</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-json</artifactId> - <version>${groovy.version}</version> - <classifier>indy</classifier> - <exclusions> - <!-- exclude non-indy type --> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-jsr223</artifactId> <version>${groovy.version}</version> - <classifier>indy</classifier> - <exclusions> - <!-- exclude non-indy type --> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -133,6 +89,13 @@ limitations under the License. <artifactId>gremlin-test</artifactId> <version>${project.version}</version> <scope>test</scope> + <exclusions> + <!-- conflicts with groovy 4.x --> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> @@ -225,5 +188,39 @@ limitations under the License. </plugins> </build> </profile> + + <profile> + <id>jdk17</id> + <activation> + <jdk>17</jdk> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <!-- + need to override source path as we don't seem to get the groovy-stubs automatically. this worked + under java 8 but errors under java 17 due to missing files on the path. i guess java 8 was more + forgiving. + --> + <sourcepath>${pom.basedir}/src/main/java:${project.build.directory}/generated-sources/annotations:${project.build.directory}/generated-sources/groovy-stubs/main</sourcepath> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + <configuration> + <release>8</release> + <compilerArgs> + <arg>-parameters</arg> + </compilerArgs> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml index 4766bf3..829ccd8 100644 --- a/gremlin-javascript/pom.xml +++ b/gremlin-javascript/pom.xml @@ -86,7 +86,7 @@ limitations under the License. <scope>runtime</scope> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index e594b49..11c99cd 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -276,7 +276,7 @@ limitations under the License. <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml index b971cb3..9e2b1f3 100644 --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@ -71,6 +71,13 @@ limitations under the License. <artifactId>gremlin-test</artifactId> <version>${project.version}</version> <scope>test</scope> + <exclusions> + <!-- conflicts with groovy 4.x --> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.carrotsearch</groupId> diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml index 1587136..2af64b3 100644 --- a/gremlin-tools/gremlin-io-test/pom.xml +++ b/gremlin-tools/gremlin-io-test/pom.xml @@ -113,7 +113,7 @@ limitations under the License. <artifactId>gmavenplus-plugin</artifactId> <dependencies> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> diff --git a/gremlint/pom.xml b/gremlint/pom.xml index d53b17e..9712c90 100644 --- a/gremlint/pom.xml +++ b/gremlint/pom.xml @@ -53,7 +53,7 @@ limitations under the License. <artifactId>gmavenplus-plugin</artifactId> <dependencies> <dependency> - <groupId>org.codehaus.groovy</groupId> + <groupId>org.apache.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> <type>pom</type> diff --git a/pom.xml b/pom.xml index 578f4d5..b970d60 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,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> @@ -596,7 +596,7 @@ limitations under the License. <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> - <version>1.11.0</version> + <version>1.13.1</version> <configuration> <targetBytecode>1.8</targetBytecode> </configuration> @@ -876,6 +876,33 @@ limitations under the License. </profile> <profile> + <id>jdk17</id> + <activation> + <jdk>17</jdk> + </activation> + <properties> + <suresafeArgs>--illegal-access=permit</suresafeArgs> + </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + <configuration> + <release>8</release> + <compilerArgs> + <arg>-parameters</arg> + </compilerArgs> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + + <profile> <id>asciidoc</id> <activation> <activeByDefault>false</activeByDefault>
