You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by co...@apache.org on 2023/07/04 22:17:10 UTC
[tinkerpop] 01/01: Merge branch '3.5-dev' into 3.6-dev
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c18979f0d8f04e98ddf90b586f2e84105753a2bc
Merge: ab5732a944 1cca37e512
Author: Cole Greer <co...@bitquilltech.com>
AuthorDate: Tue Jul 4 15:16:36 2023 -0700
Merge branch '3.5-dev' into 3.6-dev
CHANGELOG.asciidoc | 1 +
gremlin-console/pom.xml | 8 ------
gremlin-console/src/main/static/LICENSE | 2 --
gremlin-console/src/main/static/licenses/jcabi-log | 27 --------------------
.../src/main/static/licenses/jcabi-manifests | 27 --------------------
gremlin-core/pom.xml | 29 ++++++++++++----------
.../org/apache/tinkerpop/gremlin/util/Gremlin.java | 15 ++---------
gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 5 ++++
gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs | 4 +--
gremlin-dotnet/src/pom.xml | 13 ++++++++++
gremlin-driver/pom.xml | 12 ---------
gremlin-driver/src/main/static/LICENSE | 6 -----
gremlin-driver/src/main/static/licenses/jcabi-log | 27 --------------------
.../src/main/static/licenses/jcabi-manifests | 27 --------------------
gremlin-go/driver/user_agent.go | 16 +++---------
gremlin-go/pom.xml | 13 ++++++++++
gremlin-javascript/pom.xml | 13 ++++++++++
.../javascript/gremlin-javascript/lib/utils.js | 11 +++-----
gremlin-python/pom.xml | 13 ++++++++++
.../main/python/gremlin_python/driver/useragent.py | 8 ++----
gremlin-server/src/main/static/LICENSE | 2 --
gremlin-server/src/main/static/licenses/jcabi-log | 27 --------------------
.../src/main/static/licenses/jcabi-manifests | 27 --------------------
pom.xml | 29 +++++++++++++---------
24 files changed, 103 insertions(+), 259 deletions(-)
diff --cc gremlin-core/pom.xml
index 95ec172fcb,1fd848c1cd..46c0bdd8da
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@@ -130,6 -174,59 +120,19 @@@ limitations under the License
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
- <!-- 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>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <configuration>
+ <file>src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java</file>
+ <replacements>
+ <replacement>
+ <token>gremlinVersion = ".*"</token>
+ <value>gremlinVersion = "${project.version}"</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>jdk11</id>
- <activation>
- <jdk>11</jdk>
- </activation>
- <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>
- <arg>-proc:none</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index a03789e2c3,d1f452911c..450e03e5f5
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
@@@ -26,16 -24,7 +24,7 @@@ import java.io.IOException
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class Gremlin {
- private static String version;
-
- static {
- try {
- version = Manifests.read("version");
- }
- catch (Throwable t) {
- version = "VersionNotFound";
- }
- }
- private final static String gremlinVersion = "3.5.7-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
++ private final static String gremlinVersion = "3.6.5-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
private Gremlin() {
}
diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
index 2e2817a74b,687d0e9815..c45e291bd5
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
@@@ -30,6 -30,11 +30,11 @@@ namespace Gremlin.Net.Drive
/// </summary>
public class Tokens
{
+ /// <summary>
+ /// Current TinkerPop version.
+ /// </summary>
- public static string GremlinVersion = "3.5.7-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
++ public static string GremlinVersion = "3.6.5-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+
/// <summary>
/// The key for the unique identifier of the request.
/// </summary>
diff --cc gremlin-go/driver/user_agent.go
index 334d2a0927,701b557161..0801e3b214
--- a/gremlin-go/driver/user_agent.go
+++ b/gremlin-go/driver/user_agent.go
@@@ -38,9 -37,10 +37,10 @@@ var userAgent strin
const userAgentHeader = "User-Agent"
-const gremlinVersion = "3.5.7-SNAPSHOT" // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
++const gremlinVersion = "3.6.5-SNAPSHOT" // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+
func init() {
applicationName := "NotAvailable"
- driverVersion := "NotAvailable"
path, err := os.Executable()
if err == nil {
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
index 2bb3ecd6fb,b03f25c913..aeb315aeda
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
@@@ -25,7 -25,8 +25,8 @@@
const crypto = require('crypto');
const os = require('os');
- const { readFileSync } = require('fs');
+
-const gremlinVersion = '3.5.7-SNAPSHOT'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
++const gremlinVersion = '3.6.5-SNAPSHOT'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
exports.toLong = function toLong(value) {
return new Long(value);
diff --cc gremlin-python/src/main/python/gremlin_python/driver/useragent.py
index 9cd1ea2616,d482ba1f3d..c9ca07c2d9
--- a/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
@@@ -18,6 -18,7 +18,7 @@@
#
import platform
-gremlin_version = "3.5.7-SNAPSHOT" # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
++gremlin_version = "3.6.5-SNAPSHOT" # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
def _generate_user_agent():
application_name = "NotAvailable"
diff --cc pom.xml
index ab32d38669,247d73907c..713ad81ab9
--- a/pom.xml
+++ b/pom.xml
@@@ -166,12 -163,11 +166,11 @@@ limitations under the License
<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.2.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.11</logback.version>
<metrics.version>3.0.2</metrics.version>
<mockito.version>3.3.3</mockito.version>
<netty.version>4.1.86.Final</netty.version>
@@@ -537,7 -530,24 +536,23 @@@
<pluginManagement>
<plugins>
- <!-- there is a jdk11 profile that will be enabled if built with that version - these settings will be overridden -->
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>1.5.3</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <basedir>${basedir}</basedir>
+ </configuration>
+ </plugin>
-
+ <!-- there is a jdk11 profile that will be enabled if built with that version - these settings will be overriden -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>