Skip to content

Commit 740221b

Browse files
mawinter69mawinter69
committed
Merge branch 'master' into enable-top-button-for-heterolist
2 parents 8ffba9b + f836cdc commit 740221b

File tree

234 files changed

+5826
-4631
lines changed

Some content is hidden

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

234 files changed

+5826
-4631
lines changed

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

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

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

Lines changed: 5 additions & 5 deletions
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@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
76+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
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@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
111+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
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@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
147+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
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@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
183+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
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@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
219+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
220220
env:
221221
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
222222
with:

‎.github/workflows/require-changelog-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
issues: write
1212
pull-requests: write
1313
steps:
14-
- uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5
14+
- uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5
1515
with:
1616
mode: minimum
1717
count: 1

‎.gitpod/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM gitpod/workspace-full:latest
22
ARG JAVA_VERSION=21.0.6-tem
3-
ARG MAVEN_VERSION=3.9.10
3+
ARG MAVEN_VERSION=3.9.11
44
# Install Java 21, Maven and GitHub CLI
55
RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
66
sdk install java ${JAVA_VERSION} && \

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.8</version>
5+
<version>1.10</version>
66
</extension>
77
</extensions>

‎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=6254.vca_87b_2b_59e5a_
9+
export ATH_VERSION=6319.v9da_e005f2fd2
1010

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

‎bom/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ THE SOFTWARE.
3838
<description>The module contains dependencies that are used by a specific Jenkins version</description>
3939

4040
<properties>
41-
<commons-fileupload2.version>2.0.0-M3</commons-fileupload2.version>
41+
<commons-fileupload2.version>2.0.0-M4</commons-fileupload2.version>
4242
<groovy.version>2.4.21</groovy.version>
43-
<jelly.version>1.1-jenkins-20250108</jelly.version>
44-
<stapler.version>1990.v99d303a_82457</stapler.version>
43+
<jelly.version>1.1-jenkins-20250731</jelly.version>
44+
<stapler.version>2014.v1f888f8f0b_84</stapler.version>
4545
</properties>
4646

4747
<dependencyManagement>
@@ -63,15 +63,15 @@ THE SOFTWARE.
6363
<dependency>
6464
<groupId>org.springframework</groupId>
6565
<artifactId>spring-framework-bom</artifactId>
66-
<version>6.2.7</version>
66+
<version>6.2.9</version>
6767
<type>pom</type>
6868
<scope>import</scope>
6969
</dependency>
7070
<dependency>
7171
<!-- https://docs.spring.io/spring-security/reference/6.3/getting-spring-security.html#getting-maven-no-boot -->
7272
<groupId>org.springframework.security</groupId>
7373
<artifactId>spring-security-bom</artifactId>
74-
<version>6.5.0</version>
74+
<version>6.5.2</version>
7575
<type>pom</type>
7676
<scope>import</scope>
7777
</dependency>
@@ -109,7 +109,7 @@ THE SOFTWARE.
109109
<dependency>
110110
<groupId>commons-codec</groupId>
111111
<artifactId>commons-codec</artifactId>
112-
<version>1.18.0</version>
112+
<version>1.19.0</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>commons-collections</groupId>
@@ -119,7 +119,7 @@ THE SOFTWARE.
119119
<dependency>
120120
<groupId>commons-io</groupId>
121121
<artifactId>commons-io</artifactId>
122-
<version>2.19.0</version>
122+
<version>2.20.0</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>commons-lang</groupId>
@@ -240,7 +240,7 @@ THE SOFTWARE.
240240
<dependency>
241241
<groupId>org.jenkins-ci</groupId>
242242
<artifactId>crypto-util</artifactId>
243-
<version>1.10</version>
243+
<version>1.11</version>
244244
</dependency>
245245
<dependency>
246246
<groupId>org.jenkins-ci</groupId>
@@ -305,7 +305,7 @@ THE SOFTWARE.
305305
<dependency>
306306
<groupId>org.kohsuke.stapler</groupId>
307307
<artifactId>json-lib</artifactId>
308-
<version>2.4-jenkins-8</version>
308+
<version>2.4-jenkins-15</version>
309309
</dependency>
310310
<dependency>
311311
<groupId>org.kohsuke.stapler</groupId>

‎cli/pom.xml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@
3838
<artifactId>commons-io</artifactId>
3939
<optional>true</optional>
4040
</dependency>
41-
<dependency>
42-
<groupId>commons-lang</groupId>
43-
<artifactId>commons-lang</artifactId>
44-
<optional>true</optional>
45-
</dependency>
46-
<dependency>
47-
<!-- ed25519 algorithm, see JENKINS-45318 -->
48-
<groupId>net.i2p.crypto</groupId>
49-
<artifactId>eddsa</artifactId>
50-
<version>0.3.0</version>
51-
<optional>true</optional>
52-
</dependency>
5341
<dependency>
5442
<groupId>org.apache.sshd</groupId>
5543
<artifactId>sshd-common</artifactId>
@@ -62,6 +50,12 @@
6250
<version>${mina-sshd.version}</version>
6351
<optional>true</optional>
6452
</dependency>
53+
<dependency>
54+
<groupId>org.bouncycastle</groupId>
55+
<artifactId>bcprov-jdk18on</artifactId>
56+
<version>1.81</version>
57+
<optional>true</optional>
58+
</dependency>
6559
<dependency>
6660
<groupId>org.glassfish.tyrus.bundles</groupId>
6761
<artifactId>tyrus-standalone-client-jdk</artifactId>
@@ -155,6 +149,17 @@
155149
</transformer>
156150
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
157151
</transformers>
152+
<filters>
153+
<filter>
154+
<!-- signature might cause some trouble -->
155+
<artifact>*:*</artifact>
156+
<excludes>
157+
<exclude>META-INF/*.SF</exclude>
158+
<exclude>META-INF/*.DSA</exclude>
159+
<exclude>META-INF/*.RSA</exclude>
160+
</excludes>
161+
</filter>
162+
</filters>
158163
</configuration>
159164
</execution>
160165
</executions>

‎core/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ THE SOFTWARE.
5757
<dependency>
5858
<groupId>org.xmlunit</groupId>
5959
<artifactId>xmlunit-bom</artifactId>
60-
<version>2.10.2</version>
60+
<version>2.10.3</version>
6161
<type>pom</type>
6262
<scope>import</scope>
6363
</dependency>
@@ -623,6 +623,11 @@ THE SOFTWARE.
623623
<artifactId>maven-dependency-plugin</artifactId>
624624
<!-- Version specified in grandparent POM -->
625625
<executions>
626+
<execution>
627+
<goals>
628+
<goal>properties</goal>
629+
</goals>
630+
</execution>
626631
<execution>
627632
<id>winsw</id>
628633
<goals>
@@ -651,7 +656,7 @@ THE SOFTWARE.
651656
<!-- Version specified in grandparent POM -->
652657
<configuration>
653658
<!-- 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</argLine>
659+
<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>
655660
<reuseForks>false</reuseForks>
656661
</configuration>
657662
</plugin>

‎core/src/main/java/hudson/FilePath.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import java.io.OutputStreamWriter;
7878
import java.io.RandomAccessFile;
7979
import java.io.Serializable;
80-
import java.io.UncheckedIOException;
8180
import java.io.Writer;
8281
import java.net.HttpURLConnection;
8382
import java.net.MalformedURLException;
@@ -1143,8 +1142,6 @@ public void copyFrom(FileItem file) throws IOException, InterruptedException {
11431142
if (channel == null) {
11441143
try {
11451144
file.write(Paths.get(remote));
1146-
} catch (UncheckedIOException e) {
1147-
throw e.getCause();
11481145
} catch (IOException e) {
11491146
throw e;
11501147
} catch (Exception e) {

0 commit comments

Comments
 (0)