From fb2e9cf8597980d49d7b6153518e94b4000cd6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= <reda-alaoui@hey.com>
Date: Fri, 13 Sep 2024 17:50:11 +0200
Subject: [PATCH] Fix the build

---
 .github/release-drafter.yml                     |  1 +
 .github/workflows/cd.yaml                       | 15 ---------------
 .github/workflows/jenkins-security-scan.yml     |  8 +++++---
 .github/workflows/release-drafter.yml           | 17 +++++++++++++++++
 Jenkinsfile                                     |  9 ++++++++-
 pom.xml                                         | 11 +++++------
 .../LogbackConfigurator.java                    |  4 +++-
 .../sonarqube/SonarqubeServer.java              |  2 +-
 8 files changed, 40 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/cd.yaml
 create mode 100644 .github/workflows/release-drafter.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 0d0b1c99..d98cff48 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1 +1,2 @@
 _extends: .github
+tag-template: demo-$NEXT_MINOR_VERSION
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
deleted file mode 100644
index 0279984d..00000000
--- a/.github/workflows/cd.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
-
-name: cd
-on:
-  workflow_dispatch:
-  check_run:
-    types:
-      - completed
-
-jobs:
-  maven-cd:
-    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
-    secrets:
-      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-      MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml
index c7b41fc2..f1995d84 100644
--- a/.github/workflows/jenkins-security-scan.yml
+++ b/.github/workflows/jenkins-security-scan.yml
@@ -1,9 +1,11 @@
-name: Jenkins Security Scan
+# More information about the Jenkins security scan can be found at the developer docs: https://www.jenkins.io/redirect/jenkins-security-scan/
 
+name: Jenkins Security Scan
 on:
   push:
     branches:
-      - master
+      - "master"
+      - "main"
   pull_request:
     types: [ opened, synchronize, reopened ]
   workflow_dispatch:
@@ -18,4 +20,4 @@ jobs:
     uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
     with:
       java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
-      # java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.
+      java-version: 11 # What version of Java to set up for the build.
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000..58835450
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,17 @@
+# Automates creation of Release Drafts using Release Drafter
+# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+
+on:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into the default branch
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Jenkinsfile b/Jenkinsfile
index 48bf230e..9a2628d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1,8 @@
-buildPlugin()
\ No newline at end of file
+buildPlugin(
+        useContainerAgent: false, // Set to `false` if you need to use Docker for containerized tests
+        timeout: 180,
+        configurations: [
+                [platform: 'linux', jdk: 21],
+                [platform: 'windows', jdk: 17],
+        ]
+)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 419dc602..289a7604 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.32</version>
+    <version>4.87</version>
     <relativePath/>
   </parent>
 
@@ -18,9 +18,8 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-    <jenkins.version>2.277.4</jenkins.version>
-    <java.level>8</java.level>
-    <jenkins-test-harness.version>1674.v3b8b1441e939</jenkins-test-harness.version>
+    <jenkins.version>2.361.4</jenkins.version>
+    <jenkins-test-harness.version>2225.2230.v6210cb_b_827f9</jenkins-test-harness.version>
     <!-- Other properties you may want to use:
          ~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
          ~ stapler-plugin.version: The Stapler Maven plugin version required by the plugin.
@@ -37,7 +36,7 @@
 
     <git-code-format-maven-plugin.version>2.7</git-code-format-maven-plugin.version>
     <assertj-core.version>3.21.0</assertj-core.version>
-    <logback-classic.version>1.2.3</logback-classic.version>
+    <logback-classic.version>1.5.8</logback-classic.version>
     <sonar-ws-shaded.version>7.7.0</sonar-ws-shaded.version>
   </properties>
 
@@ -66,7 +65,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.15</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
diff --git a/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/LogbackConfigurator.java b/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/LogbackConfigurator.java
index 0ddc3db8..c1f5fea6 100644
--- a/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/LogbackConfigurator.java
+++ b/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/LogbackConfigurator.java
@@ -8,7 +8,8 @@
 /** @author Réda Housni Alaoui */
 public class LogbackConfigurator extends BasicConfigurator {
 
-  public void configure(LoggerContext lc) {
+  @Override
+  public ExecutionStatus configure(LoggerContext lc) {
     super.configure(lc);
     Level rootLevel =
         Optional.ofNullable(System.getenv("SONAR_GERRIT_PLUGIN_TEST_LOG_ROOT_LEVEL"))
@@ -16,5 +17,6 @@ public void configure(LoggerContext lc) {
             .orElse(Level.OFF);
     lc.getLogger("ROOT").setLevel(rootLevel);
     lc.getLogger("com.sonyericsson.hudson").setLevel(Level.WARN);
+    return ExecutionStatus.NEUTRAL;
   }
 }
diff --git a/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/sonarqube/SonarqubeServer.java b/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/sonarqube/SonarqubeServer.java
index 659da2c9..97d524f8 100644
--- a/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/sonarqube/SonarqubeServer.java
+++ b/src/test/java/org/jenkinsci/plugins/sonargerrit/test_infrastructure/sonarqube/SonarqubeServer.java
@@ -52,7 +52,7 @@ private SonarqubeServer(Network network) {
                     .withDockerfileFromBuilder(
                         builder ->
                             builder
-                                .from("docker.cosium.dev/sonarqube:8.9.2-community")
+                                .from("sonarqube:8.9.2-community")
                                 .add(
                                     "https://github.com/mc1arke/sonarqube-community-branch-plugin/releases/download/1.8.1/sonarqube-community-branch-plugin-1.8.1.jar",
                                     "/opt/sonarqube/extensions/plugins/sonarqube-community-branch-plugin.jar")))