test-java-17

GDATASoftwareAG · Aug 29, 2023 · 00d3d17 · 00d3d17
1 parent e8f3dc1
commit 00d3d17
Show file tree

Hide file tree

Showing 21 changed files with 93 additions and 560 deletions.
diff --git 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
@@ -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 }}