Skip to content

Commit bdc0681

Browse files
authored
Merge branch 'master' into fix-builds-over-threshold
2 parents 671a763 + 69c3586 commit bdc0681

22 files changed

+187
-100
lines changed

.github/renovate.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@
7575
"datasourceTemplate": "docker",
7676
"versioningTemplate": "loose"
7777
},
78-
{
79-
"customType": "regex",
80-
"managerFilePatterns": ["/.gitpod/Dockerfile/"],
81-
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
82-
"depNameTemplate": "org.apache.maven:maven-core",
83-
"datasourceTemplate": "maven"
84-
},
8578
{
8679
"customType": "regex",
8780
"managerFilePatterns": ["/core/src/site/site.xml/"],

.github/workflows/announce-lts-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
discourse-author-username: jenkins-release-bot
1818
discourse-category: 23
1919
- name: Post on mailing list
20-
uses: dawidd6/action-send-mail@6d98ae34d733f9a723a9e04e94f2f24ba05e1402 # v6
20+
uses: dawidd6/action-send-mail@6e71c855c9a091d80a519621b9fd3e8d252ca40c # v7
2121
with:
2222
server_address: smtp.gmail.com
2323
server_port: 465

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e #v 5.0.0
21+
uses: actions/setup-java@5d7b2146334bacf88728daaa70414a99f5164e0f #v 5.0.0
2222
with:
2323
distribution: "temurin"
2424
java-version: 21

.gitpod.yml

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

.gitpod/Dockerfile

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

CONTRIBUTING.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ Open another terminal and start a [webpack](https://webpack.js.org/) dev server,
8383
yarn start
8484
```
8585

86-
### Gitpod
87-
88-
You can open this project as a [Gitpod workspace](https://www.gitpod.io/) which comes pre-configured with all the tools you will need.
89-
You can use IntelliJ IDEA (preferred) or VS Code (alternate) in the browser.
90-
91-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/jenkinsci/jenkins)
92-
93-
If you prefer using IntelliJ IDEA, you can setup Gitpod integration with JetBrains Gateway using the instructions on [gitpod.io](https://www.gitpod.io/docs/ides-and-editors/intellij),
94-
which will open the workspace in IntelliJ IDEA using JetBrains Gateway.
95-
9686
### Linting
9787

9888
For linting we use a number of tools:

ath.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -o xtrace
66
cd "$(dirname "$0")"
77

88
# https://github.com/jenkinsci/acceptance-test-harness/releases
9-
export ATH_VERSION=6483.vecb_7d34edb_75
9+
export ATH_VERSION=6507.vef7dc6b_6f5c4
1010

1111
if [[ $# -eq 0 ]]; then
1212
export JDK=21

core/src/main/java/hudson/PluginWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public void setOptionalDependents(@NonNull Set<String> optionalDependents) {
253253
*/
254254
@Deprecated
255255
public void setOptionalDependants(@NonNull Set<String> optionalDependents) {
256-
setOptionalDependents(dependents);
256+
setOptionalDependents(optionalDependents);
257257
}
258258

259259
/**

core/src/main/java/hudson/model/StreamBuildListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public StreamBuildListener(File out, Charset charset) throws IOException {
4848
}
4949

5050
/**
51-
* @deprecated as of TODO
51+
* @deprecated as of 2.329
5252
* The caller should use {@link #StreamBuildListener(OutputStream, Charset)} to pass in
5353
* the charset and output stream separately, so that this class can handle encoding correctly.
5454
*/

0 commit comments

Comments
 (0)