Skip to content

Commit 4f7cd1b

Browse files
mawinter69mawinter69
committed
Merge branch 'master' into JENKINS-30175
2 parents 9514b6d + 2082381 commit 4f7cd1b

File tree

608 files changed

+9458
-5743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

608 files changed

+9458
-5743
lines changed

‎war/.babelrc ‎.babelrc

File renamed without changes.

‎.github/dependabot.yml

-68
This file was deleted.

‎.github/renovate.json

+170-23
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,210 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base",
4+
"config:recommended",
55
":disableDependencyDashboard",
66
":semanticCommitsDisabled"
77
],
8-
"enabledManagers": ["npm", "regex"],
9-
"postUpdateOptions": ["yarnDedupeHighest"],
8+
"prHourlyLimit": 0,
9+
"prConcurrentLimit": 0,
10+
"postUpdateOptions": [
11+
"yarnDedupeHighest"
12+
],
1013
"packageRules": [
1114
{
12-
"matchDatasources": ["npm"],
13-
"addLabels": ["javascript"],
14-
"stabilityDays": 3,
15-
"reviewers": ["team:sig-ux"]
15+
"matchDatasources": [
16+
"npm"
17+
],
18+
"addLabels": [
19+
"javascript"
20+
],
21+
"minimumReleaseAge": "3 days",
22+
"reviewers": [
23+
"team:sig-ux"
24+
]
1625
},
1726
{
18-
"matchPackageNames": ["node"],
27+
"matchPackageNames": [
28+
"node"
29+
],
1930
"allowedVersions": "/20.[0-9]+.[0-9]+(.[0-9]+)?$/"
31+
},
32+
{
33+
"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",
34+
"matchManagers": [
35+
"maven"
36+
],
37+
"enabled": false,
38+
"matchPackageNames": [
39+
"org.eclipse.jetty.ee9:jetty-ee9-maven-plugin",
40+
"org.jenkins-ci:winstone"
41+
]
42+
},
43+
{
44+
"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",
45+
"matchManagers": [
46+
"maven"
47+
],
48+
"enabled": false,
49+
"matchPackageNames": [
50+
"jakarta.servlet:jakarta.servlet-api",
51+
"jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
52+
]
53+
},
54+
{
55+
"description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
56+
"matchManagers": [
57+
"maven"
58+
],
59+
"allowedVersions": "<2.5.0",
60+
"matchPackageNames": [
61+
"org.codehaus.groovy:groovy-all"
62+
]
63+
},
64+
{
65+
"description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
66+
"matchManagers": [
67+
"maven"
68+
],
69+
"enabled": false,
70+
"matchPackageNames": [
71+
"org.fusesource.jansi:jansi"
72+
]
73+
},
74+
{
75+
"description": "Depends on commons-lang3 which is in progress for removal from core. See: https://issues.jenkins.io/browse/JENKINS-73355",
76+
"matchManagers": [
77+
"maven"
78+
],
79+
"enabled": false,
80+
"matchPackageNames": [
81+
"org.apache.commons:commons-compress"
82+
]
83+
},
84+
{
85+
"description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
86+
"matchManagers": [
87+
"maven"
88+
],
89+
"enabled": false,
90+
"matchPackageNames": [
91+
"org.jfree:jfreechart"
92+
]
93+
},
94+
{
95+
"description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
96+
"matchManagers": [
97+
"maven"
98+
],
99+
"allowedVersions": "<7.0.0",
100+
"matchPackageNames": [
101+
"com.google.inject:guice-bom"
102+
]
103+
},
104+
{
105+
"matchFileNames": [
106+
"core/pom.xml",
107+
"test/pom.xml",
108+
"war/pom.xml"
109+
],
110+
"matchPackageNames": [
111+
"org.jenkins-ci.main:remoting"
112+
],
113+
"description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
114+
"enabled": false
115+
},
116+
{
117+
"matchPackageNames": [
118+
"net.jcip:jcip-annotations"
119+
],
120+
"matchDatasources": [
121+
"maven"
122+
],
123+
"enabled": false,
124+
"description": "maven-metadata.xml is missing for this really old package which is required by renovate"
20125
}
21126
],
22-
"regexManagers": [
127+
"customManagers": [
23128
{
24-
"fileMatch": ["war/pom.xml"],
25-
"matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
129+
"customType": "regex",
130+
"fileMatch": [
131+
"pom.xml"
132+
],
133+
"matchStrings": [
134+
"<node.version>(?<currentValue>.*?)</node.version>"
135+
],
26136
"depNameTemplate": "node",
27137
"datasourceTemplate": "npm"
28138
},
29139
{
30-
"fileMatch": ["ath.sh"],
31-
"matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
140+
"customType": "regex",
141+
"fileMatch": [
142+
"ath.sh"
143+
],
144+
"matchStrings": [
145+
"export ATH_VERSION=(?<currentValue>.*?)\n"
146+
],
32147
"depNameTemplate": "jenkins/ath",
33148
"datasourceTemplate": "docker",
34149
"versioningTemplate": "loose"
35150
},
36151
{
37-
"fileMatch": [".gitpod/Dockerfile"],
38-
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
152+
"customType": "regex",
153+
"fileMatch": [
154+
".gitpod/Dockerfile"
155+
],
156+
"matchStrings": [
157+
"ARG MAVEN_VERSION=(?<currentValue>.*?)\n"
158+
],
39159
"depNameTemplate": "org.apache.maven:maven-core",
40160
"datasourceTemplate": "maven"
41161
},
42162
{
43-
"fileMatch": ["core/src/site/site.xml"],
44-
"matchStrings": ["lit@(?<currentValue>.*?)/"],
163+
"customType": "regex",
164+
"fileMatch": [
165+
"core/src/site/site.xml"
166+
],
167+
"matchStrings": [
168+
"lit@(?<currentValue>.*?)/"
169+
],
45170
"depNameTemplate": "lit",
46171
"datasourceTemplate": "npm"
47172
},
48173
{
49-
"fileMatch": ["core/src/site/site.xml"],
50-
"matchStrings": ["webcomponentsjs@(?<currentValue>.*?)/"],
174+
"customType": "regex",
175+
"fileMatch": [
176+
"core/src/site/site.xml"
177+
],
178+
"matchStrings": [
179+
"webcomponentsjs@(?<currentValue>.*?)/"
180+
],
51181
"depNameTemplate": "@webcomponents/webcomponentsjs",
52182
"datasourceTemplate": "npm"
53183
},
54184
{
55-
"fileMatch": ["core/src/site/site.xml"],
56-
"matchStrings": ["<version>(?<currentValue>.*?)<\/version>"],
185+
"customType": "regex",
186+
"fileMatch": [
187+
"core/src/site/site.xml"
188+
],
189+
"matchStrings": [
190+
"<version>(?<currentValue>.*?)</version>"
191+
],
57192
"depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
58193
"datasourceTemplate": "maven"
59194
}
60195
],
61-
"labels": ["dependencies", "skip-changelog"],
62-
"rebaseWhen": "conflicted"
196+
"labels": [
197+
"dependencies",
198+
"skip-changelog"
199+
],
200+
"rebaseWhen": "conflicted",
201+
"ignorePaths": [
202+
"**/node_modules/**",
203+
"**/bower_components/**",
204+
"**/vendor/**",
205+
"**/examples/**",
206+
"**/__tests__/**",
207+
"**/tests/**",
208+
"**/__fixtures__/**"
209+
]
63210
}

‎.github/workflows/publish-release-artifact.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
7474
- name: Upload Release Asset
7575
id: upload-war
76-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
76+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
7777
env:
7878
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7979
with:
@@ -108,7 +108,7 @@ jobs:
108108
- name: Upload Release Asset
109109
id: upload-deb
110110
if: always()
111-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
111+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
112112
env:
113113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
114114
with:
@@ -144,7 +144,7 @@ jobs:
144144
- name: Upload Release Asset
145145
id: upload-rpm
146146
if: always()
147-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
147+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
148148
env:
149149
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150150
with:
@@ -180,7 +180,7 @@ jobs:
180180
- name: Upload Release Asset
181181
id: upload-msi
182182
if: always()
183-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
183+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
184184
env:
185185
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
186186
with:
@@ -216,7 +216,7 @@ jobs:
216216
- name: Upload Release Asset
217217
id: upload-suse-rpm
218218
if: always()
219-
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
219+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
220220
env:
221221
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
222222
with:

‎.github/workflows/run-since-updater.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Run update-since-todo.py
2+
3+
on:
4+
schedule:
5+
- cron: "0 16 * * THU"
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
since_updater:
14+
runs-on: ubuntu-latest
15+
if: ${{ github.repository_owner == 'jenkinsci' }}
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
- name: Run update-since-todo.py
21+
run: |
22+
body=$(./update-since-todo.py)
23+
24+
{
25+
echo 'PROGRESS<<EOF'
26+
echo "${body}"
27+
echo 'EOF'
28+
} >> $GITHUB_OUTPUT
29+
id: run_script
30+
shell: bash
31+
- name: Create Pull Request
32+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
33+
with:
34+
token: ${{ secrets.GITHUB_TOKEN }}
35+
commit-message: Fill in since annotations
36+
title: Fill in since annotations
37+
body: ${{ steps.run_script.outputs.PROGRESS }}
38+
base: master
39+
labels: skip-changelog
40+
branch: actions/update-since-todo
41+
delete-branch: true

0 commit comments

Comments
 (0)