diff --git a/.github/workflows/ci-backend-cql-dummy.yml b/.github/workflows/ci-backend-cql-dummy.yml index d271793ee76..85e316e9a82 100644 --- a/.github/workflows/ci-backend-cql-dummy.yml +++ b/.github/workflows/ci-backend-cql-dummy.yml @@ -33,164 +33,54 @@ jobs: - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\"" name: byteordered-diskstorage - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - java: 8 + java: 17 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\"" name: byteordered-graphdb - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - java: 8 + java: 17 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\"" name: byteordered-core - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - java: 8 + java: 17 - module: cql args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\"" name: scylladb-diskstorage - java: 8 + java: 17 - module: cql args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\"" name: scylladb-graphdb - java: 8 + java: 17 - module: cql args: "-Pscylladb -Dtest=\"**/hadoop/*\"" name: scylladb-hadoop - java: 8 + java: 17 - 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 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-backend-cql.yml b/.github/workflows/ci-backend-cql.yml index a97ec4f258e..dbc525d00d3 100644 --- a/.github/workflows/ci-backend-cql.yml +++ b/.github/workflows/ci-backend-cql.yml @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 17 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,165 +66,55 @@ jobs: - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\"" name: byteordered-diskstorage - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - java: 8 + java: 17 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\"" name: byteordered-graphdb - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - java: 8 + java: 17 - module: cql args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\"" name: byteordered-core - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-client-auth - java: 8 + java: 17 - module: cql args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\"" name: scylladb-diskstorage - java: 8 + java: 17 - module: cql args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\"" name: scylladb-graphdb - java: 8 + java: 17 - module: cql args: "-Pscylladb -Dtest=\"**/hadoop/*\"" name: scylladb-hadoop - java: 8 + java: 17 - 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 + java: 17 steps: - uses: actions/checkout@v3 with: @@ -286,7 +176,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 8 + java-version: 17 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..63f23300a2e 100644 --- a/.github/workflows/ci-backend-hbase-dummy.yml +++ b/.github/workflows/ci-backend-hbase-dummy.yml @@ -33,29 +33,14 @@ jobs: - module: hbase args: "-Dtest=\"**/diskstorage/hbase/*\"" name: hbase2-diskstorage - java: 8 + java: 17 - module: hbase args: "-Dtest=\"**/graphdb/hbase/*\"" name: hbase2-graphdb - java: 8 + java: 17 - 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 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-backend-hbase.yml b/.github/workflows/ci-backend-hbase.yml index 2a4444dcc45..ea9dfbfb49d 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: 17 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,30 +66,15 @@ jobs: - module: hbase args: "-Dtest=\"**/diskstorage/hbase/*\"" name: hbase2-diskstorage - java: 8 + java: 17 - module: hbase args: "-Dtest=\"**/graphdb/hbase/*\"" name: hbase2-graphdb - java: 8 + java: 17 - 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 + java: 17 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ci-backend-scylla-dummy.yml b/.github/workflows/ci-backend-scylla-dummy.yml index 98e3866e9b3..b9145406ee0 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: 17 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 + java: 17 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - java: 8 + java: 17 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - java: 8 + java: 17 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - java: 8 + java: 17 - module: scylla args: "-Pscylla-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\"" name: murmur-ssl - java: 8 + java: 17 - 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 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-backend-scylla.yml b/.github/workflows/ci-backend-scylla.yml index 82c87c9c445..e1ed07d22ab 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: 17 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,61 +66,29 @@ jobs: - module: scylla args: "-Pscylla-murmur -Dtest=\"**/diskstorage/cql/*\"" name: murmur-diskstorage - java: 8 + java: 17 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/graphdb/cql/*\"" name: murmur-graphdb - java: 8 + java: 17 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/hadoop/*\"" name: murmur-hadoop - java: 8 + java: 17 - module: scylla args: "-Pscylla-murmur -Dtest=\"**/core/cql/*\"" name: murmur-core - java: 8 + java: 17 # 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 + # java: 17 # 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 + # java: 17 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ci-benchmark.yml b/.github/workflows/ci-benchmark.yml index 6bf8681df65..f48788a08b8 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: 17 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: 17 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..271c5e47784 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 + java: 17 - module: server - java: 8 + java: 17 - module: test - java: 8 + java: 17 - module: inmemory args: "-Dtest.skip.tp=false" - java: 8 + java: 17 - module: berkeleyje - java: 8 + java: 17 - 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 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml index 814ad91710f..ebc522f71f9 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: 17 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@v3 - - 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,37 +63,18 @@ 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 + java: 17 - module: server - install-args: "-Pjava-11" - java: 11 + java: 17 - module: test - install-args: "-Pjava-11" - java: 11 + java: 17 - module: inmemory - install-args: "-Pjava-11" args: "-Dtest.skip.tp=false" - java: 11 + java: 17 - module: berkeleyje - install-args: "-Pjava-11" - java: 11 + java: 17 - module: lucene - install-args: "-Pjava-11" - java: 11 + java: 17 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 51a52238ac3..fffda988245 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: 17 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 }} @@ -56,9 +56,9 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 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..a284689c8d9 100644 --- a/.github/workflows/ci-index-es-dummy.yml +++ b/.github/workflows/ci-index-es-dummy.yml @@ -33,38 +33,18 @@ jobs: - module: es args: "-Pelasticsearch8" name: es8 - java: 8 + java: 17 - module: es args: "-Pelasticsearch7" name: es7 - java: 8 + java: 17 - module: es args: "-Pelasticsearch6" name: es6 - java: 8 + java: 17 - 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 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-index-es.yml b/.github/workflows/ci-index-es.yml index 09d90c8b011..9117edcc42a 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: 17 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,39 +67,19 @@ jobs: - module: es args: "-Pelasticsearch8" name: es8 - java: 8 + java: 17 - module: es args: "-Pelasticsearch7" name: es7 - java: 8 + java: 17 - module: es args: "-Pelasticsearch6" name: es6 - java: 8 + java: 17 - 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 + java: 17 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ci-index-solr-dummy.yml b/.github/workflows/ci-index-solr-dummy.yml index 9ca53108d4c..336211c8ca1 100644 --- a/.github/workflows/ci-index-solr-dummy.yml +++ b/.github/workflows/ci-index-solr-dummy.yml @@ -33,11 +33,6 @@ jobs: - module: solr args: "-Psolr8" name: solr8 - java: 8 - - module: solr - install-args: "-Pjava-11" - args: "-Psolr8" - name: solr8 - java: 11 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-index-solr.yml b/.github/workflows/ci-index-solr.yml index fb0bd48bad1..23b25535346 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: 17 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,12 +67,7 @@ jobs: - module: solr args: "-Psolr8" name: solr8 - java: 8 - - module: solr - install-args: "-Pjava-11" - args: "-Psolr8" - name: solr8 - java: 11 + java: 17 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ci-release-dummy.yml b/.github/workflows/ci-release-dummy.yml index 9f4b96dcf6d..e66aaae5c11 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 + java: 17 steps: - run: 'echo "No build required"' diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index bbf87ea08fb..8f2bbb28def 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: 17 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,9 +67,7 @@ jobs: matrix: include: - args: "" - java: 8 - - args: "-Pjava-11" - java: 11 + java: 17 steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 @@ -100,47 +98,19 @@ jobs: include: - module: inmemory args: "-Dtest.skip.tp=false -DskipTests=true" - java: 8 + java: 17 - module: berkeleyje args: "-Dtest.skip.tp=false -DskipTests=true" - java: 8 + java: 17 - module: cql args: "-Pcassandra3-byteordered -Dtest.skip.tp=false -DskipTests=true" - java: 8 + java: 17 - module: cql args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true" - java: 8 + java: 17 - 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 + java: 17 steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 diff --git a/BUILDING.md b/BUILDING.md index d9c601caa22..573b9903ead 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -2,8 +2,8 @@ Required: -* Java 8 -* Maven 3 +* Java 17 +* Maven 4 To build without executing tests: 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/docker/Dockerfile b/janusgraph-dist/docker/Dockerfile index a03e268a794..bf6b7903594 100644 --- a/janusgraph-dist/docker/Dockerfile +++ b/janusgraph-dist/docker/Dockerfile @@ -18,7 +18,7 @@ FROM debian:buster-slim as builder ARG TARGETARCH ARG JANUS_VERSION=1.0.0-SNAPSHOT -ARG BUILD_PATH=janusgraph-java-11-1.0.0-SNAPSHOT +ARG BUILD_PATH=janusgraph-java-17-1.0.0-SNAPSHOT ARG YQ_VERSION=3.4.1 ENV JANUS_VERSION=${JANUS_VERSION} \ diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml index b4c7c8ba331..d5be4de5c4a 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/pom.xml b/pom.xml index ea0bb7b0c58..f979e3bd5a6 100644 --- a/pom.xml +++ b/pom.xml @@ -93,8 +93,8 @@ true ${basedir} 3.5.0 - 1.8 - 1.8 + 17 + 17 MEMORY_TESTS,PERFORMANCE_TESTS,BRITTLE_TESTS false 3.11.10 @@ -1435,14 +1435,6 @@ - - java-11 - - 11 - 11 - - - janusgraph-release