Merge branch 'master' of https://github.com/jenkinsci/jenkins into ServletException

This commit is contained in:
Jesse Glick 2025-07-17 18:26:25 -04:00
commit ed2fc9e753
No known key found for this signature in database
GPG Key ID: 1DDA69D94B624311
4 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
FROM gitpod/workspace-full:latest
ARG JAVA_VERSION=21.0.6-tem
ARG MAVEN_VERSION=3.9.10
ARG MAVEN_VERSION=3.9.11
# Install Java 21, Maven and GitHub CLI
RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
sdk install java ${JAVA_VERSION} && \

2
ath.sh
View File

@ -6,7 +6,7 @@ set -o xtrace
cd "$(dirname "$0")"
# https://github.com/jenkinsci/acceptance-test-harness/releases
export ATH_VERSION=6294.v8837063f315d
export ATH_VERSION=6300.v12732144c83f
if [[ $# -eq 0 ]]; then
export JDK=17

View File

@ -63,7 +63,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.2.8</version>
<version>6.2.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>

View File

@ -87,7 +87,7 @@ THE SOFTWARE.
<changelog.url>https://www.jenkins.io/changelog</changelog.url>
<!-- Bundled Remoting version -->
<remoting.version>3324.vea_eda_e98cd69</remoting.version>
<remoting.version>3327.v868139a_d00e0</remoting.version>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Medium</spotbugs.threshold>