Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update antlr.version to v4.13.2 (master) - abandoned #26

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions .github/dependabot.yml

This file was deleted.

121 changes: 115 additions & 6 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,172 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"config:recommended",
":disableDependencyDashboard",
":semanticCommitsDisabled"
],
"enabledManagers": ["npm", "regex"],
"prHourlyLimit": 0,
"postUpdateOptions": ["yarnDedupeHighest"],
"baseBranches": ["master", "stable-2.462"],
"packageRules": [
{
"matchBaseBranches": ["/stable-.+/"],
"matchManagers": ["maven"],
"labels": ["dependencies", "into-lts", "needs-justification"]
},
{
"matchBaseBranches": ["/stable-.+/"],
"matchManagers": ["custom.regex", "npm", "github-actions"],
"enabled": false
},
{
"matchDatasources": ["npm"],
"matchBaseBranches": ["master"],
"addLabels": ["javascript"],
"stabilityDays": 3,
"minimumReleaseAge": "3 days",
"reviewers": ["team:sig-ux"]
},
{
"matchPackageNames": ["node"],
"matchBaseBranches": ["master"],
"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"],
"matchBaseBranches": ["master", "/stable-.+/"],
"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"],
"matchBaseBranches": ["master", "/stable-.+/"],
"enabled": false,
"matchPackageNames": ["/jakarta.servlet:jakarta.servlet-api/"]
},
{
"description": "Contains incompatible API changes and needs compatibility work",
"matchManagers": ["maven"],
"matchBaseBranches": ["master", "/stable-.+/"],
"enabled": false,
"matchPackageNames": [
"/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"],
"matchBaseBranches": ["master", "/stable-.+/"],
"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"],
"matchBaseBranches": ["master", "/stable-.+/"],
"enabled": false,
"matchPackageNames": ["/org.fusesource.jansi:jansi/"]
},
{
"description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
"matchManagers": ["maven"],
"matchBaseBranches": ["master", "/stable-.+/"],
"enabled": false,
"matchPackageNames": ["/org.jfree:jfreechart/"]
},
{
"description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
"matchManagers": ["maven"],
"matchBaseBranches": ["master", "/stable-.+/"],
"allowedVersions": "<6.0.0",
"matchPackageNames": ["/org.springframework/"]
},
{
"description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
"matchManagers": ["maven"],
"matchBaseBranches": ["master", "/stable-.+/"],
"allowedVersions": "<7.0.0",
"matchPackageNames": ["/com.google.inject:guice-bom/"]
},
{
"matchFileNames": ["test/pom.xml", "core/pom.xml", "war/pom.xml"],
"matchBaseBranches": ["master", "/stable-.+/"],
"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"],
"matchBaseBranches": ["master", "/stable-.+/"],
"matchDatasources": ["maven"],
"enabled": false,
"description": "maven-metadata.xml is missing for this really old package which is required by renovate"
},
{
"matchPackageNames": ["org.maven.ide.eclipse:lifecycle-mapping"],
"matchBaseBranches": ["master", "/stable-.+/"],
"matchDatasources": ["maven"],
"enabled": false,
"description": "see https://github.com/jenkinsci/jenkins/pull/9522"
}
],
"regexManagers": [
"customManagers": [
{
"customType": "regex",
"fileMatch": ["war/pom.xml"],
"matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
"depNameTemplate": "node",
"datasourceTemplate": "npm"
},
{
"customType": "regex",
"fileMatch": ["ath.sh"],
"matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
"depNameTemplate": "jenkins/ath",
"datasourceTemplate": "docker",
"versioningTemplate": "loose"
},
{
"customType": "regex",
"fileMatch": [".gitpod/Dockerfile"],
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
"depNameTemplate": "org.apache.maven:maven-core",
"datasourceTemplate": "maven"
},
{
"customType": "regex",
"fileMatch": ["core/src/site/site.xml"],
"matchStrings": ["lit@(?<currentValue>.*?)/"],
"depNameTemplate": "lit",
"datasourceTemplate": "npm"
},
{
"customType": "regex",
"fileMatch": ["core/src/site/site.xml"],
"matchStrings": ["webcomponentsjs@(?<currentValue>.*?)/"],
"depNameTemplate": "@webcomponents/webcomponentsjs",
"datasourceTemplate": "npm"
},
{
"customType": "regex",
"fileMatch": ["core/src/site/site.xml"],
"matchStrings": ["<version>(?<currentValue>.*?)<\/version>"],
"matchStrings": ["<version>(?<currentValue>.*?)</version>"],
"depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
"datasourceTemplate": "maven"
}
],
"labels": ["dependencies", "skip-changelog"],
"rebaseWhen": "conflicted"
"rebaseWhen": "conflicted",
"ignorePaths": [
"**/node_modules/**",
"**/bower_components/**",
"**/vendor/**",
"**/examples/**",
"**/__tests__/**",
"**/tests/**",
"**/__fixtures__/**"
]
}
2 changes: 2 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ THE SOFTWARE.

<properties>
<xmlunit.version>2.10.0</xmlunit.version>
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
<!-- Filled in by jacoco-maven-plugin -->
<jacocoSurefireArgs />
</properties>
Expand Down
6 changes: 2 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,13 @@ THE SOFTWARE.
<changelog.url>https://www.jenkins.io/changelog</changelog.url>

<!-- Bundled Remoting version -->
<remoting.version>3256.v88a_f6e922152</remoting.version>
<!-- Minimum Remoting version, which is tested for API compatibility -->
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
<remoting.version>3248.v65ecb_254c298</remoting.version>

<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Medium</spotbugs.threshold>

<access-modifier.version>1.33</access-modifier.version>
<antlr.version>4.13.1</antlr.version>
<antlr.version>4.13.2</antlr.version>
<bridge-method-injector.version>1.29</bridge-method-injector.version>
<spotless.check.skip>false</spotless.check.skip>
<!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
Expand Down
4 changes: 3 additions & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ THE SOFTWARE.

<properties>
<mavenDebug>false</mavenDebug>
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
<!-- Filled in by jacoco-maven-plugin -->
<jacocoSurefireArgs />
<!--
Expand Down Expand Up @@ -350,7 +352,7 @@ THE SOFTWARE.
<artifactItem>
<groupId>io.jenkins.plugins</groupId>
<artifactId>bootstrap5-api</artifactId>
<version>5.3.3-1</version>
<version>5.3.2-4</version>
<type>hpi</type>
<outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
<destFileName>bootstrap5-api.jpi</destFileName>
Expand Down
10 changes: 6 additions & 4 deletions war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ THE SOFTWARE.
<!-- HTTP listener port -->
<port>8080</port>
<mina-sshd-api.version>2.13.1-117.v2f1a_b_66ff91d</mina-sshd-api.version>
<node.version>20.15.1</node.version>
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
<node.version>20.16.0</node.version>
<!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
<yarn.version>1.22.19</yarn.version>
<!-- maven-antrun-plugin will download this Yarn version. -->
Expand Down Expand Up @@ -298,14 +300,14 @@ THE SOFTWARE.
<!-- detached after 1.577 -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1265.v65b_14fa_f12f0</version>
<version>1280.v310a_78b_9a_1e0</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<!-- dependency of junit, plugin-util-api, and workflow-support -->
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<version>1316.v33eb_726c50b_a_</version>
<version>1322.v857eeeea_9902</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
Expand Down Expand Up @@ -402,7 +404,7 @@ THE SOFTWARE.
<!-- dependency of workflow-api and workflow-support -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>690.vfc8b_54395023</version>
<version>696.v778d637b_a_762</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
Expand Down