From f7f8976bae9dc35b4d9b2f338b054b9f7c0bc59d Mon Sep 17 00:00:00 2001 From: Jan Jansen Date: Sun, 8 Oct 2023 21:21:52 +0200 Subject: [PATCH] Only java 11 Signed-off-by: Jan Jansen --- .github/workflows/ci-backend-cql-dummy.yml | 86 ++------------- .github/workflows/ci-backend-cql.yml | 102 +++--------------- .github/workflows/ci-backend-hbase-dummy.yml | 15 --- .github/workflows/ci-backend-hbase.yml | 17 +-- .github/workflows/ci-backend-scylla-dummy.yml | 32 +----- .github/workflows/ci-backend-scylla.yml | 34 +----- .github/workflows/ci-benchmark.yml | 4 +- .github/workflows/ci-core-dummy.yml | 19 ---- .github/workflows/ci-core.yml | 39 +------ .github/workflows/ci-docs.yml | 4 +- .github/workflows/ci-index-es-dummy.yml | 20 ---- .github/workflows/ci-index-es.yml | 22 +--- .github/workflows/ci-index-solr-dummy.yml | 5 - .github/workflows/ci-index-solr.yml | 7 +- .github/workflows/ci-publish-commit.yml | 2 +- .github/workflows/ci-publish-official.yml | 2 +- .github/workflows/ci-release-dummy.yml | 2 - .github/workflows/ci-release.yml | 26 +---- BUILDING.md | 4 +- docs/changelog.md | 16 +-- janusgraph-dist/README.md | 2 +- janusgraph-dist/pom.xml | 9 -- .../assembly/static/bin/janusgraph-server.sh | 7 +- .../src/assembly/static/conf/jvm-8.options | 78 -------------- .../conf/{jvm-11.options => jvm.options} | 0 pom.xml | 15 +-- 26 files changed, 48 insertions(+), 521 deletions(-) delete mode 100644 janusgraph-dist/src/assembly/static/conf/jvm-8.options rename janusgraph-dist/src/assembly/static/conf/{jvm-11.options => jvm.options} (100%) diff --git a/.github/workflows/ci-backend-cql-dummy.yml b/.github/workflows/ci-backend-cql-dummy.yml index d271793ee76..86cc4371d7d 100644 --- a/.github/workflows/ci-backend-cql-dummy.yml +++ b/.github/workflows/ci-backend-cql-dummy.yml @@ -17,12 +17,12 @@ name: CI Backend CQL on: pull_request: paths: - - 'docs/**' - - '.github/workflows/ci-docs.yml' - - '.github/ISSUE_TEMPLATE/**' - - 'requirements.txt' - - 'docs.Dockerfile' - - '*.md' + - 'docs/**' + - '.github/workflows/ci-docs.yml' + - '.github/ISSUE_TEMPLATE/**' + - 'requirements.txt' + - 'docs.Dockerfile' + - '*.md' jobs: tests: @@ -33,164 +33,90 @@ jobs: - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\"" name: byteordered-diskstorage - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\"" - name: murmur-diskstorage - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\"" - name: byteordered-graphdb - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\"" - name: murmur-graphdb - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\"" - name: murmur-hadoop - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\"" - name: byteordered-core - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\"" - name: murmur-core - java: 8 - - module: cql - args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - name: murmur-ssl - java: 8 - - module: cql - args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - name: murmur-client-auth - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\"" - name: scylladb-diskstorage - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\"" - name: scylladb-graphdb - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/hadoop/*\"" - name: scylladb-hadoop - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/core/cql/*\"" - name: scylladb-core - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\"" - name: byteordered-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\"" name: byteordered-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\"" name: byteordered-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\"" name: scylladb-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\"" name: scylladb-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/hadoop/*\"" name: scylladb-hadoop - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/core/cql/*\"" name: scylladb-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\"" name: byteordered-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\"" name: byteordered-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\"" name: byteordered-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - install-args: "-Pjava-11" java: 11 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-backend-cql.yml b/.github/workflows/ci-backend-cql.yml index 8505798871b..b9b693b96b1 100644 --- a/.github/workflows/ci-backend-cql.yml +++ b/.github/workflows/ci-backend-cql.yml @@ -17,20 +17,20 @@ name: CI Backend CQL on: pull_request: paths-ignore: - - 'docs/**' - - '.github/workflows/ci-docs.yml' - - '.github/ISSUE_TEMPLATE/**' - - 'requirements.txt' - - 'docs.Dockerfile' - - '*.md' + - 'docs/**' + - '.github/workflows/ci-docs.yml' + - '.github/ISSUE_TEMPLATE/**' + - 'requirements.txt' + - 'docs.Dockerfile' + - '*.md' push: paths-ignore: - - 'docs/**' - - '.github/workflows/ci-docs.yml' - - '.github/ISSUE_TEMPLATE/**' - - 'requirements.txt' - - 'docs.Dockerfile' - - '*.md' + - 'docs/**' + - '.github/workflows/ci-docs.yml' + - '.github/ISSUE_TEMPLATE/**' + - 'requirements.txt' + - 'docs.Dockerfile' + - '*.md' branches-ignore: - 'dependabot/**' @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -66,164 +66,90 @@ jobs: - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\"" name: byteordered-diskstorage - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\"" - name: murmur-diskstorage - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\"" - name: byteordered-graphdb - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\"" - name: murmur-graphdb - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\"" - name: murmur-hadoop - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\"" - name: byteordered-core - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\"" - name: murmur-core - java: 8 - - module: cql - args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - name: murmur-ssl - java: 8 - - module: cql - args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - name: murmur-client-auth - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\"" - name: scylladb-diskstorage - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\"" - name: scylladb-graphdb - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/hadoop/*\"" - name: scylladb-hadoop - java: 8 - - module: cql - args: "-Pscylladb -Dtest=\"**/core/cql/*\"" - name: scylladb-core - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\"" - name: byteordered-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\"" name: byteordered-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\"" name: byteordered-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\"" name: scylladb-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\"" name: scylladb-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/hadoop/*\"" name: scylladb-hadoop - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pscylladb -Dtest=\"**/core/cql/*\"" name: scylladb-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\"" name: byteordered-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\"" name: byteordered-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\"" name: byteordered-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - install-args: "-Pjava-11" java: 11 - module: cql args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - install-args: "-Pjava-11" java: 11 steps: - uses: actions/checkout@v4 @@ -286,7 +212,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-${{ matrix.module }} ${{ env.BUILD_MAVEN_OPTS }} ${{ matrix.install-args }} - run: mvn verify --projects janusgraph-${{ matrix.module }} -Dcassandra.docker.version='3.0.18' ${{ env.VERIFY_MAVEN_OPTS }} ${{ matrix.args }} diff --git a/.github/workflows/ci-backend-hbase-dummy.yml b/.github/workflows/ci-backend-hbase-dummy.yml index a8909672e69..355da21f5fb 100644 --- a/.github/workflows/ci-backend-hbase-dummy.yml +++ b/.github/workflows/ci-backend-hbase-dummy.yml @@ -31,29 +31,14 @@ jobs: matrix: include: - module: hbase - args: "-Dtest=\"**/diskstorage/hbase/*\"" - name: hbase2-diskstorage - java: 8 - - module: hbase - args: "-Dtest=\"**/graphdb/hbase/*\"" - name: hbase2-graphdb - java: 8 - - module: hbase - args: "-Dtest=\"**/hadoop/*\"" - name: hbase2-hadoop - java: 8 - - module: hbase - install-args: "-Pjava-11" args: "-Dtest=\"**/diskstorage/hbase/*\"" name: hbase2-diskstorage java: 11 - module: hbase - install-args: "-Pjava-11" args: "-Dtest=\"**/graphdb/hbase/*\"" name: hbase2-graphdb java: 11 - module: hbase - install-args: "-Pjava-11" args: "-Dtest=\"**/hadoop/*\"" name: hbase2-hadoop java: 11 diff --git a/.github/workflows/ci-backend-hbase.yml b/.github/workflows/ci-backend-hbase.yml index d2ee26e2cbe..32a71af50f2 100644 --- a/.github/workflows/ci-backend-hbase.yml +++ b/.github/workflows/ci-backend-hbase.yml @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -64,29 +64,14 @@ jobs: matrix: include: - module: hbase - args: "-Dtest=\"**/diskstorage/hbase/*\"" - name: hbase2-diskstorage - java: 8 - - module: hbase - args: "-Dtest=\"**/graphdb/hbase/*\"" - name: hbase2-graphdb - java: 8 - - module: hbase - args: "-Dtest=\"**/hadoop/*\"" - name: hbase2-hadoop - java: 8 - - module: hbase - install-args: "-Pjava-11" args: "-Dtest=\"**/diskstorage/hbase/*\"" name: hbase2-diskstorage java: 11 - module: hbase - install-args: "-Pjava-11" args: "-Dtest=\"**/graphdb/hbase/*\"" name: hbase2-graphdb java: 11 - module: hbase - install-args: "-Pjava-11" args: "-Dtest=\"**/hadoop/*\"" name: hbase2-hadoop java: 11 diff --git a/.github/workflows/ci-backend-scylla-dummy.yml b/.github/workflows/ci-backend-scylla-dummy.yml index 74ec208e530..d0ca020abdc 100644 --- a/.github/workflows/ci-backend-scylla-dummy.yml +++ b/.github/workflows/ci-backend-scylla-dummy.yml @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -66,56 +66,26 @@ jobs: - module: scylla args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\"" - name: murmur-graphdb - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\"" - name: murmur-hadoop - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\"" - name: murmur-core - java: 8 - - module: scylla - args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - name: murmur-ssl - java: 8 - - module: scylla - args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - name: murmur-client-auth - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\"" - name: murmur-diskstorage - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - install-args: "-Pjava-11" java: 11 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-backend-scylla.yml b/.github/workflows/ci-backend-scylla.yml index 0a0fbdd314c..904c79f3144 100644 --- a/.github/workflows/ci-backend-scylla.yml +++ b/.github/workflows/ci-backend-scylla.yml @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -66,60 +66,28 @@ jobs: - module: scylla args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\"" - name: murmur-graphdb - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\"" - name: murmur-hadoop - java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\"" - name: murmur-core - java: 8 - # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595 - # - module: scylla - # args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - # name: murmur-ssl - # java: 8 - # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595 - # - module: scylla - # args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" - # name: murmur-client-auth - # java: 8 - - module: scylla - args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\"" - name: murmur-diskstorage - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - install-args: "-Pjava-11" java: 11 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - install-args: "-Pjava-11" java: 11 # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595 # - module: scylla # args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" # name: murmur-ssl - # install-args: "-Pjava-11" # java: 11 # FIXME: this test is failing due to problems with ScyllaDB startup for Testcontainers. Issue: https://github.com/JanusGraph/janusgraph/issues/3595 # - module: scylla # args: "-Pscylla-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" # name: murmur-client-auth - # install-args: "-Pjava-11" # java: 11 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci-benchmark.yml b/.github/workflows/ci-benchmark.yml index ab6d0537afc..442d2b97973 100644 --- a/.github/workflows/ci-benchmark.yml +++ b/.github/workflows/ci-benchmark.yml @@ -44,7 +44,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -68,7 +68,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install -Pjanusgraph-benchmark ${{ env.BUILD_MAVEN_OPTS }} -Dgpg.skip=true - run: mvn verify --projects janusgraph-benchmark diff --git a/.github/workflows/ci-core-dummy.yml b/.github/workflows/ci-core-dummy.yml index cab6e3dfb22..2d6296f6095 100644 --- a/.github/workflows/ci-core-dummy.yml +++ b/.github/workflows/ci-core-dummy.yml @@ -41,36 +41,17 @@ jobs: matrix: include: - module: driver - java: 8 - - module: server - java: 8 - - module: test - java: 8 - - module: inmemory - args: "-Dtest.skip.tp=false" - java: 8 - - module: berkeleyje - java: 8 - - module: lucene - java: 8 - - module: driver - install-args: "-Pjava-11" java: 11 - module: server - install-args: "-Pjava-11" java: 11 - module: test - install-args: "-Pjava-11" java: 11 - module: inmemory - install-args: "-Pjava-11" args: "-Dtest.skip.tp=false" java: 11 - module: berkeleyje - install-args: "-Pjava-11" java: 11 - module: lucene - install-args: "-Pjava-11" java: 11 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml index c45c188411d..ef1f5f84478 100644 --- a/.github/workflows/ci-core.yml +++ b/.github/workflows/ci-core.yml @@ -50,29 +50,11 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} - build-java11: - needs: build-all - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: zulu - - run: mvn clean install --projects janusgraph-all -Pjava-11 -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - - run: mvn verify --projects janusgraph-all -Pjava-11 -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} - tests: runs-on: ubuntu-22.04 needs: build-all @@ -81,36 +63,17 @@ jobs: matrix: include: - module: driver - java: 8 - - module: server - java: 8 - - module: test - java: 8 - - module: inmemory - args: "-Dtest.skip.tp=false" - java: 8 - - module: berkeleyje - java: 8 - - module: lucene - java: 8 - - module: driver - install-args: "-Pjava-11" java: 11 - module: server - install-args: "-Pjava-11" java: 11 - module: test - install-args: "-Pjava-11" java: 11 - module: inmemory - install-args: "-Pjava-11" args: "-Dtest.skip.tp=false" java: 11 - module: berkeleyje - install-args: "-Pjava-11" java: 11 - module: lucene - install-args: "-Pjava-11" java: 11 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 14d8a44b01e..9959b033fec 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -38,7 +38,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -58,7 +58,7 @@ jobs: with: java-version: 11 distribution: zulu - - run: mvn clean install -Pjava-11 -pl janusgraph-doc ${{ env.BUILD_MAVEN_OPTS }} + - run: mvn clean install -pl janusgraph-doc ${{ env.BUILD_MAVEN_OPTS }} - run: git diff --exit-code docs/configs/janusgraph-cfg.md - run: docker build -t doc-site:mkdocs -f docs.Dockerfile . - run: docker run --rm -v $PWD:/mkdocs doc-site:mkdocs mkdocs build diff --git a/.github/workflows/ci-index-es-dummy.yml b/.github/workflows/ci-index-es-dummy.yml index e88f4a485df..24846cdd695 100644 --- a/.github/workflows/ci-index-es-dummy.yml +++ b/.github/workflows/ci-index-es-dummy.yml @@ -31,38 +31,18 @@ jobs: matrix: include: - module: es - args: "-Pelasticsearch8" - name: es8 - java: 8 - - module: es - args: "-Pelasticsearch7" - name: es7 - java: 8 - - module: es - args: "-Pelasticsearch6" - name: es6 - java: 8 - - module: es - args: "-Pelasticsearch60" - name: es60 - java: 8 - - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch8" name: es8 java: 11 - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch7" name: es7 java: 11 - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch6" name: es6 java: 11 - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch60" name: es60 java: 11 diff --git a/.github/workflows/ci-index-es.yml b/.github/workflows/ci-index-es.yml index 5ef7cc2ffac..4018cb307f1 100644 --- a/.github/workflows/ci-index-es.yml +++ b/.github/workflows/ci-index-es.yml @@ -52,7 +52,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -65,38 +65,18 @@ jobs: matrix: include: - module: es - args: "-Pelasticsearch8" - name: es8 - java: 8 - - module: es - args: "-Pelasticsearch7" - name: es7 - java: 8 - - module: es - args: "-Pelasticsearch6" - name: es6 - java: 8 - - module: es - args: "-Pelasticsearch60" - name: es60 - java: 8 - - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch8" name: es8 java: 11 - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch7" name: es7 java: 11 - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch6" name: es6 java: 11 - module: es - install-args: "-Pjava-11" args: "-Pelasticsearch60" name: es60 java: 11 diff --git a/.github/workflows/ci-index-solr-dummy.yml b/.github/workflows/ci-index-solr-dummy.yml index 9ca53108d4c..bd514401c40 100644 --- a/.github/workflows/ci-index-solr-dummy.yml +++ b/.github/workflows/ci-index-solr-dummy.yml @@ -31,11 +31,6 @@ jobs: matrix: include: - module: solr - args: "-Psolr8" - name: solr8 - java: 8 - - module: solr - install-args: "-Pjava-11" args: "-Psolr8" name: solr8 java: 11 diff --git a/.github/workflows/ci-index-solr.yml b/.github/workflows/ci-index-solr.yml index 0c06ad10bd9..86812a0a0c4 100644 --- a/.github/workflows/ci-index-solr.yml +++ b/.github/workflows/ci-index-solr.yml @@ -52,7 +52,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -65,11 +65,6 @@ jobs: matrix: include: - module: solr - args: "-Psolr8" - name: solr8 - java: 8 - - module: solr - install-args: "-Pjava-11" args: "-Psolr8" name: solr8 java: 11 diff --git a/.github/workflows/ci-publish-commit.yml b/.github/workflows/ci-publish-commit.yml index b329c84e01b..6ecafc63adb 100644 --- a/.github/workflows/ci-publish-commit.yml +++ b/.github/workflows/ci-publish-commit.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '8.0.372+7' + java-version: '11' java-package: jdk - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/ci-publish-official.yml b/.github/workflows/ci-publish-official.yml index c405033a1ee..ebbcb66c763 100644 --- a/.github/workflows/ci-publish-official.yml +++ b/.github/workflows/ci-publish-official.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '8.0.372+7' + java-version: '11' java-package: jdk - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/ci-release-dummy.yml b/.github/workflows/ci-release-dummy.yml index 9f4b96dcf6d..5f79cb1d985 100644 --- a/.github/workflows/ci-release-dummy.yml +++ b/.github/workflows/ci-release-dummy.yml @@ -31,8 +31,6 @@ jobs: matrix: include: - args: "" - java: 8 - - args: "-Pjava-11" java: 11 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 081b32a6ab4..284047bcb10 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -54,7 +54,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 11 distribution: zulu - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }} @@ -67,8 +67,6 @@ jobs: matrix: include: - args: "" - java: 8 - - args: "-Pjava-11" java: 11 steps: - uses: actions/checkout@v4 @@ -99,46 +97,24 @@ jobs: matrix: include: - module: inmemory - args: "-Dtest.skip.tp=false -DskipTests=true" - java: 8 - - module: berkeleyje - args: "-Dtest.skip.tp=false -DskipTests=true" - java: 8 - - module: cql - args: "-Pcassandra3-byteordered -Dtest.skip.tp=false -DskipTests=true" - java: 8 - - module: cql - args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true" - java: 8 - - module: hbase - args: "-Dtest.skip.tp=false -DskipTests=true" - java: 8 - - module: inmemory - install-args: "-Pjava-11" args: "-Dtest.skip.tp=false -DskipTests=true" java: 11 - module: berkeleyje - install-args: "-Pjava-11" args: "-Dtest.skip.tp=false -DskipTests=true" java: 11 - module: cql - install-args: "-Pjava-11" args: "-Pcassandra3-byteordered -Dtest.skip.tp=false -DskipTests=true" java: 11 - module: cql - install-args: "-Pjava-11" args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true" java: 11 - module: cql - install-args: "-Pjava-11" args: "-Pcassandra4-byteordered -Dtest.skip.tp=false -DskipTests=true" java: 11 - module: cql - install-args: "-Pjava-11" args: "-Pcassandra4-murmur -Dtest.skip.tp=false -DskipTests=true" java: 11 - module: hbase - install-args: "-Pjava-11" args: "-Dtest.skip.tp=false -DskipTests=true" java: 11 steps: diff --git a/BUILDING.md b/BUILDING.md index d9c601caa22..d072d4cbdb3 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -2,8 +2,8 @@ Required: -* Java 8 -* Maven 3 +* Java 11 +* Maven 4 To build without executing tests: diff --git a/docs/changelog.md b/docs/changelog.md index a926b489832..9f9825d431b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -73,7 +73,7 @@ compile "org.janusgraph:janusgraph-core:1.0.0" * Apache Lucene 8.11.1 * Apache Solr 8.11.1 * Apache TinkerPop 3.7.0 -* Java 8, 11 +* Java 11 !!! note Google Bigtable was removed from this list because there is no automatic testing in place specifically for that @@ -114,6 +114,13 @@ See [this](https://tinkerpop.apache.org/docs/current/upgrade/#_creation_of_new_g GraphSON serializers are renamed, e.g. from `org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0` to `org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3`. See [this](https://tinkerpop.apache.org/docs/current/upgrade/#_serializer_renaming) for more detail. +##### Add support for Java 11 + +JanusGraph now officially supports Java 11. Upgrade to java 11 is mandatory. + +!!! note + The pre-packaged distribution now requires Java 11. + ##### String vertex ID support Users now can use custom string vertex ids. See [Custom Vertex ID](advanced-topics/custom-vertex-id.md) documentation. Prior @@ -154,13 +161,6 @@ gremlin> graph.indexQuery("textIndex", "v.\"text\":fooBar").limit(10).offset(10) The new logic is applied similarly to Direct Index Queries `vertexTotals()`, `edgeTotals()`, `propertyTotals()` as well as internal JanusGraph method `IndexProvider.totals`. -##### Add support for Java 11 - -JanusGraph now officially supports Java 11 in addition to Java 8. We encourage everyone to update to Java 11. - -!!! note - The pre-packaged distribution now requires Java 11. - ##### Upgrade of log4j to version 2 This change requires a new log4j configuration. You can find an example configuration in `conf/log4j2-server.xml`. As a result of the changed configuration format, diff --git a/janusgraph-dist/README.md b/janusgraph-dist/README.md index 1eadd35cd09..6004887e014 100644 --- a/janusgraph-dist/README.md +++ b/janusgraph-dist/README.md @@ -2,7 +2,7 @@ ## Building zip archives -Run `mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true -Pjava-11`. +Run `mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true`. This command can be run from either the root of the JanusGraph repository (the parent of the janusgraph-dist directory) or the janusgraph-dist directory. Running from the root of the repository is recommended. Running from diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml index 8b2058b270c..162b687accd 100644 --- a/janusgraph-dist/pom.xml +++ b/janusgraph-dist/pom.xml @@ -317,15 +317,6 @@ - - java-11 - - janusgraph-java-11-${project.version} - janusgraph-java-11-full-${project.version} - eclipse-temurin:11-jre - -java-11 - - janusgraph-release diff --git a/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh b/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh index 5f610ad7485..076ab9a8bc2 100755 --- a/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh +++ b/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh @@ -108,12 +108,7 @@ COLLECTED_JAVA_OPTIONS_FILE="" # Read user-defined JVM options from jvm.options file if [[ -z "$JAVA_OPTIONS_FILE" ]]; then - jver=$($JAVA -version 2>&1 | grep 'version' 2>&1 | awk -F\" '{ split($2,a,"."); print a[1]"."a[2]}') - if [[ $jver == "1.8" ]]; then - JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm-8.options" - else - JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm-11.options" - fi + JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm.options" fi if [[ -f "$JAVA_OPTIONS_FILE" ]]; then for opt in "$(grep '^-' $JAVA_OPTIONS_FILE)" diff --git a/janusgraph-dist/src/assembly/static/conf/jvm-8.options b/janusgraph-dist/src/assembly/static/conf/jvm-8.options deleted file mode 100644 index cadb6ce6de4..00000000000 --- a/janusgraph-dist/src/assembly/static/conf/jvm-8.options +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2020 JanusGraph Authors -# -# Licensed 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. - -################# -# HEAP SETTINGS # -################# - --Xms4096m --Xmx4096m - - -######################## -# GENERAL JVM SETTINGS # -######################## - - -# enable thread priorities, primarily so we can give periodic tasks -# a lower priority to avoid interfering with client workload --XX:+UseThreadPriorities - -# allows lowering thread priority without being root on linux - probably -# not necessary on Windows but doesn't harm anything. -# see http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workar --XX:ThreadPriorityPolicy=42 - -# Enable heap-dump if there's an OOM --XX:+HeapDumpOnOutOfMemoryError - -# Per-thread stack size. --Xss256k - -# Make sure all memory is faulted and zeroed on startup. -# This helps prevent soft faults in containers and makes -# transparent hugepage allocation more effective. --XX:+AlwaysPreTouch - -# Enable thread-local allocation blocks and allow the JVM to automatically -# resize them at runtime. --XX:+UseTLAB --XX:+ResizeTLAB --XX:+UseNUMA - - -#################### -# GREMLIN SETTINGS # -#################### - --Dgremlin.io.kryoShimService=org.janusgraph.hadoop.serialize.JanusGraphKryoShimService - - -################# -# GC SETTINGS # -################# - -### CMS Settings - --XX:+UseParNewGC --XX:+UseConcMarkSweepGC --XX:+CMSParallelRemarkEnabled --XX:SurvivorRatio=8 --XX:MaxTenuringThreshold=1 --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseCMSInitiatingOccupancyOnly --XX:CMSWaitDuration=10000 --XX:+CMSParallelInitialMarkEnabled --XX:+CMSEdenChunksRecordAlways --XX:+CMSClassUnloadingEnabled diff --git a/janusgraph-dist/src/assembly/static/conf/jvm-11.options b/janusgraph-dist/src/assembly/static/conf/jvm.options similarity index 100% rename from janusgraph-dist/src/assembly/static/conf/jvm-11.options rename to janusgraph-dist/src/assembly/static/conf/jvm.options diff --git a/pom.xml b/pom.xml index 3c3d8a488c4..cc7e7581087 100644 --- a/pom.xml +++ b/pom.xml @@ -94,8 +94,9 @@ true ${basedir} 3.5.0 - 1.8 - 1.8 + 11 + 11 + 11 MEMORY_TESTS,PERFORMANCE_TESTS,BRITTLE_TESTS false 3.11.10 @@ -361,8 +362,6 @@ maven-compiler-plugin 3.11.0 - ${compiler.source} - ${compiler.target} 500 @@ -1431,14 +1430,6 @@ - - java-11 - - 11 - 11 - - - janusgraph-release