Bumped the JDK version and all the workflows actions

Aiven-Open · May 3, 2024 · 66cb08f · 66cb08f
1 parent 7c142d0
commit 66cb08f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -67,10 +67,11 @@ jobs:
     #- run: |
     #   make bootstrap
     #   make release
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4.2.1
       with:
-        java-version: 11
+        distribution: 'jdkfile'
+        java-version: '17'
 
     - name: Build with Gradle
       run: ./gradlew build

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -18,9 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java SDK
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v4.2.1
         with:
-          java-version: 11
+          distribution: 'jdkfile'
+          java-version: '17'
 
       - name: Checkout code
         uses: actions/checkout@v2

diff --git a/.github/workflows/master_push_workflow.yml b/.github/workflows/master_push_workflow.yml
@@ -13,8 +13,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4.2.1
         with:
-          java-version: 11
+          distribution: 'jdkfile'
+          java-version: '17'
       - name: Build with Gradle
         run: ./gradlew build integrationTest
diff --git a/.github/workflows/pull_request_workflow.yml b/.github/workflows/pull_request_workflow.yml
@@ -12,8 +12,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4.2.1
         with:
-          java-version: 17
+          distribution: 'jdkfile'
+          java-version: '17'
       - name: Build with Gradle
         run: ./gradlew build integrationTest
diff --git a/src/integrationTest/java/io/aiven/kafka/connect/jdbc/SchemaRegistryContainer.java b/src/integrationTest/java/io/aiven/kafka/connect/jdbc/SchemaRegistryContainer.java
@@ -24,21 +24,21 @@ public final class SchemaRegistryContainer extends GenericContainer<SchemaRegist
     public static final int SCHEMA_REGISTRY_PORT = 8081;
 
     public SchemaRegistryContainer(final KafkaContainer kafka) {
-        this("5.0.4", kafka);
+        this("3.7.0", kafka);
     }
 
     public SchemaRegistryContainer(final String confluentPlatformVersion, final KafkaContainer kafka) {
-        super("confluentinc/cp-schema-registry:" + confluentPlatformVersion);
+        super("ghcr.io/aiven/karapace:" + confluentPlatformVersion);
 
         dependsOn(kafka);
         withNetwork(kafka.getNetwork());
         withNetworkAliases("schema-registry-" + Base58.randomString(6));
 
-        withEnv("SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS",
+        withEnv("KARAPACE_BOOTSTRAP_URI",
             String.format("PLAINTEXT://%s:%s", kafka.getNetworkAliases().get(0), 9092));
 
         withExposedPorts(SCHEMA_REGISTRY_PORT);
-        withEnv("SCHEMA_REGISTRY_HOST_NAME", "localhost");
+        withEnv("SCHEMA_REGISTRY_HOST_NAME", "localhost"); // probably useless for karapace
     }
 
     public String getSchemaRegistryUrl() {