Skip to content

Commit 555861c

Browse files
alecharpalecharp
authored
Merge branch 'master' into chore/java-25-support
2 parents 03edd33 + 8e3e742 commit 555861c

File tree

16 files changed

+128
-100
lines changed

16 files changed

+128
-100
lines changed

‎.github/renovate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
],
107107
"enabled": false,
108108
"description": "maven-metadata.xml is missing for this really old package which is required by renovate"
109-
},
109+
}
110110
],
111111
"customManagers": [
112112
{

‎.github/workflows/changelog.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# used by Oleg N in open graph generator experiment for now
3232
- name: Generate YAML changelog draft
3333
id: jenkins-core-changelog-generator
34-
uses: jenkinsci/jenkins-core-changelog-generator@master
34+
uses: jenkinsci/core-changelog-generator@feb124ed2262f8586ac4561348436afb965812e1 # v2.2.2
3535
env:
3636
GITHUB_AUTH: github-actions:${{ secrets.GITHUB_TOKEN }}
3737
- name: Upload Changelog YAML
@@ -52,7 +52,7 @@ jobs:
5252
owner: jenkins-infra
5353
repositories: jenkins.io
5454
- name: Check out
55-
uses: actions/checkout@v5
55+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5656
with:
5757
fetch-depth: 0
5858
- name: Publish jenkins.io changelog draft

‎.github/workflows/label-lts-prs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: Check if PR targets LTS branch
1313
if: startsWith(github.event.pull_request.base.ref, 'stable-')
14-
uses: actions/github-script@v8
14+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
1515
with:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}
1717
script: |

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
is-lts: ${{ steps.set-version.outputs.is-lts }}
1717
is-rc: ${{ steps.set-version.outputs.is-rc }}
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v5
21+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v 5.0.0
2222
with:
2323
distribution: "temurin"
2424
java-version: 21
@@ -74,7 +74,7 @@ jobs:
7474
wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
7575
- name: Upload Release Asset
7676
id: upload-war
77-
uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
77+
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
7878
env:
7979
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8080
with:
@@ -109,7 +109,7 @@ jobs:
109109
- name: Upload Release Asset
110110
id: upload-deb
111111
if: always()
112-
uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
112+
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
113113
env:
114114
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115115
with:
@@ -145,7 +145,7 @@ jobs:
145145
- name: Upload Release Asset
146146
id: upload-rpm
147147
if: always()
148-
uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
148+
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
149149
env:
150150
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151151
with:
@@ -181,7 +181,7 @@ jobs:
181181
- name: Upload Release Asset
182182
id: upload-msi
183183
if: always()
184-
uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
184+
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
185185
env:
186186
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
187187
with:
@@ -217,7 +217,7 @@ jobs:
217217
- name: Upload Release Asset
218218
id: upload-suse-rpm
219219
if: always()
220-
uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
220+
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
221221
env:
222222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
223223
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: ${{ github.repository_owner == 'jenkinsci' }}
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
1919
fetch-depth: 0
2020
- name: Run update-since-todo.py

‎Jenkinsfile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ stage('Record build') {
2929
/*
3030
* TODO Add the commits of the transitive closure of the Jenkins WAR under test to this build.
3131
*/
32-
sh 'launchable verify && launchable record build --name ${BUILD_TAG} --source jenkinsci/jenkins=.'
32+
// Replace URL encoded characters with '-' because Launchable rejects '%2F' in build name
33+
def launchableName = env.BUILD_TAG.replaceAll('(%[0-9A-Fa-f]{2})+', '-')
34+
sh "launchable verify && launchable record build --name ${launchableName} --source jenkinsci/jenkins=."
3335
axes.values().combinations {
3436
def (platform, jdk) = it
3537
if (platform == 'windows' && jdk != 17) {
3638
return // unnecessary use of hardware
3739
}
3840
def sessionFile = "launchable-session-${platform}-jdk${jdk}.txt"
39-
sh "launchable record session --build ${env.BUILD_TAG} --flavor platform=${platform} --flavor jdk=${jdk} >${sessionFile}"
41+
sh "launchable record session --build ${launchableName} --flavor platform=${platform} --flavor jdk=${jdk} >${sessionFile}"
4042
stash name: sessionFile, includes: sessionFile
4143
}
4244
}
@@ -67,7 +69,13 @@ axes.values().combinations {
6769
if (platform == 'windows') {
6870
agentContainerLabel += '-windows'
6971
}
72+
int retryCount = 0
7073
retry(conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()], count: 2) {
74+
if (retryCount == 1 && platform == 'windows' ) {
75+
agentContainerLabel = agentContainerLabel + '-nonspot'
76+
}
77+
// Increment before allocating the node in case it fails
78+
retryCount++
7179
node(agentContainerLabel) {
7280
// First stage is actually checking out the source. Since we're using Multibranch
7381
// currently, we can use "checkout scm".

‎bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
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>2036.v69a_e0454da_b_9</stapler.version>
44+
<stapler.version>2044.v10eea_06701ef</stapler.version>
4545
</properties>
4646

4747
<dependencyManagement>

‎core/src/main/resources/hudson/Messages_de.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ PluginWrapper.PluginWrapperAdministrativeMonitor.DisplayName=Plugin-Ladefehler
6767

6868
ProxyConfiguration.FailedToConnectViaProxy=Konnte nicht mit {0} verbinden.
6969
ProxyConfiguration.FailedToConnect=Konnte nicht mit {0} verbinden (code {1}).
70+
ProxyConfiguration.NonTLSWarning=Jenkins unterstützt nur die Verwendung einer HTTP-Verbindung zum Proxy. Die Zugangsdaten könnten für andere im selben Netzwerk sichtbar sein.
7071
ProxyConfiguration.MalformedTestUrl=Format der Test-URL ungültig
7172
ProxyConfiguration.Success=Erfolg (code {0})
7273
ProxyConfiguration.TestUrlRequired=Test-URL muss angegeben werden.

‎core/src/main/resources/hudson/ProxyConfiguration/config.groovy‎

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

‎core/src/main/resources/hudson/ProxyConfiguration/config.jelly‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<!--
2+
The MIT License
3+
Copyright (c) 2025, Stefan Spieker
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is
9+
furnished to do so, subject to the following conditions:
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
16+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
17+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
18+
THE SOFTWARE.
19+
-->
20+
21+
<?jelly escape-by-default='true'?>
22+
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
23+
<j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
24+
<f:entry title="${%Server}">
25+
<f:textbox field="name"/>
26+
</f:entry>
27+
<f:entry title="${%Port}">
28+
<f:number field="port" min="0" max="65535" step="1"/>
29+
</f:entry>
30+
<f:entry title="${%User name}">
31+
<f:textbox field="userName"/>
32+
</f:entry>
33+
<f:entry title="${%Password}">
34+
<f:password field="secretPassword"/>
35+
</f:entry>
36+
<f:entry title="${%No Proxy Host}">
37+
<f:textarea field="noProxyHost"/>
38+
</f:entry>
39+
40+
<l:isAdmin>
41+
<f:advanced>
42+
<f:entry title="${%Test URL}">
43+
<f:textbox field="testUrl"/>
44+
</f:entry>
45+
<f:validateButton title="${%Validate Proxy}" method="validateProxy" with="testUrl,name,port,userName,secretPassword,noProxyHost"/>
46+
</f:advanced>
47+
</l:isAdmin>
48+
</j:jelly>

0 commit comments

Comments
 (0)