Skip to content

Commit 86a3e2b

Browse files
daniel-beckdaniel-beck
authored
Merge branch 'master' into deprecate-inline-handlers
2 parents 78fdc39 + c1a1197 commit 86a3e2b

File tree

3,756 files changed

+86097
-147316
lines changed

Some content is hidden

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

3,756 files changed

+86097
-147316
lines changed

war/.babelrc renamed to .babelrc

File renamed without changes.

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
root = true
22

3-
[*.{js, scss, css, hbs}]
3+
[*.{js, scss, css, hbs, svg}]
44
indent_style = space
55
indent_size = 2
66
trim_trailing_whitespace = true

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939

4040
# Yarn
4141
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
42-
/war/.yarn/plugins/** binary
42+
/.yarn/plugins/** binary

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,62 @@ For refactoring and code cleanup changes, exercise the code before and after the
2828

2929
### Proposed changelog entries
3030

31-
- Entry 1: Issue, human-readable text
32-
- […]
31+
- human-readable text
3332

3433
<!-- Comment:
3534
The changelog entry should be in the imperative mood; e.g., write "do this"/"return that" rather than "does this"/"returns that".
3635
For examples, see: https://www.jenkins.io/changelog/
36+
37+
Do not include the Jira issue in the changelog entry.
38+
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.
39+
40+
You may add multiple changelog entries if applicable by adding a new entry to the list, e.g.
41+
- First changelog entry
42+
- Second changelog entry
43+
-->
44+
45+
### Proposed changelog category
46+
47+
/label <update-this-with-category>
48+
49+
<!--
50+
The changelog entry needs to have a category which is selected based on the label.
51+
If there's no changelog then the label should be `skip-changelog`.
52+
53+
The available categories are:
54+
* bug - Minor bug. Will be listed after features
55+
* developer - Changes which impact plugin developers
56+
* dependencies - Pull requests that update a dependency
57+
* internal - Internal only change, not user facing
58+
* into-lts - Changes that are backported to the LTS baseline
59+
* localization - Updates localization files
60+
* major-bug - Major bug. Will be highlighted on the top of the changelog
61+
* major-rfe - Major enhancement. Will be highlighted on the top
62+
* rfe - Minor enhancement
63+
* regression-fix - Fixes a regression in one of the previous Jenkins releases
64+
* removed - Removes a feature or a public API
65+
* skip-changelog - Should not be shown in the changelog
66+
67+
Non-changelog categories:
68+
* web-ui - Changes in the web UI
69+
70+
Non-changelog categories require a changelog category but should be used if applicable,
71+
comma separate to provide multiple categories in the label command.
3772
-->
3873

3974
### Proposed upgrade guidelines
4075

4176
N/A
4277

78+
<!-- Comment:
79+
Leave the proposed upgrade guidelines in the pull request with the "N/A" value if no upgrade guidelines are needed.
80+
The changelog generator relies on the presence of the upgrade guidelines section as part of its data extraction process.
81+
-->
82+
4383
### Submitter checklist
4484

4585
- [ ] The Jira issue, if it exists, is well-described.
46-
- [ ] The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see [examples](https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml)).
47-
- Fill in the **Proposed upgrade guidelines** section only if there are breaking changes or changes that may require extra steps from users during upgrade.
86+
- [ ] The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see [examples](https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml)). Fill in the **Proposed upgrade guidelines** section only if there are breaking changes or changes that may require extra steps from users during upgrade.
4887
- [ ] There is automated testing or an explanation as to why this change has no tests.
4988
- [ ] New public classes, fields, and methods are annotated with `@Restricted` or have `@since TODO` Javadocs, as appropriate.
5089
- [ ] New deprecations are annotated with `@Deprecated(since = "TODO")` or `@Deprecated(forRemoval = true, since = "TODO")`, if applicable.
@@ -60,10 +99,10 @@ N/A
6099
If you need an accelerated review process by the community (e.g., for critical bugs), mention @jenkinsci/core-pr-reviewers.
61100
-->
62101

63-
### Maintainer checklist
64-
65102
Before the changes are marked as `ready-for-merge`:
66103

104+
### Maintainer checklist
105+
67106
- [ ] There are at least two (2) approvals for the pull request and no outstanding requests for change.
68107
- [ ] Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
69108
- [ ] Changelog entries in the pull request title and/or **Proposed changelog entries** are accurate, human-readable, and in the imperative mood.

‎.github/dependabot.yml‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎.github/release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tag-template: jenkins-$NEXT_MINOR_VERSION
77

88
template: |
99
_This is an automatically generated changelog draft for Jenkins weekly releases.
10-
See https://www.jenkins.io/changelog/ for the official changelogs._
10+
See https://www.jenkins.io/changelog/$NEXT_MINOR_VERSION/ for the official changelog for this release._
1111
1212
$CHANGES
1313

‎.github/renovate.json‎

Lines changed: 178 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,204 @@
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+
]
25+
},
26+
{
27+
"description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned",
28+
"matchManagers": [
29+
"maven"
30+
],
31+
"groupName": "Winstone and Jetty",
32+
"matchPackageNames": [
33+
"org.eclipse.jetty.ee9:jetty-ee9-maven-plugin",
34+
"org.jenkins-ci:winstone"
35+
]
36+
},
37+
{
38+
"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",
39+
"matchManagers": [
40+
"maven"
41+
],
42+
"enabled": false,
43+
"matchPackageNames": [
44+
"jakarta.servlet:jakarta.servlet-api",
45+
"jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
46+
]
47+
},
48+
{
49+
"description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
50+
"matchManagers": [
51+
"maven"
52+
],
53+
"allowedVersions": "<2.5.0",
54+
"matchPackageNames": [
55+
"org.codehaus.groovy:groovy-all"
56+
]
57+
},
58+
{
59+
"description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
60+
"matchManagers": [
61+
"maven"
62+
],
63+
"enabled": false,
64+
"matchPackageNames": [
65+
"org.fusesource.jansi:jansi"
66+
]
67+
},
68+
{
69+
"description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
70+
"matchManagers": [
71+
"maven"
72+
],
73+
"enabled": false,
74+
"matchPackageNames": [
75+
"org.jfree:jfreechart"
76+
]
77+
},
78+
{
79+
"description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
80+
"matchManagers": [
81+
"maven"
82+
],
83+
"allowedVersions": "<7.0.0",
84+
"matchPackageNames": [
85+
"com.google.inject:guice-bom"
86+
]
87+
},
88+
{
89+
"matchFileNames": [
90+
"core/pom.xml",
91+
"test/pom.xml",
92+
"war/pom.xml"
93+
],
94+
"matchPackageNames": [
95+
"org.jenkins-ci.main:remoting"
96+
],
97+
"description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
98+
"enabled": false
99+
},
100+
{
101+
"matchPackageNames": [
102+
"net.jcip:jcip-annotations"
103+
],
104+
"matchDatasources": [
105+
"maven"
106+
],
107+
"enabled": false,
108+
"description": "maven-metadata.xml is missing for this really old package which is required by renovate"
16109
},
17110
{
18-
"matchPackageNames": ["node"],
19-
"allowedVersions": "/18.[0-9]+.[0-9]+(.[0-9]+)?$/"
111+
"description": "Jackson 2.19.0 causes issues with Kubernetes client. See https://github.com/jenkinsci/bom/pull/5114",
112+
"matchManagers": [
113+
"maven"
114+
],
115+
"allowedVersions": "<2.19.0",
116+
"matchPackageNames": [
117+
"org.jenkins-ci.plugins:jackson2-api"
118+
]
20119
}
21120
],
22-
"regexManagers": [
121+
"customManagers": [
23122
{
24-
"fileMatch": ["war/pom.xml"],
25-
"matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
123+
"customType": "regex",
124+
"fileMatch": [
125+
"pom.xml"
126+
],
127+
"matchStrings": [
128+
"<node.version>(?<currentValue>.*?)</node.version>"
129+
],
26130
"depNameTemplate": "node",
27-
"datasourceTemplate": "npm"
131+
"datasourceTemplate": "node-version"
28132
},
29133
{
30-
"fileMatch": ["ath.sh"],
31-
"matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
134+
"customType": "regex",
135+
"fileMatch": [
136+
"ath.sh"
137+
],
138+
"matchStrings": [
139+
"export ATH_VERSION=(?<currentValue>.*?)\n"
140+
],
32141
"depNameTemplate": "jenkins/ath",
33142
"datasourceTemplate": "docker",
34143
"versioningTemplate": "loose"
35144
},
36145
{
37-
"fileMatch": [".gitpod/Dockerfile"],
38-
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
146+
"customType": "regex",
147+
"fileMatch": [
148+
".gitpod/Dockerfile"
149+
],
150+
"matchStrings": [
151+
"ARG MAVEN_VERSION=(?<currentValue>.*?)\n"
152+
],
39153
"depNameTemplate": "org.apache.maven:maven-core",
40154
"datasourceTemplate": "maven"
155+
},
156+
{
157+
"customType": "regex",
158+
"fileMatch": [
159+
"core/src/site/site.xml"
160+
],
161+
"matchStrings": [
162+
"lit@(?<currentValue>.*?)/"
163+
],
164+
"depNameTemplate": "lit",
165+
"datasourceTemplate": "npm"
166+
},
167+
{
168+
"customType": "regex",
169+
"fileMatch": [
170+
"core/src/site/site.xml"
171+
],
172+
"matchStrings": [
173+
"webcomponentsjs@(?<currentValue>.*?)/"
174+
],
175+
"depNameTemplate": "@webcomponents/webcomponentsjs",
176+
"datasourceTemplate": "npm"
177+
},
178+
{
179+
"customType": "regex",
180+
"fileMatch": [
181+
"core/src/site/site.xml"
182+
],
183+
"matchStrings": [
184+
"<version>(?<currentValue>.*?)</version>"
185+
],
186+
"depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
187+
"datasourceTemplate": "maven"
41188
}
42189
],
43-
"labels": ["dependencies", "skip-changelog"],
44-
"rebaseWhen": "conflicted"
190+
"labels": [
191+
"dependencies",
192+
"skip-changelog"
193+
],
194+
"rebaseWhen": "conflicted",
195+
"ignorePaths": [
196+
"**/node_modules/**",
197+
"**/bower_components/**",
198+
"**/vendor/**",
199+
"**/examples/**",
200+
"**/__tests__/**",
201+
"**/tests/**",
202+
"**/__fixtures__/**"
203+
]
45204
}

0 commit comments

Comments
 (0)