Merge branch 'release/4.1.1'

Author: nfranzeck

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.1.1](https://github.com/cloudogu/ces-build-lib/releases/tag/4.1.1) - 2025-03-11
+### Fixed
+- [#143] Fix IllegalAccessError when using `GradleWrapperInDocker(..)`
+
 ## [4.1.0](https://github.com/cloudogu/ces-build-lib/releases/tag/4.1.0) - 2025-02-19
 ### Added
 - Add checkChangelog function to make sure your changelog has been updated on an open PR

Jenkinsfile

@@ -50,7 +50,10 @@ node('docker') {
             def sonarQube = cesBuildLib.SonarQube.new(this, 'ces-sonar')
             sonarQube.updateAnalysisResultOfPullRequestsToGitHub('sonarqube-gh-token')
 
-            sonarQube.analyzeWith(mvn)
+            // SonarQube >= v25.01 needs JDK 17
+            def mvnWithJdk17 = cesBuildLib.MavenWrapperInDocker.new(this, 'eclipse-temurin:17.0.14_7-jdk-alpine')
+            mvnWithJdk17.useLocalRepoFromJenkins = true
+            sonarQube.analyzeWith(mvnWithJdk17)
 
             if (!sonarQube.waitForQualityGateWebhookToBeCalled()) {
                 unstable("Pipeline unstable due to SonarQube quality gate failure")

pom.xml

@@ -19,7 +19,7 @@
     <groupId>com.cloudogu.ces</groupId>
     <artifactId>ces-build-lib</artifactId>
     <name>ces-build-lib</name>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
 
 
     <properties>

src/com/cloudogu/ces/cesbuildlib/GradleInDockerBase.groovy

@@ -6,12 +6,13 @@ abstract class GradleInDockerBase extends Gradle {
 
     /** Setting this to {@code true} allows the Gradle build to access the docker host, i.e. to start other containers.*/
     boolean enableDockerHost = false
-    String credentialsId = null
+    private String credentialsId = null
 
     Docker docker
 
-    GradleInDockerBase(script) {
+    GradleInDockerBase(script, String credentialsId = null) {
         super(script)
+        this.credentialsId = credentialsId
         this.docker = new Docker(script)
     }
 

src/com/cloudogu/ces/cesbuildlib/GradleWrapperInDocker.groovy

@@ -9,9 +9,8 @@ class GradleWrapperInDocker extends GradleInDockerBase {
     private String imageId
 
     GradleWrapperInDocker(script, String imageId, String credentialsId = null) {
-        super(script)
+        super(script, credentialsId)
         this.imageId = imageId
-        this.credentialsId = credentialsId
     }
 
     @Override

test/com/cloudogu/ces/cesbuildlib/GradleInDockerBaseTest.groovy

@@ -25,10 +25,9 @@ class GradleInDockerBaseTest {
 
     @Test
     void inDockerWithRegistry() {
-        def gradle = new GradleInDockerBaseForTest(scriptMock)
+        def gradle = new GradleInDockerBaseForTest(scriptMock, 'myCreds')
         gradle.docker = docker.mock
         scriptMock.expectedDefaultShRetValue = ''
-        gradle.credentialsId = 'myCreds'
         boolean closureCalled = false
 
         gradle.inDocker(IMAGE_ID, {
@@ -62,8 +61,8 @@ class GradleInDockerBaseTest {
 
     class GradleInDockerBaseForTest extends GradleInDockerBase {
 
-        GradleInDockerBaseForTest(script) {
-            super(script)
+        GradleInDockerBaseForTest(script, String credentialsId = null) {
+            super(script, credentialsId)
         }
 
         def call(Closure closure, boolean printStdOut) {