From 14c8d308ddc384a22cfef3cceac2175dc7aa93bb Mon Sep 17 00:00:00 2001 From: bartvl-xenit Date: Mon, 20 Nov 2023 08:41:34 +0100 Subject: [PATCH 1/3] ALFREDOPS-851 compiling with java 17 --- alfred-telemetry-platform/build.gradle | 1 + build.gradle | 12 ++++++++++-- integration-tests/build.gradle | 6 +++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/alfred-telemetry-platform/build.gradle b/alfred-telemetry-platform/build.gradle index e26d6ca..81c318a 100644 --- a/alfred-telemetry-platform/build.gradle +++ b/alfred-telemetry-platform/build.gradle @@ -56,6 +56,7 @@ dependencies { testImplementation "org.hamcrest:hamcrest-all:${hamcrestVersion}" testImplementation "org.awaitility:awaitility:${awaitilityVersion}" testImplementation "org.mockito:mockito-inline:${mockitoVersion}" + testImplementation "net.bytebuddy:byte-buddy:${byteBuddyVersion}" testRuntimeOnly 'org.alfresco:alfresco-remote-api' } diff --git a/build.gradle b/build.gradle index c39586e..820dd29 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,13 @@ allprojects { apply plugin: 'java' apply plugin: 'jacoco' + compileJava { + options.release = 11 + } + compileTestJava { + options.release = 11 + } + jacocoTestReport { reports { xml.enabled true @@ -39,10 +46,11 @@ allprojects { jvmExtrasVersion = '0.1.2' junitJupiterVersion = '5.4.2' - mockitoVersion = '2.27.0' + mockitoVersion = '4.5.1' + byteBuddyVersion = '1.14.6' hamcrestVersion = '1.3' awaitilityVersion = '4.1.0' - restAssuredVersion = '4.0.0' + restAssuredVersion = '5.3.0' } diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index 9b6b194..8405766 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -8,9 +8,9 @@ ext { extraDependencies = [] } -java { - sourceCompatibility = JavaVersion.VERSION_11 -} +//java { +// sourceCompatibility = JavaVersion.VERSION_11 +//} dependencies { testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" From abf6ff876e5ebb499fa87bf74b1cf6c433b89ff9 Mon Sep 17 00:00:00 2001 From: bartvl-xenit Date: Mon, 20 Nov 2023 09:22:57 +0100 Subject: [PATCH 2/3] ALFREDOPS-851 fix test for local Windows + ci with java 17 --- .github/workflows/ci.yml | 12 ++++++------ .../integrationtesting/RestAssuredTestSolr.java | 2 +- .../test/resources/compose/docker-compose-solr.yml | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44642ca..5b57731 100644 --- 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/integration-tests/src/test/java/eu/xenit/alfred/telemetry/integrationtesting/RestAssuredTestSolr.java b/integration-tests/src/test/java/eu/xenit/alfred/telemetry/integrationtesting/RestAssuredTestSolr.java index 84a4c47..2e31ed8 100644 --- a/integration-tests/src/test/java/eu/xenit/alfred/telemetry/integrationtesting/RestAssuredTestSolr.java +++ b/integration-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 index de05b79..37e5bfa 100644 --- 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 From 0c59d2e5aca2552525d4c4d2f5bd1d6965b6010d Mon Sep 17 00:00:00 2001 From: bartvl-xenit Date: Mon, 20 Nov 2023 10:06:12 +0100 Subject: [PATCH 3/3] ALFREDOPS-851 removed commented code --- integration-tests/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index 8405766..d40a812 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -8,10 +8,6 @@ ext { extraDependencies = [] } -//java { -// sourceCompatibility = JavaVersion.VERSION_11 -//} - dependencies { testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"