Skip to content

Commit 80e5c10

Browse files
authored
Merge branch 'master' into JENKINS-35272-afterDisconnect-once
2 parents 062beb8 + a7d3225 commit 80e5c10

Some content is hidden

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

46 files changed

+874
-716
lines changed

.github/renovate.json

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["config:recommended", ":semanticCommitsDisabled"],
3+
"extends": ["github>jenkinsci/renovate-config", "schedule:daily"],
44
"prHourlyLimit": 0,
55
"prConcurrentLimit": 0,
6-
"postUpdateOptions": ["yarnDedupeHighest"],
76
"packageRules": [
8-
{
9-
"matchDatasources": ["npm"],
10-
"addLabels": ["javascript"],
11-
"minimumReleaseAge": "3 days",
12-
"reviewers": ["team:sig-ux"]
13-
},
147
{
158
"description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned",
169
"matchManagers": ["maven"],
@@ -82,13 +75,6 @@
8275
"datasourceTemplate": "docker",
8376
"versioningTemplate": "loose"
8477
},
85-
{
86-
"customType": "regex",
87-
"managerFilePatterns": ["/.gitpod/Dockerfile/"],
88-
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
89-
"depNameTemplate": "org.apache.maven:maven-core",
90-
"datasourceTemplate": "maven"
91-
},
9278
{
9379
"customType": "regex",
9480
"managerFilePatterns": ["/core/src/site/site.xml/"],
@@ -111,15 +97,5 @@
11197
"datasourceTemplate": "maven"
11298
}
11399
],
114-
"labels": ["dependencies", "skip-changelog"],
115-
"rebaseWhen": "conflicted",
116-
"ignorePaths": [
117-
"**/node_modules/**",
118-
"**/bower_components/**",
119-
"**/vendor/**",
120-
"**/examples/**",
121-
"**/__tests__/**",
122-
"**/tests/**",
123-
"**/__fixtures__/**"
124-
]
100+
"labels": ["dependencies", "skip-changelog"]
125101
}

.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: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ This page provides information about contributing code to the Jenkins core codeb
99
1. Fork the repository on GitHub
1010
2. Clone the forked repository to your machine
1111
3. Install the necessary development tools. In order to develop Jenkins, you need the following:
12-
- Java Development Kit (JDK) 17 or 21.
13-
In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.java.net/), but you can use other JDKs as well.
12+
- Java Development Kit (JDK) 21 or 25.
13+
In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.org/), but you can use other JDKs as well.
1414
- Apache Maven 3.9.6 or above. You can [download Maven here](https://maven.apache.org/download.cgi).
1515
In the Jenkins project we usually use the most recent Maven release.
1616
- Any IDE which supports importing Maven projects.
@@ -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=6512.v7b_8c43086a_6f
1010

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

bom/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ THE SOFTWARE.
4141
<commons-fileupload2.version>2.0.0-M4</commons-fileupload2.version>
4242
<groovy.version>2.4.21</groovy.version>
4343
<jelly.version>1.1-jenkins-20250731</jelly.version>
44-
<stapler.version>2061.v3949245133a_f</stapler.version>
44+
<stapler.version>2065.v7db_c1fcf0a_d0</stapler.version>
4545
</properties>
4646

4747
<dependencyManagement>
@@ -215,7 +215,7 @@ THE SOFTWARE.
215215
<dependency>
216216
<groupId>org.jenkins-ci</groupId>
217217
<artifactId>annotation-indexer</artifactId>
218-
<version>1.18</version>
218+
<version>1.213.v92788b_1f0a_21</version>
219219
</dependency>
220220
<dependency>
221221
<groupId>org.jenkins-ci</groupId>
@@ -250,17 +250,17 @@ THE SOFTWARE.
250250
<dependency>
251251
<groupId>org.jenkins-ci</groupId>
252252
<artifactId>symbol-annotation</artifactId>
253-
<version>1.25</version>
253+
<version>1.26</version>
254254
</dependency>
255255
<dependency>
256256
<groupId>org.jenkins-ci</groupId>
257257
<artifactId>task-reactor</artifactId>
258-
<version>1.9</version>
258+
<version>1.10</version>
259259
</dependency>
260260
<dependency>
261261
<groupId>org.jenkins-ci</groupId>
262262
<artifactId>version-number</artifactId>
263-
<version>1.12</version>
263+
<version>1.14</version>
264264
</dependency>
265265
<dependency>
266266
<groupId>org.jenkins-ci.main</groupId>

core/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ THE SOFTWARE.
4040

4141
<properties>
4242
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
43-
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
43+
<remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
4444
<!-- Filled in by jacoco-maven-plugin -->
4545
<jacocoSurefireArgs />
4646
</properties>
@@ -419,7 +419,7 @@ THE SOFTWARE.
419419
<!-- working around MCOMPILER-97 -->
420420
<groupId>org.jenkins-ci</groupId>
421421
<artifactId>core-annotation-processors</artifactId>
422-
<version>13.v2dcfc22a_a_b_29</version>
422+
<version>59.ve181f58722c6</version>
423423
<scope>provided</scope>
424424
<optional>true</optional>
425425
</dependency>
@@ -651,7 +651,7 @@ THE SOFTWARE.
651651
<!-- Version specified in grandparent POM -->
652652
<configuration>
653653
<!-- Make sure to keep the directives in test/pom.xml and war/pom.xml in sync with these. -->
654-
<argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:${org.mockito:mockito-core:jar}</argLine>
654+
<argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:"${org.mockito:mockito-core:jar}"</argLine>
655655
<reuseForks>false</reuseForks>
656656
</configuration>
657657
</plugin>

0 commit comments

Comments
 (0)