Skip to content

Commit df24318

Browse files
committed
Merge branch '3.8-dev'
2 parents 0c3959d + 7b3f394 commit df24318

11 files changed

Lines changed: 23 additions & 110 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,6 @@ jobs:
4646
uses: codecov/codecov-action@v5
4747
with:
4848
directory: ./gremlin-tools/gremlin-coverage/target/site
49-
java-jdk8:
50-
name: mvn clean install - jdk8
51-
timeout-minutes: 45
52-
needs: smoke
53-
runs-on: ubuntu-latest
54-
steps:
55-
- uses: actions/checkout@v4
56-
- name: Set up JDK 8
57-
uses: actions/setup-java@v4
58-
with:
59-
java-version: '8'
60-
distribution: 'temurin'
61-
- name: Build with Maven
62-
run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
6349
gremlin-server-default:
6450
name: gremlin-server default
6551
timeout-minutes: 45

CHANGELOG.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ This release also includes changes from <<release-3-7-XXX, 3.7.XXX>>.
141141
* Deprecated `ProcessLimitedStandardSuite` and `ProcessLimitedComputerSuite` in favor of `ProcessEmbeddedStandardSuite` and `ProcessEmbeddedComputerSuite` respectively.
142142
* Deprecated `ProcessStandardSuite` and the `ProcessComputerSuite` in favor of Gherkin testing and the `ProcessEmbeddedStandardSuite` and `ProcessEmbeddedComputerSuite` for testing JVM-specific Gremlin behaviors.
143143
* Removed lambda oriented Gremlin testing from Gherkin test suite.
144+
* Increase minimum Java version from 1.8 to 11 for building and running.
144145
* Moved all lambda oriented Gremlin tests to `LambdaStepTest` in the Java test suite.
145146
* Removed the `@RemoteOnly` testing tag in Gherkin as lambda tests have all been moved to the Java test suite.
146147
* Updated gremlin-javascript to use GraphBinary as default instead of GraphSONv3

docker/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ RUN apt-get install apt-transport-https gnupg ca-certificates
2929
RUN sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official-stable.list'
3030
RUN apt-get update
3131

32-
# include both java 8/11 so that we can use the same docker image for future builds on that version of the jdk as we do
33-
# for the older release branches. the java version to use is just controlled by JAVA_HOME hardcoded below
34-
RUN apt-get install -y openjdk-8-jdk openjdk-11-jdk gawk git maven openssh-server subversion zip
32+
RUN apt-get install -y openjdk-11-jdk gawk git maven openssh-server subversion zip
3533
RUN apt-get install -y --force-yes dotnet-sdk-8.0 mono-devel
3634

3735
ENV DEBIAN_FRONTEND=noninteractive
@@ -45,7 +43,6 @@ RUN python3 -m pip install --upgrade pip
4543
RUN pip install virtualenv
4644
RUN pip install virtualenvwrapper --no-deps
4745

48-
RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-8-jdk
4946
RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-11-jdk
5047

5148
RUN sed -i 's@PermitRootLogin without-password@PermitRootLogin yes@' /etc/ssh/sshd_config

docs/site/home/download.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ <h2 class="ft-25 black bold mb-4">Archived Releases</h2>
439439
<div class="d-flex mb-3 align-items-start">
440440
<img src="img/download/information-circle-outline.svg" class="img-fluid me-2 pt-1" alt="Information Icon">
441441
<div>
442-
Gremlin Console and Gremlin Server are compatible with Java 8/11.
442+
Gremlin Console and Gremlin Server are compatible with Java 11/17.
443443
</div>
444444
</div>
445445
<div class="d-flex mb-3 align-items-start">

docs/src/dev/developer/development-environment.asciidoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ image:conspiracy.png[]
2626
[[system-configuration]]
2727
== System Configuration
2828
29-
At a minimum, development of TinkerPop requires link:https://openjdk.java.net/projects/jdk8/[Java 8] but it is
30-
preferable to use link:https://openjdk.java.net/projects/jdk/11/[Java 11] cross-compiled to Java 8 (the
31-
cross-compilation happens automatically as part of the build). Starting with 3.7.0, you can also build with
29+
At a minimum, development of TinkerPop requires link:https://openjdk.java.net/projects/jdk/11/[Java 11]. Since 3.7.0, you can also build with
3230
link:https://openjdk.org/projects/jdk/17/[Java 17]. Note, however, that there are some issues with deep reflection
3331
so there are `--add-opens` JVM options included in the pom files to enable this to work. Maven (requiring a minimum of
3432
link:https://maven.apache.org/download.cgi[Maven 3.5.3+]) is used as the common build system, which even

docs/src/reference/gremlin-applications.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ analysis, small to medium sized data loading projects and other exploratory func
7070
highly extensible, featuring a rich plugin system that allows new tools, commands,
7171
link:http://en.wikipedia.org/wiki/Domain-specific_language[DSLs], etc. to be exposed to users.
7272
73-
To start the Gremlin Console, run `gremlin.sh` or `gremlin.bat` (`gremlin-java8.bat` for Java 8):
73+
To start the Gremlin Console, run `gremlin.sh` or `gremlin.bat`:
7474
7575
[source,text]
7676
----
@@ -848,7 +848,7 @@ The following table describes the various YAML configuration options that Gremli
848848
|ssl.enabled |Determines if SSL is turned on or not. |false
849849
|ssl.keyStore |The private key in JKS or PKCS#12 format. |_none_
850850
|ssl.keyStorePassword |The password of the `keyStore` if it is password-protected. |_none_
851-
|ssl.keyStoreType |`JKS` (Java 8 default) or `PKCS12` (Java 9+ default) |_none_
851+
|ssl.keyStoreType |`PKCS12` |_none_
852852
|ssl.needClientAuth | Optional. One of NONE, REQUIRE. Enables client certificate authentication at the enforcement level specified. Can be used in combination with Authenticator. |_none_
853853
|ssl.sslCipherSuites |The list of JSSE ciphers to support for SSL connections. If specified, only the ciphers that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_
854854
|ssl.sslEnabledProtocols |The list of SSL protocols to support for SSL connections. If specified, only the protocols that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_

docs/src/reference/gremlin-variants.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ The following table describes the various configuration options for the Gremlin
796796
|connectionPool.idleConnectionTimeout | Duration of time in milliseconds that the driver will allow a channel to not receive read or writes before it automatically closes. |180000
797797
|connectionPool.keyStore |The private key in JKS or PKCS#12 format. |_none_
798798
|connectionPool.keyStorePassword |The password of the `keyStore` if it is password-protected. |_none_
799-
|connectionPool.keyStoreType |`JKS` (Java 8 default) or `PKCS12` (Java 9+ default)|_none_
799+
|connectionPool.keyStoreType |`PKCS12` |_none_
800800
|connectionPool.maxResponseContentLength |The maximum length in bytes that a message can be received from the server. |2147483647
801801
|connectionPool.maxSize |The maximum size of a connection pool for a host. |128
802802
|connectionPool.maxWaitForConnection |The amount of time in milliseconds to wait for a new connection before timing out. |3000

docs/src/tutorials/getting-started/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ plugin activated: tinkerpop.tinkergraph
7272
gremlin>
7373
----
7474
75-
TIP: Windows users may use the included `bin/gremlin.bat` (`bin/gremlin-java8.bat` for Java 8) file to start the Gremlin
75+
TIP: Windows users may use the included `bin/gremlin.bat` file to start the Gremlin
7676
Console.
7777
7878
TIP: If you make a mistake when entering a command and the prompt gets "stuck" (for example, after a syntax error or an

docs/src/upgrade/release-3.8.x.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ complete list of all the modifications that are part of this release.
3030
3131
=== Upgrading for Users
3232
33+
==== Set minimum Java version to 11
34+
35+
TinkerPop 3.8 requires a minimum of Java 11 for building and running. Support for Java 1.8 has been dropped.
36+
3337
==== Auto-promotion of Numbers
3438
3539
Previously, operations like `sum` or `sack` that involved mathematical calculations did not automatically promote the
@@ -396,6 +400,10 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-2974[TINKERPOP-2974]
396400
397401
==== Graph System Providers
398402
403+
==== Set minimum Java version to 11
404+
405+
TinkerPop 3.8 requires a minimum of Java 11 for building and running. Support for Java 1.8 has been dropped.
406+
399407
===== Test Suite Changes
400408
401409
In 3.6.0, providers were encouraged to begin using the Gherkin test suite for testing Gremlin rather than the original

gremlin-console/src/main/bin/gremlin-java8.bat

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)