ALFREDOPS-851 fix test for local Windows + ci with java 17

xenit-eu · Nov 20, 2023 · abf6ff8 · abf6ff8
1 parent 14c8d30
commit abf6ff8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Test
         uses: gradle/gradle-build-action@v2
         with:
@@ -39,11 +39,11 @@ jobs:
         version: [ "61", "62", "70", "71", "72", "73","74" ]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Login to Docker
         env:
           DOCKER_HUB_USER: ${{ secrets.XENIT_DOCKER_REGISTRY_USERNAME }}
@@ -70,11 +70,11 @@ jobs:
     if: ${{ startsWith(github.ref, 'refs/heads/master') || startswith(github.ref, 'refs/heads/release') }}
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Publish
         env:
           ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.SONATYPE_S01_USERNAME }}

diff --git a/...tests/src/test/java/eu/xenit/alfred/telemetry/integrationtesting/RestAssuredTestSolr.java b/...tests/src/test/java/eu/xenit/alfred/telemetry/integrationtesting/RestAssuredTestSolr.java
@@ -33,7 +33,7 @@ public static void initializeRestAssured() {
 
         final String baseURI = "https://" + System.getProperty("solr.host", "localhost");
         RestAssured.baseURI = baseURI;
-        int port = Integer.parseInt(System.getProperty("solr.tcp.8443", "8443"));
+        int port = Integer.parseInt(System.getProperty("solr.tcp.8443", "8444"));
         RestAssured.port = port;
         final String solrFlavor = System.getProperty("solrFlavor","/solr");
         final String basePath = ("solr4".equals(solrFlavor))? "/solr4" : "/solr";

diff --git a/integration-tests/src/test/resources/compose/docker-compose-solr.yml b/integration-tests/src/test/resources/compose/docker-compose-solr.yml
@@ -17,6 +17,7 @@ services:
       - DEBUG=true
       - JMX_ENABLED=true
     ports:
+      - "8444:8443"
       - target: 8443
         mode: host
 #      - target: 8080