Run gradle builds with newer JVM, so sonar works

xenit-eu · Dec 13, 2024 · a630318 · a630318
1 parent 5ea7b87
commit a630318
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Test
         run: ./gradlew test
@@ -43,7 +43,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Test
         run: ./gradlew :integration-tests:alfresco-${{ matrix.flavour }}-${{ matrix.version }}:integrationTest -Prandom_ports=true
@@ -63,7 +63,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Publish
         env:

diff --git a/alfresco-health-processor-platform/alfresco-7-upwards/build.gradle b/alfresco-health-processor-platform/alfresco-7-upwards/build.gradle
@@ -5,7 +5,6 @@ plugins {
 }
 
 java {
-    jar.archiveBaseName = "alfresco-health-processor-platform_alfresco7"
     withJavadocJar()
     withSourcesJar()
 
@@ -14,6 +13,10 @@ java {
     }
 }
 
+jar {
+    archiveBaseName = "alfresco-health-processor-platform_alfresco7"
+}
+
 dependencies {
     alfrescoProvided(project(":alfresco-health-processor-platform"))
 

diff --git a/alfresco-health-processor-platform/build.gradle b/alfresco-health-processor-platform/build.gradle
@@ -32,13 +32,14 @@ configurations {
 }
 
 java {
-    jar {
-        enabled = false
-    }
     withJavadocJar()
     withSourcesJar()
 }
 
+jar {
+    enabled = false
+}
+
 dependencies {
     internalPlatform platform("eu.xenit.alfresco:alfresco-community-bom:${alfrescoVersion}")
 

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ ext {
     alfrescoVersion = '5.2.f'
     alfredTelemetryVersion = '0.6.0'
     micrometerVersion = '1.0.6'
-    lombokVersion = '1.18.10'
+    lombokVersion = '1.18.36'
 }
 
 subprojects {