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 d4bd5cc5a228fc22442101ccb6a9751653900d32 Merge: b773ca3 5e48db8 Author: Stephen Mallette <[email protected]> AuthorDate: Thu Dec 30 12:33:43 2021 -0500 Merge branch '3.5-dev' gremlin-annotations/pom.xml | 2 +- gremlin-core/pom.xml | 2 +- gremlin-groovy/pom.xml | 4 +- gremlin-language/pom.xml | 4 - gremlin-test/pom.xml | 10 +- pom.xml | 361 ++++++++++++++++++++++++++++++++++++++------ 6 files changed, 323 insertions(+), 60 deletions(-) diff --cc gremlin-annotations/pom.xml index 74d0293,0000000..ac60df5 mode 100644,000000..100644 --- a/gremlin-annotations/pom.xml +++ b/gremlin-annotations/pom.xml @@@ -1,150 -1,0 +1,150 @@@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>tinkerpop</artifactId> + <groupId>org.apache.tinkerpop</groupId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>gremlin-annotations</artifactId> + <name>Apache TinkerPop :: Gremlin Annotations</name> + + <dependencies> + <dependency> + <groupId>org.apache.tinkerpop</groupId> + <artifactId>gremlin-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.squareup</groupId> + <artifactId>javapoet</artifactId> - <version>1.13.0</version> ++ <version>${javapoet.version}</version> + </dependency> + <!-- TESTING --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.testing.compile</groupId> + <artifactId>compile-testing</artifactId> + <version>0.19</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- self-conflict resolutions over compile-testing --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + <exclusions> + <!-- prefer the versions from compile-testing --> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + <version>3.7.0</version> + </dependency> + </dependencies> + <build> + <directory>${basedir}/target</directory> + <finalName>${project.artifactId}-${project.version}</finalName> + <testResources> + <testResource> + <directory>${basedir}/src/test/resources + </directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + <!-- -proc:none = disable annotation processing - testing of the GremlinDslProcessor is handled separately --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + <compilerArgs> + <arg>-parameters</arg> + <arg>-proc:none</arg> + </compilerArgs> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jdk11</id> + <activation> + <jdk>11</jdk> + </activation> + <build> + <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> + <arg>-proc:none</arg> + </compilerArgs> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --cc gremlin-core/pom.xml index cef750b,50f5906..54116b4 --- a/gremlin-core/pom.xml +++ b/gremlin-core/pom.xml @@@ -73,9 -82,14 +73,9 @@@ limitations under the License </exclusions> </dependency> <dependency> - <groupId>com.squareup</groupId> - <artifactId>javapoet</artifactId> - <version>${javapoet.version}</version> - </dependency> - <dependency> <groupId>net.objecthunter</groupId> <artifactId>exp4j</artifactId> - <version>0.4.8</version> + <version>${exp4j.version}</version> </dependency> <!-- LOGGING --> <dependency> diff --cc gremlin-language/pom.xml index a48e6ed,bbb04ba..df3f062 --- a/gremlin-language/pom.xml +++ b/gremlin-language/pom.xml @@@ -52,12 -43,13 +52,8 @@@ limitations under the License <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <scope>test</scope> - </dependency> </dependencies> - <properties> - <antlr4.version>4.9.1</antlr4.version> - </properties> - <build> <plugins> <plugin> diff --cc gremlin-test/pom.xml index 265c57a,242925d..f3952d9 --- a/gremlin-test/pom.xml +++ b/gremlin-test/pom.xml @@@ -48,40 -48,8 +48,40 @@@ limitations under the License <artifactId>hamcrest</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>io.cucumber</groupId> + <artifactId>cucumber-java</artifactId> - <version>6.11.0</version> ++ <version>${cucumber.version}</version> + <exclusions> + <exclusion> + <groupId>org.apiguardian</groupId> + <artifactId>apiguardian-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apiguardian</groupId> + <artifactId>apiguardian-api</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>io.cucumber</groupId> + <artifactId>cucumber-junit</artifactId> - <version>6.11.0</version> ++ <version>${cucumber.version}</version> + </dependency> + <dependency> + <groupId>io.cucumber</groupId> + <artifactId>cucumber-guice</artifactId> - <version>6.11.0</version> ++ <version>${cucumber.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> - <version>4.2.3</version> ++ <version>${guice.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> <optional>true</optional> </dependency> <dependency> diff --cc pom.xml index 72aabfd,6342636..dcc4ae9 --- a/pom.xml +++ b/pom.xml @@@ -154,14 -156,20 +157,22 @@@ 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.9</commons.text.version> ++ <cucumber.version>6.11.0</cucumber.version> + <exp4j.version>0.4.8</exp4j.version> <groovy.version>2.5.14</groovy.version> - <hadoop.version>2.7.7</hadoop.version> ++ <guice.version>4.2.3</guice.version> + <hadoop.version>3.3.1</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> - <javapoet.version>1.8.0</javapoet.version> ++ <javapoet.version>1.13.0</javapoet.version> + <jbcrypt.version>0.4</jbcrypt.version> <jcabi.version>1.1</jcabi.version> <junit.version>4.13.1</junit.version> + <kerby.version>2.0.1</kerby.version> - <log4j.version>1.2.17</log4j.version> + <logback.version>1.2.3</logback.version> <metrics.version>3.0.2</metrics.version> + <mockito.version>3.3.3</mockito.version> <netty.version>4.1.72.Final</netty.version> <slf4j.version>1.7.25</slf4j.version> <snakeyaml.version>1.27</snakeyaml.version> @@@ -253,47 -257,9 +264,9 @@@ <artifactId>maven-assembly-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalJOption>-Xdoclint:none</additionalJOption> - <tags> - <tag> - <name>example</name> - <placement>aoptcmf</placement> - <head>Example:</head> - </tag> - </tags> - </configuration> - <executions> - <execution> - <id>aggregate-in-site-lifecycle</id> - <goals> - <goal>aggregate</goal> - </goals> - <phase>site</phase> - <configuration> - <additionalJOption>-Xdoclint:none</additionalJOption> - <includeDependencySources>true</includeDependencySources> - <dependencySourceIncludes> - <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude> - </dependencySourceIncludes> - <overview>${basedir}/docs/javadoc/overview.html</overview> - <quiet>true</quiet> - </configuration> - </execution> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.4</version> + <version>3.0.0</version> <executions> <execution> <goals> @@@ -465,9 -431,10 +438,10 @@@ </configuration> </plugin> </plugins> + <pluginManagement> <plugins> - <!-- there is a jdk11 profile that will be enabled if built with that version - these settings will be overriden --> + <!-- there is a jdk11 profile that will be enabled if built with that version - these settings will be overridden --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@@ -793,17 -775,12 +767,17 @@@ <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> - <version>2.2</version> + <version>${hamcrest.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> + <groupId>io.github.hakky54</groupId> + <artifactId>logcaptor</artifactId> + <version>2.6.1</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@@ -1310,12 -1287,212 +1284,243 @@@ <overview>${basedir}/docs/javadoc/overview.html</overview> <quiet>true</quiet> <sourcepath> - gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-python/src/main/java:gremlin-server/src/main/java:gremlin-test/src/main/java:hadoop-gremlin/src/main/java:neo4j-gremlin/src/main/java:spark-gremlin/src/main/java:tinkergraph-gremlin/src/main/java - gremlin-language/target/generated-sources/antlr4:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-groovy/target/generated-sources/annotations:gremlin-groovy/target/generated-sources/groovy-stubs/main:gremlin-server/src/main/java:gremlin-test/src/main/java:tinkergraph-gremlin/src/main/java ++ gremlin-annotations/src/main/java:gremlin-language/target/generated-sources/antlr4:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-groovy/target/generated-sources/annotations:gremlin-groovy/target/generated-sources/groovy-stubs/main:gremlin-server/src/main/java:gremlin-test/src/main/java:tinkergraph-gremlin/src/main/java </sourcepath> - <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude> </dependencySourceIncludes> + <additionalDependencies> + <additionalDependency> + <groupId>com.github.ben-manes.caffeine</groupId> + <artifactId>caffeine</artifactId> + <version>${caffeine.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.mindrot</groupId> + <artifactId>jbcrypt</artifactId> + <version>${jbcrypt.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-classes-epoll</artifactId> + <version>${netty.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr4.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr4.version}</version> + </additionalDependency> + <additionalDependency> ++ <groupId>com.google.inject</groupId> ++ <artifactId>guice</artifactId> ++ <version>${guice.version}</version> ++ </additionalDependency> ++ <additionalDependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>${commons.configuration.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons.collections.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>${commons.text.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>${metrics.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-graphite</artifactId> + <version>${metrics.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-ganglia</artifactId> + <version>${metrics.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>info.ganglia.gmetric4j</groupId> + <artifactId>gmetric4j</artifactId> + <version>1.0.10</version> + </additionalDependency> + <additionalDependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <version>${hamcrest.version}</version> + </additionalDependency> + <additionalDependency> ++ <groupId>io.cucumber</groupId> ++ <artifactId>cucumber-core</artifactId> ++ <version>${cucumber.version}</version> ++ </additionalDependency> ++ <!-- datatable doesn't align with cucumber.version until 7.x --> ++ <additionalDependency> ++ <groupId>io.cucumber</groupId> ++ <artifactId>datatable</artifactId> ++ <version>4.1.0</version> ++ </additionalDependency> ++ <additionalDependency> ++ <groupId>io.cucumber</groupId> ++ <artifactId>cucumber-java</artifactId> ++ <version>${cucumber.version}</version> ++ </additionalDependency> ++ <additionalDependency> ++ <groupId>io.cucumber</groupId> ++ <artifactId>cucumber-junit</artifactId> ++ <version>${cucumber.version}</version> ++ </additionalDependency> ++ <additionalDependency> ++ <groupId>io.cucumber</groupId> ++ <artifactId>cucumber-guice</artifactId> ++ <version>${cucumber.version}</version> ++ </additionalDependency> ++ <additionalDependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.kerby</groupId> + <artifactId>kerb-simplekdc</artifactId> + <version>${kerby.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.kerby</groupId> + <artifactId>kerb-server</artifactId> + <version>${kerby.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.kerby</groupId> + <artifactId>kerb-client</artifactId> + <version>${kerby.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.kerby</groupId> + <artifactId>kerb-common</artifactId> + <version>${kerby.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.kerby</groupId> + <artifactId>kerb-core</artifactId> + <version>${kerby.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.javatuples</groupId> + <artifactId>javatuples</artifactId> + <version>${java.tuples.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.tinkerpop</groupId> + <artifactId>gremlin-shaded</artifactId> + <version>${project.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>${groovy.version}</version> + <classifier>indy</classifier> + </additionalDependency> + <additionalDependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-jsr223</artifactId> + <version>${groovy.version}</version> + <classifier>indy</classifier> + </additionalDependency> + <additionalDependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-groovysh</artifactId> + <version>${groovy.version}</version> + <classifier>indy</classifier> + </additionalDependency> + <additionalDependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-json</artifactId> + <version>${groovy.version}</version> + <classifier>indy</classifier> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons.lang3.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons.lang.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.squareup</groupId> + <artifactId>javapoet</artifactId> + <version>${javapoet.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>net.objecthunter</groupId> + <artifactId>exp4j</artifactId> + <version>${exp4j.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>${snakeyaml.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.jcabi</groupId> + <artifactId>jcabi-manifests</artifactId> + <version>${jcabi.version}</version> + </additionalDependency> + </additionalDependencies> </configuration> </execution> <execution>
