Merge branch 'master' into remove-jcifs-and-jinterop

.github/PULL_REQUEST_TEMPLATE.md

@@ -28,23 +28,29 @@ For refactoring and code cleanup changes, exercise the code before and after the
 
 ### Proposed changelog entries
 
-- JENKINS-XXXXX, human-readable text
+- human-readable text
 
 <!-- Comment:
 The changelog entry should be in the imperative mood; e.g., write "do this"/"return that" rather than "does this"/"returns that".
 For examples, see: https://www.jenkins.io/changelog/
 
-Remove JENKINS-XXXXX if there is no issue for the pull request.
+Do not include the Jira issue in the changelog entry.
+Include the Jira issue in the description of the pull request so that the changelog generator can find it and include it in the generated changelog.
 
 You may add multiple changelog entries if applicable by adding a new entry to the list, e.g.
-- JENKINS-123456, First changelog entry
+- First changelog entry
 - Second changelog entry
 -->
 
 ### Proposed upgrade guidelines
 
 N/A
 
+<!-- Comment:
+Leave the proposed upgrade guidelines in the pull request with the "N/A" value if no upgrade guidelines are needed.
+The changelog generator relies on the presence of the upgrade guidelines section as part of its data extraction process.
+-->
+
 ```[tasklist]
 ### Submitter checklist
 - [ ] The Jira issue, if it exists, is well-described.

.github/renovate.json

@@ -1,63 +1,221 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     ":disableDependencyDashboard",
     ":semanticCommitsDisabled"
   ],
-  "enabledManagers": ["npm", "regex"],
-  "postUpdateOptions": ["yarnDedupeHighest"],
+  "prHourlyLimit": 0,
+  "prConcurrentLimit": 0,
+  "postUpdateOptions": [
+    "yarnDedupeHighest"
+  ],
   "packageRules": [
     {
-      "matchDatasources": ["npm"],
-      "addLabels": ["javascript"],
-      "stabilityDays": 3,
-      "reviewers": ["team:sig-ux"]
+      "matchDatasources": [
+        "npm"
+      ],
+      "addLabels": [
+        "javascript"
+      ],
+      "minimumReleaseAge": "3 days",
+      "reviewers": [
+        "team:sig-ux"
+      ]
     },
     {
-      "matchPackageNames": ["node"],
+      "matchPackageNames": [
+        "node"
+      ],
       "allowedVersions": "/20.[0-9]+.[0-9]+(.[0-9]+)?$/"
+    },
+    {
+      "description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned, could be grouped but releases are likely separated by a bit of time",
+      "matchManagers": [
+        "maven"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "org.eclipse.jetty:jetty-maven-plugin",
+        "org.jenkins-ci:winstone"
+      ]
+    },
+    {
+      "description": "Provided by Jetty and should be aligned with the version provided by the version of Jetty we deliver. See: https://github.com/jenkinsci/jenkins/pull/5211",
+      "matchManagers": [
+        "maven"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "jakarta.servlet:jakarta.servlet-api",
+        "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
+      ]
+    },
+    {
+      "description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
+      "matchManagers": [
+        "maven"
+      ],
+      "allowedVersions": "<2.5.0",
+      "matchPackageNames": [
+        "org.codehaus.groovy:groovy-all"
+      ]
+    },
+    {
+      "description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
+      "matchManagers": [
+        "maven"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "org.fusesource.jansi:jansi"
+      ]
+    },
+    {
+      "description": "Depends on commons-lang3 which is in progress for removal from core. See: https://issues.jenkins.io/browse/JENKINS-73355",
+      "matchManagers": [
+        "maven"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "org.apache.commons:commons-compress"
+      ]
+    },
+    {
+      "description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
+      "matchManagers": [
+        "maven"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "org.jfree:jfreechart"
+      ]
+    },
+    {
+      "description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
+      "matchManagers": [
+        "maven"
+      ],
+      "allowedVersions": "<6.0.0",
+      "matchPackageNames": [
+        "org.springframework:spring-framework-bom",
+        "org.springframework.security:spring-security-bom"
+      ]
+    },
+    {
+      "description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
+      "matchManagers": [
+        "maven"
+      ],
+      "allowedVersions": "<7.0.0",
+      "matchPackageNames": [
+        "com.google.inject:guice-bom"
+      ]
+    },
+    {
+      "matchFileNames": [
+        "core/pom.xml",
+        "test/pom.xml",
+        "war/pom.xml"
+      ],
+      "matchPackageNames": [
+        "org.jenkins-ci.main:remoting"
+      ],
+      "description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
+      "enabled": false
+    },
+    {
+      "matchPackageNames": [
+        "net.jcip:jcip-annotations"
+      ],
+      "matchDatasources": [
+        "maven"
+      ],
+      "enabled": false,
+      "description": "maven-metadata.xml is missing for this really old package which is required by renovate"
     }
   ],
-  "regexManagers": [
+  "customManagers": [
     {
-      "fileMatch": ["war/pom.xml"],
-      "matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
+      "customType": "regex",
+      "fileMatch": [
+        "war/pom.xml"
+      ],
+      "matchStrings": [
+        "<node.version>(?<currentValue>.*?)</node.version>"
+      ],
       "depNameTemplate": "node",
       "datasourceTemplate": "npm"
     },
     {
-      "fileMatch": ["ath.sh"],
-      "matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
+      "customType": "regex",
+      "fileMatch": [
+        "ath.sh"
+      ],
+      "matchStrings": [
+        "export ATH_VERSION=(?<currentValue>.*?)\n"
+      ],
       "depNameTemplate": "jenkins/ath",
       "datasourceTemplate": "docker",
       "versioningTemplate": "loose"
     },
     {
-      "fileMatch": [".gitpod/Dockerfile"],
-      "matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
+      "customType": "regex",
+      "fileMatch": [
+        ".gitpod/Dockerfile"
+      ],
+      "matchStrings": [
+        "ARG MAVEN_VERSION=(?<currentValue>.*?)\n"
+      ],
       "depNameTemplate": "org.apache.maven:maven-core",
       "datasourceTemplate": "maven"
     },
     {
-      "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["lit@(?<currentValue>.*?)/"],
+      "customType": "regex",
+      "fileMatch": [
+        "core/src/site/site.xml"
+      ],
+      "matchStrings": [
+        "lit@(?<currentValue>.*?)/"
+      ],
       "depNameTemplate": "lit",
       "datasourceTemplate": "npm"
     },
     {
-      "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["webcomponentsjs@(?<currentValue>.*?)/"],
+      "customType": "regex",
+      "fileMatch": [
+        "core/src/site/site.xml"
+      ],
+      "matchStrings": [
+        "webcomponentsjs@(?<currentValue>.*?)/"
+      ],
       "depNameTemplate": "@webcomponents/webcomponentsjs",
       "datasourceTemplate": "npm"
     },
     {
-      "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["<version>(?<currentValue>.*?)<\/version>"],
+      "customType": "regex",
+      "fileMatch": [
+        "core/src/site/site.xml"
+      ],
+      "matchStrings": [
+        "<version>(?<currentValue>.*?)</version>"
+      ],
       "depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
       "datasourceTemplate": "maven"
     }
   ],
-  "labels": ["dependencies", "skip-changelog"],
-  "rebaseWhen": "conflicted"
+  "labels": [
+    "dependencies",
+    "skip-changelog"
+  ],
+  "rebaseWhen": "conflicted",
+  "ignorePaths": [
+    "**/node_modules/**",
+    "**/bower_components/**",
+    "**/vendor/**",
+    "**/examples/**",
+    "**/__tests__/**",
+    "**/tests/**",
+    "**/__fixtures__/**"
+  ]
 }

.github/workflows/label-conflicting-pr.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/[email protected].0
+        uses: eps1lon/[email protected].2
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"