From 18d18df1f2391551e97383219feb61ab611cc5f5 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:42:04 +0000
Subject: [PATCH 01/13] Switch automating LTS version to renovate (#2585)
---
.github/renovate.json | 20 +++++++
.github/workflows/updatecli-action.yaml | 36 ------------
updatecli/current-jenkins.ps1 | 7 ---
updatecli/update-jenkins.ps1 | 32 -----------
.../update-integrations-jenkins.yaml | 56 -------------------
updatecli/values.yaml | 8 ---
6 files changed, 20 insertions(+), 139 deletions(-)
delete mode 100644 .github/workflows/updatecli-action.yaml
delete mode 100644 updatecli/current-jenkins.ps1
delete mode 100644 updatecli/update-jenkins.ps1
delete mode 100644 updatecli/updatecli.d/update-integrations-jenkins.yaml
delete mode 100644 updatecli/values.yaml
diff --git a/.github/renovate.json b/.github/renovate.json
index 3febbc00..3c670858 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -9,5 +9,25 @@
"labels": [
"dependencies"
],
+ "packageRules": [
+ {
+ "packagePatterns": ["org.jenkins-ci.main:jenkins-war"],
+ "allowedVersions": "/^[0-9]+\\.[0-9]+\\.[0-9]+$/",
+ "registryUrls": ["https://repo.jenkins-ci.org/public/"]
+ }
+ ],
+ "customManagers": [
+ {
+ "customType": "regex",
+ "fileMatch": [
+ "integrations/pom.xml"
+ ],
+ "matchStrings": [
+ "(?.*?)"
+ ],
+ "depNameTemplate": "org.jenkins-ci.main:jenkins-war",
+ "datasourceTemplate": "maven"
+ }
+ ],
"rebaseWhen": "conflicted"
}
diff --git a/.github/workflows/updatecli-action.yaml b/.github/workflows/updatecli-action.yaml
deleted file mode 100644
index d317802a..00000000
--- a/.github/workflows/updatecli-action.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: updatecli
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- schedule:
- # * is a special character in YAML so you have to quote this string
- # Run once a day
- - cron: '0 0 * * *'
-
-jobs:
- updatecli:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v4
-
- - name: Install updatecli
- uses: updatecli/updatecli-action@v2
-
- - name: Diff
- continue-on-error: true
- run: |
- updatecli diff --config updatecli/updatecli.d --values updatecli/values.yaml
- env:
- UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Apply
- if: github.ref == 'refs/heads/master'
- run: |
- updatecli apply --config updatecli/updatecli.d --values updatecli/values.yaml
- env:
- UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/updatecli/current-jenkins.ps1 b/updatecli/current-jenkins.ps1
deleted file mode 100644
index d4af08e2..00000000
--- a/updatecli/current-jenkins.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-param(
- [Parameter(Position = 0)]
- [string] $PomPath
-)
-
-[xml]$xml = Get-Content $PomPath
-$xml.project.properties.'jenkins.version'
diff --git a/updatecli/update-jenkins.ps1 b/updatecli/update-jenkins.ps1
deleted file mode 100644
index 3f1091d4..00000000
--- a/updatecli/update-jenkins.ps1
+++ /dev/null
@@ -1,32 +0,0 @@
-param(
- [Parameter(Position = 0)]
- [string] $PomPath,
- [Parameter(Position = 1)]
- [version] $NewVersion
-)
-
-$changed = $false
-if ($null -eq $ENV:DRY_RUN) {
- $ENV:DRY_RUN = $false
-}
-
-$pom = New-Object System.Xml.XmlDocument
-$pom.PreserveWhitespace = $true
-$pom.Load($PomPath)
-
-[version]$CurrentVersion = $pom.project.properties.'jenkins.version'
-if ($null -ne $CurrentVersion -and $NewVersion -gt $CurrentVersion) {
- $changed = $true
- $pom.project.properties.'jenkins.version' = $NewVersion
-}
-
-if ($changed) {
- Write-Output "$NewVersion"
-
- if ($ENV:DRY_RUN -eq $false) {
- $utf8WithoutBom = New-Object System.Text.UTF8Encoding($false)
- $streamWriter = New-Object System.IO.StreamWriter($PomPath, $false, $utf8WithoutBom)
- $pom.Save($streamWriter)
- $streamWriter.Close()
- }
-}
diff --git a/updatecli/updatecli.d/update-integrations-jenkins.yaml b/updatecli/updatecli.d/update-integrations-jenkins.yaml
deleted file mode 100644
index f10afd1a..00000000
--- a/updatecli/updatecli.d/update-integrations-jenkins.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-scms:
- github:
- kind: github
- spec:
- user: '{{ .github.user }}'
- email: '{{ .github.email }}'
- owner: '{{ .github.owner }}'
- repository: '{{ .github.repository }}'
- branch: '{{ .github.branch }}'
- username: '{{ .github.username }}'
- token: '{{ requiredEnv .github.token }}'
-sources:
- jenkins:
- name: Get Last jenkins Weekly Version
- kind: jenkins
- spec:
- release: stable
- github:
- token: '{{ requiredEnv .github.token }}'
- username: '{{ .github.username }}'
- current-jenkins:
- name: Get Current jenkins Version
- kind: shell
- spec:
- command: pwsh -NoProfile -File {{ requiredEnv "GITHUB_WORKSPACE" }}/updatecli/current-jenkins.ps1 -PomPath integrations/pom.xml
-conditions:
- jenkins:
- name: Test if Jenkins stable published
- kind: maven
- sourceid: jenkins
- spec:
- url: repo.jenkins-ci.org
- repository: releases
- groupId: org.jenkins-ci.main
- artifactId: jenkins-war
-targets:
- jenkins:
- name: Update Jenkins version
- sourceid: jenkins
- scmid: github
- kind: shell
- spec:
- command: pwsh -NoProfile -File {{ requiredEnv "GITHUB_WORKSPACE" }}/updatecli/update-jenkins.ps1 -PomPath integrations/pom.xml -NewVersion
-pullrequests:
- jenkins:
- title: Bump jenkins.version from {{ source "current-jenkins" }} to {{ source "jenkins" }}
- kind: github
- scmid: github
- targets:
- - jenkins
- spec:
- labels:
- - dependencies
- automerge: true
- mergemethod: squash
- usetitleforautomerge: true
diff --git a/updatecli/values.yaml b/updatecli/values.yaml
deleted file mode 100644
index f4790921..00000000
--- a/updatecli/values.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-github:
- user: "GitHub Actions"
- email: "41898282+github-actions[bot]@users.noreply.github.com"
- username: "github-actions"
- token: "UPDATECLI_GITHUB_TOKEN"
- owner: "jenkinsci"
- repository: "configuration-as-code-plugin"
- branch: "master"
From d77504d9b5a7ca5d60958698a2efd67aa96a3b92 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 20:40:46 +0000
Subject: [PATCH 02/13] Migrate renovate config (#2587)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/renovate.json | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/renovate.json b/.github/renovate.json
index 3c670858..4fbadaf6 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,7 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
- "config:base",
+ "config:recommended",
":semanticCommitsDisabled",
"schedule:earlyMondays"
],
@@ -11,9 +11,13 @@
],
"packageRules": [
{
- "packagePatterns": ["org.jenkins-ci.main:jenkins-war"],
"allowedVersions": "/^[0-9]+\\.[0-9]+\\.[0-9]+$/",
- "registryUrls": ["https://repo.jenkins-ci.org/public/"]
+ "registryUrls": [
+ "https://repo.jenkins-ci.org/public/"
+ ],
+ "matchPackageNames": [
+ "/org.jenkins-ci.main:jenkins-war/"
+ ]
}
],
"customManagers": [
From 00c2c259ee0f6cbcb7d16de677f53bc0d296c6be Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:52:56 +0000
Subject: [PATCH 03/13] Update dependency org.jenkins-ci.main:jenkins-war to
v2.479.1
---
integrations/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integrations/pom.xml b/integrations/pom.xml
index 12a1087f..40ffe8ab 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -13,7 +13,7 @@
true
- 2.462.3
+ 2.479.1
From fbca4790e65c42483d120ae57cf687c61b1e6c95 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Thu, 31 Oct 2024 21:41:09 +0000
Subject: [PATCH 04/13] Update pom.xml
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index ea061376..38ba85d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.jenkins-ci.plugins
plugin
- 4.88
+ 5.2
@@ -39,10 +39,10 @@
999999-SNAPSHOT
jenkinsci/configuration-as-code-plugin
- 2.440.3
+ 2.479.1
configuration-as-code-@{project.version}
true
- 3435.v238d66a_043fb_
+ 3559.vb_5b_81183b_d23
false
From 6f3bcc215996437bc74edaf551997f7e06eaedb5 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Thu, 31 Oct 2024 21:44:22 +0000
Subject: [PATCH 05/13] Update pom.xml
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 38ba85d6..b8d66775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,8 @@
999999-SNAPSHOT
jenkinsci/configuration-as-code-plugin
- 2.479.1
+ 2.479
+ ${jenkins.baseline}.1
configuration-as-code-@{project.version}
true
3559.vb_5b_81183b_d23
From 7a5dd45b32dcf5a521fff767f1bf37de44678e01 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Thu, 31 Oct 2024 21:44:46 +0000
Subject: [PATCH 06/13] Update pom.xml
---
plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin/pom.xml b/plugin/pom.xml
index dfa4cfde..3a7d350e 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -56,7 +56,7 @@
io.jenkins.tools.bom
- bom-2.440.x
+ bom-${jenkins.baseline}.x
${plugin-bom.version}
pom
import
From 9ad668ba33e3e1b10a5070d42da7a69139ca958c Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Thu, 31 Oct 2024 21:45:11 +0000
Subject: [PATCH 07/13] Update pom.xml
---
integrations/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integrations/pom.xml b/integrations/pom.xml
index 40ffe8ab..858853ec 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -20,7 +20,7 @@
io.jenkins.tools.bom
- bom-2.452.x
+ bom-2.479.x
${plugin-bom.version}
pom
import
From fc77cdc1e0d38ef7f369383212ce42c5e42dfd6f Mon Sep 17 00:00:00 2001
From: Tim Jacomb
Date: Thu, 31 Oct 2024 22:02:58 +0000
Subject: [PATCH 08/13] Test harness too
---
test-harness/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-harness/pom.xml b/test-harness/pom.xml
index c2e49917..59863351 100644
--- a/test-harness/pom.xml
+++ b/test-harness/pom.xml
@@ -20,7 +20,7 @@
io.jenkins.tools.bom
- bom-2.440.x
+ bom-${jenkins.baseline}.x
${plugin-bom.version}
pom
import
From f821fe77ba0a376c1f61cd8ab5bcd574d3204982 Mon Sep 17 00:00:00 2001
From: Tim Jacomb
Date: Fri, 1 Nov 2024 09:21:54 +0000
Subject: [PATCH 09/13] Adapt for jakarta
---
.../plugins/casc/TokenReloadAction.java | 8 +++---
.../plugins/casc/MockHttpServletRequest.java | 26 +++++++++----------
.../plugins/casc/MockHttpServletResponse.java | 6 ++---
.../plugins/casc/TokenReloadActionTest.java | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java b/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
index 6cfebab2..88cf249c 100644
--- a/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
@@ -9,9 +9,9 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.interceptor.RequirePOST;
@Extension
@@ -42,7 +42,7 @@ public class TokenReloadAction implements UnprotectedRootAction {
}
@RequirePOST
- public void doIndex(StaplerRequest request, StaplerResponse response) throws IOException {
+ public void doIndex(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
String token = getReloadToken();
if (token == null || token.isEmpty()) {
diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
index 8da148b4..e0c75fe9 100644
--- a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
+++ b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
@@ -7,19 +7,19 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
public class MockHttpServletRequest implements HttpServletRequest {
diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
index 77bcc359..d3cbb5e8 100644
--- a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
+++ b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
@@ -3,9 +3,9 @@ package io.jenkins.plugins.casc;
import java.io.PrintWriter;
import java.util.Collection;
import java.util.Locale;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
public class MockHttpServletResponse implements HttpServletResponse {
diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
index 3558073a..bb9b5eed 100644
--- a/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
+++ b/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.LogRecord;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
From 26038b4163c92033cfa3900deed998a34bf43b14 Mon Sep 17 00:00:00 2001
From: Tim Jacomb
Date: Fri, 1 Nov 2024 16:59:59 +0000
Subject: [PATCH 10/13] spotless:apply
---
.../io/jenkins/plugins/casc/TokenReloadAction.java | 2 +-
.../plugins/casc/MockHttpServletRequest.java | 14 +++++++-------
.../plugins/casc/MockHttpServletResponse.java | 6 +++---
.../plugins/casc/TokenReloadActionTest.java | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java b/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
index 88cf249c..372c367a 100644
--- a/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
@@ -5,11 +5,11 @@ import hudson.Extension;
import hudson.model.UnprotectedRootAction;
import hudson.security.ACL;
import hudson.security.ACLContext;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.logging.Logger;
-import jakarta.servlet.http.HttpServletRequest;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.interceptor.RequirePOST;
diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
index e0c75fe9..d55ab8f1 100644
--- a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
+++ b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
@@ -1,12 +1,5 @@
package io.jenkins.plugins.casc;
-import java.io.BufferedReader;
-import java.security.Principal;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
@@ -20,6 +13,13 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
+import java.io.BufferedReader;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
public class MockHttpServletRequest implements HttpServletRequest {
diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
index d3cbb5e8..c046bec2 100644
--- a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
+++ b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
@@ -1,11 +1,11 @@
package io.jenkins.plugins.casc;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Locale;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Locale;
public class MockHttpServletResponse implements HttpServletResponse {
diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
index bb9b5eed..74d261fa 100644
--- a/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
+++ b/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
@@ -8,6 +8,7 @@ import io.jenkins.plugins.casc.misc.Env;
import io.jenkins.plugins.casc.misc.EnvVarsRule;
import io.jenkins.plugins.casc.misc.Envs;
import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collections;
import java.util.Date;
@@ -16,7 +17,6 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.LogRecord;
-import jakarta.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
From ea4b7cae0c59b74cd31a948e18dd17668788b43d Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Fri, 1 Nov 2024 22:27:17 +0000
Subject: [PATCH 11/13] Update Jenkinsfile
---
Jenkinsfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 29b71df8..a43fbaf4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,5 @@
// Windows controller tests crash with unexpected errors
buildPlugin(useContainerAgent: true, forkCount: '0.5C', timeout: 360, configurations: [
[platform: 'linux', jdk: 21],
- // Windows fails on >11 https://github.com/jenkinsci/configuration-as-code-plugin/pull/2392#issuecomment-1826296308
- [platform: 'windows', jdk: 11],
+ [platform: 'windows', jdk: 17],
])
From 9e47623cb0437e980d55e2b412f45553dc3985f5 Mon Sep 17 00:00:00 2001
From: Tim Jacomb
Date: Fri, 1 Nov 2024 22:34:28 +0000
Subject: [PATCH 12/13] Delete unneeded GitHub action
---
.github/workflows/maven.yml | 40 -------------------------------------
1 file changed, 40 deletions(-)
delete mode 100644 .github/workflows/maven.yml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
deleted file mode 100644
index 6c60acab..00000000
--- a/.github/workflows/maven.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: CI
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-permissions:
- contents: read
-
-jobs:
- build:
- name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }}
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- java: [17]
- os: [ubuntu-latest]
-
- steps:
-
- - uses: actions/checkout@v4
-
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v4
- with:
- java-version: ${{ matrix.java }}
- distribution: 'temurin'
- cache: 'maven'
-
- - name: Build with Maven
- run: mvn -Pjacoco clean verify -B -V --no-transfer-progress ${{ matrix.flags }}
-
- - name: Codecov coverage
- uses: codecov/codecov-action@v4
- with:
- file: '*jacoco.xml'
From a2219d9fcbad21ce442289c22b0c62b3cd7d6a4f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2024 00:57:43 +0000
Subject: [PATCH 13/13] Update dependency io.jenkins.tools.bom:bom-2.479.x to
v3613
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b8d66775..005b4050 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
${jenkins.baseline}.1
configuration-as-code-@{project.version}
true
- 3559.vb_5b_81183b_d23
+ 3613.v584fca_12cf5c
false