Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Jetty version to 12.0.14 #17666

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

lachlan-roberts
Copy link
Contributor

Update Jetty Version
12.0.13 -> 12.0.14

Signed-off-by: Lachlan Roberts <[email protected]>
@lachlan-roberts lachlan-roberts requested a review from a team as a code owner October 2, 2024 22:19

This comment has been minimized.

@yosifkit
Copy link
Member

yosifkit commented Oct 3, 2024

The failing "naughty" test is about eclipse-temurin:22-* reaching end of life. Their JDK 22 images were replaced by JDK 23 images in #17582. So, the jetty:12.0.14-jdk22 and jetty:12.0.14-jdk22-alpine images should be dropped or replaced with JDK 23 based images

Signed-off-by: Lachlan Roberts <[email protected]>
@lachlan-roberts
Copy link
Contributor Author

@yosifkit thanks, I have now updated those images to use JDK23

Copy link

github-actions bot commented Oct 4, 2024

Diff for 0c35fb2:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8fc210b..b42ee1e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -277,67 +277,67 @@ Tags: 11.0.24-jre21-alpine, 11.0-jre21-alpine, 11-jre21-alpine, 11.0.24-jre21-al
 GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
 Directory: eclipse-temurin/11.0/jre21-alpine
 
-Tags: 12.0.13, 12.0, 12, 12.0.13-jdk21, 12.0-jdk21, 12-jdk21, 12.0.13-eclipse-temurin, 12.0-eclipse-temurin, 12-eclipse-temurin, 12.0.13-jdk21-eclipse-temurin, 12.0-jdk21-eclipse-temurin, 12-jdk21-eclipse-temurin, latest, jdk21
+Tags: 12.0.14, 12.0, 12, 12.0.14-jdk21, 12.0-jdk21, 12-jdk21, 12.0.14-eclipse-temurin, 12.0-eclipse-temurin, 12-eclipse-temurin, 12.0.14-jdk21-eclipse-temurin, 12.0-jdk21-eclipse-temurin, 12-jdk21-eclipse-temurin, latest, jdk21
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jdk21
 
-Tags: 12.0.13-amazoncorretto, 12.0-amazoncorretto, 12-amazoncorretto, 12.0.13-jdk21-amazoncorretto, 12.0-jdk21-amazoncorretto, 12-jdk21-amazoncorretto
+Tags: 12.0.14-amazoncorretto, 12.0-amazoncorretto, 12-amazoncorretto, 12.0.14-jdk21-amazoncorretto, 12.0-jdk21-amazoncorretto, 12-jdk21-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: amazoncorretto/12.0/jdk21
 
-Tags: 12.0.13-jdk17, 12.0-jdk17, 12-jdk17, 12.0.13-jdk17-eclipse-temurin, 12.0-jdk17-eclipse-temurin, 12-jdk17-eclipse-temurin, jdk17
+Tags: 12.0.14-jdk17, 12.0-jdk17, 12-jdk17, 12.0.14-jdk17-eclipse-temurin, 12.0-jdk17-eclipse-temurin, 12-jdk17-eclipse-temurin, jdk17
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jdk17
 
-Tags: 12.0.13-jdk17-alpine, 12.0-jdk17-alpine, 12-jdk17-alpine, 12.0.13-jdk17-alpine-eclipse-temurin, 12.0-jdk17-alpine-eclipse-temurin, 12-jdk17-alpine-eclipse-temurin
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+Tags: 12.0.14-jdk17-alpine, 12.0-jdk17-alpine, 12-jdk17-alpine, 12.0.14-jdk17-alpine-eclipse-temurin, 12.0-jdk17-alpine-eclipse-temurin, 12-jdk17-alpine-eclipse-temurin
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jdk17-alpine
 
-Tags: 12.0.13-jdk17-alpine-amazoncorretto, 12.0-jdk17-alpine-amazoncorretto, 12-jdk17-alpine-amazoncorretto
+Tags: 12.0.14-jdk17-alpine-amazoncorretto, 12.0-jdk17-alpine-amazoncorretto, 12-jdk17-alpine-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: amazoncorretto/12.0/jdk17-alpine
 
-Tags: 12.0.13-jdk17-amazoncorretto, 12.0-jdk17-amazoncorretto, 12-jdk17-amazoncorretto
+Tags: 12.0.14-jdk17-amazoncorretto, 12.0-jdk17-amazoncorretto, 12-jdk17-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: amazoncorretto/12.0/jdk17
 
-Tags: 12.0.13-jdk21-alpine, 12.0-jdk21-alpine, 12-jdk21-alpine, 12.0.13-jdk21-alpine-eclipse-temurin, 12.0-jdk21-alpine-eclipse-temurin, 12-jdk21-alpine-eclipse-temurin
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+Tags: 12.0.14-jdk21-alpine, 12.0-jdk21-alpine, 12-jdk21-alpine, 12.0.14-jdk21-alpine-eclipse-temurin, 12.0-jdk21-alpine-eclipse-temurin, 12-jdk21-alpine-eclipse-temurin
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jdk21-alpine
 
-Tags: 12.0.13-jdk21-alpine-amazoncorretto, 12.0-jdk21-alpine-amazoncorretto, 12-jdk21-alpine-amazoncorretto
+Tags: 12.0.14-jdk21-alpine-amazoncorretto, 12.0-jdk21-alpine-amazoncorretto, 12-jdk21-alpine-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: amazoncorretto/12.0/jdk21-alpine
 
-Tags: 12.0.13-jdk22, 12.0-jdk22, 12-jdk22, 12.0.13-jdk22-eclipse-temurin, 12.0-jdk22-eclipse-temurin, 12-jdk22-eclipse-temurin
+Tags: 12.0.14-jdk23, 12.0-jdk23, 12-jdk23, 12.0.14-jdk23-eclipse-temurin, 12.0-jdk23-eclipse-temurin, 12-jdk23-eclipse-temurin
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
-Directory: eclipse-temurin/12.0/jdk22
+GitCommit: 9c0344d032b14a8f13681e820fd81e9778140e7f
+Directory: eclipse-temurin/12.0/jdk23
 
-Tags: 12.0.13-jdk22-alpine, 12.0-jdk22-alpine, 12-jdk22-alpine, 12.0.13-jdk22-alpine-eclipse-temurin, 12.0-jdk22-alpine-eclipse-temurin, 12-jdk22-alpine-eclipse-temurin
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
-Directory: eclipse-temurin/12.0/jdk22-alpine
+Tags: 12.0.14-jdk23-alpine, 12.0-jdk23-alpine, 12-jdk23-alpine, 12.0.14-jdk23-alpine-eclipse-temurin, 12.0-jdk23-alpine-eclipse-temurin, 12-jdk23-alpine-eclipse-temurin
+GitCommit: 9c0344d032b14a8f13681e820fd81e9778140e7f
+Directory: eclipse-temurin/12.0/jdk23-alpine
 
-Tags: 12.0.13-jre17, 12.0-jre17, 12-jre17, 12.0.13-jre17-eclipse-temurin, 12.0-jre17-eclipse-temurin, 12-jre17-eclipse-temurin
+Tags: 12.0.14-jre17, 12.0-jre17, 12-jre17, 12.0.14-jre17-eclipse-temurin, 12.0-jre17-eclipse-temurin, 12-jre17-eclipse-temurin
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jre17
 
-Tags: 12.0.13-jre17-alpine, 12.0-jre17-alpine, 12-jre17-alpine, 12.0.13-jre17-alpine-eclipse-temurin, 12.0-jre17-alpine-eclipse-temurin, 12-jre17-alpine-eclipse-temurin
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+Tags: 12.0.14-jre17-alpine, 12.0-jre17-alpine, 12-jre17-alpine, 12.0.14-jre17-alpine-eclipse-temurin, 12.0-jre17-alpine-eclipse-temurin, 12-jre17-alpine-eclipse-temurin
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jre17-alpine
 
-Tags: 12.0.13-jre21, 12.0-jre21, 12-jre21, 12.0.13-jre21-eclipse-temurin, 12.0-jre21-eclipse-temurin, 12-jre21-eclipse-temurin
+Tags: 12.0.14-jre21, 12.0-jre21, 12-jre21, 12.0.14-jre21-eclipse-temurin, 12.0-jre21-eclipse-temurin, 12-jre21-eclipse-temurin
 Architectures: amd64, arm64v8
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jre21
 
-Tags: 12.0.13-jre21-alpine, 12.0-jre21-alpine, 12-jre21-alpine, 12.0.13-jre21-alpine-eclipse-temurin, 12.0-jre21-alpine-eclipse-temurin, 12-jre21-alpine-eclipse-temurin
-GitCommit: f705916fcf8ad79097235a944b67d461d2fa3e43
+Tags: 12.0.14-jre21-alpine, 12.0-jre21-alpine, 12-jre21-alpine, 12.0.14-jre21-alpine-eclipse-temurin, 12.0-jre21-alpine-eclipse-temurin, 12-jre21-alpine-eclipse-temurin
+GitCommit: f0c6a3e167722283788502f39ee521ffdac911a0
 Directory: eclipse-temurin/12.0/jre21-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index efd1aef..1443afa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -334,10 +334,10 @@ jetty:12-jdk21-alpine-amazoncorretto
 jetty:12-jdk21-alpine-eclipse-temurin
 jetty:12-jdk21-amazoncorretto
 jetty:12-jdk21-eclipse-temurin
-jetty:12-jdk22
-jetty:12-jdk22-alpine
-jetty:12-jdk22-alpine-eclipse-temurin
-jetty:12-jdk22-eclipse-temurin
+jetty:12-jdk23
+jetty:12-jdk23-alpine
+jetty:12-jdk23-alpine-eclipse-temurin
+jetty:12-jdk23-eclipse-temurin
 jetty:12-jre17
 jetty:12-jre17-alpine
 jetty:12-jre17-alpine-eclipse-temurin
@@ -361,10 +361,10 @@ jetty:12.0-jdk21-alpine-amazoncorretto
 jetty:12.0-jdk21-alpine-eclipse-temurin
 jetty:12.0-jdk21-amazoncorretto
 jetty:12.0-jdk21-eclipse-temurin
-jetty:12.0-jdk22
-jetty:12.0-jdk22-alpine
-jetty:12.0-jdk22-alpine-eclipse-temurin
-jetty:12.0-jdk22-eclipse-temurin
+jetty:12.0-jdk23
+jetty:12.0-jdk23-alpine
+jetty:12.0-jdk23-alpine-eclipse-temurin
+jetty:12.0-jdk23-eclipse-temurin
 jetty:12.0-jre17
 jetty:12.0-jre17-alpine
 jetty:12.0-jre17-alpine-eclipse-temurin
@@ -373,33 +373,33 @@ jetty:12.0-jre21
 jetty:12.0-jre21-alpine
 jetty:12.0-jre21-alpine-eclipse-temurin
 jetty:12.0-jre21-eclipse-temurin
-jetty:12.0.13
-jetty:12.0.13-amazoncorretto
-jetty:12.0.13-eclipse-temurin
-jetty:12.0.13-jdk17
-jetty:12.0.13-jdk17-alpine
-jetty:12.0.13-jdk17-alpine-amazoncorretto
-jetty:12.0.13-jdk17-alpine-eclipse-temurin
-jetty:12.0.13-jdk17-amazoncorretto
-jetty:12.0.13-jdk17-eclipse-temurin
-jetty:12.0.13-jdk21
-jetty:12.0.13-jdk21-alpine
-jetty:12.0.13-jdk21-alpine-amazoncorretto
-jetty:12.0.13-jdk21-alpine-eclipse-temurin
-jetty:12.0.13-jdk21-amazoncorretto
-jetty:12.0.13-jdk21-eclipse-temurin
-jetty:12.0.13-jdk22
-jetty:12.0.13-jdk22-alpine
-jetty:12.0.13-jdk22-alpine-eclipse-temurin
-jetty:12.0.13-jdk22-eclipse-temurin
-jetty:12.0.13-jre17
-jetty:12.0.13-jre17-alpine
-jetty:12.0.13-jre17-alpine-eclipse-temurin
-jetty:12.0.13-jre17-eclipse-temurin
-jetty:12.0.13-jre21
-jetty:12.0.13-jre21-alpine
-jetty:12.0.13-jre21-alpine-eclipse-temurin
-jetty:12.0.13-jre21-eclipse-temurin
+jetty:12.0.14
+jetty:12.0.14-amazoncorretto
+jetty:12.0.14-eclipse-temurin
+jetty:12.0.14-jdk17
+jetty:12.0.14-jdk17-alpine
+jetty:12.0.14-jdk17-alpine-amazoncorretto
+jetty:12.0.14-jdk17-alpine-eclipse-temurin
+jetty:12.0.14-jdk17-amazoncorretto
+jetty:12.0.14-jdk17-eclipse-temurin
+jetty:12.0.14-jdk21
+jetty:12.0.14-jdk21-alpine
+jetty:12.0.14-jdk21-alpine-amazoncorretto
+jetty:12.0.14-jdk21-alpine-eclipse-temurin
+jetty:12.0.14-jdk21-amazoncorretto
+jetty:12.0.14-jdk21-eclipse-temurin
+jetty:12.0.14-jdk23
+jetty:12.0.14-jdk23-alpine
+jetty:12.0.14-jdk23-alpine-eclipse-temurin
+jetty:12.0.14-jdk23-eclipse-temurin
+jetty:12.0.14-jre17
+jetty:12.0.14-jre17-alpine
+jetty:12.0.14-jre17-alpine-eclipse-temurin
+jetty:12.0.14-jre17-eclipse-temurin
+jetty:12.0.14-jre21
+jetty:12.0.14-jre21-alpine
+jetty:12.0.14-jre21-alpine-eclipse-temurin
+jetty:12.0.14-jre21-eclipse-temurin
 jetty:jdk17
 jetty:jdk21
 jetty:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e6bdf77..b0764ba 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -63,8 +63,8 @@ jetty:12-jdk17-amazoncorretto
 jetty:12-jdk21-alpine-amazoncorretto
 jetty:12-jdk21-alpine-eclipse-temurin
 jetty:12-jdk21-amazoncorretto
-jetty:12-jdk22-alpine-eclipse-temurin
-jetty:12-jdk22-eclipse-temurin
+jetty:12-jdk23-alpine-eclipse-temurin
+jetty:12-jdk23-eclipse-temurin
 jetty:12-jre17-alpine-eclipse-temurin
 jetty:12-jre17-eclipse-temurin
 jetty:12-jre21-alpine-eclipse-temurin
diff --git a/jetty_12-jdk17-alpine-amazoncorretto/Dockerfile b/jetty_12-jdk17-alpine-amazoncorretto/Dockerfile
index f760cfd..5195900 100644
--- a/jetty_12-jdk17-alpine-amazoncorretto/Dockerfile
+++ b/jetty_12-jdk17-alpine-amazoncorretto/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
 FROM amazoncorretto:17-alpine
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk17-alpine-eclipse-temurin/Dockerfile b/jetty_12-jdk17-alpine-eclipse-temurin/Dockerfile
index 941ccba..154a204 100644
--- a/jetty_12-jdk17-alpine-eclipse-temurin/Dockerfile
+++ b/jetty_12-jdk17-alpine-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
 FROM eclipse-temurin:17-jdk-alpine
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk17-amazoncorretto/Dockerfile b/jetty_12-jdk17-amazoncorretto/Dockerfile
index bcf9695..a3446a9 100644
--- a/jetty_12-jdk17-amazoncorretto/Dockerfile
+++ b/jetty_12-jdk17-amazoncorretto/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-amazoncorretto and use update.sh
 FROM amazoncorretto:17
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk21-alpine-amazoncorretto/Dockerfile b/jetty_12-jdk21-alpine-amazoncorretto/Dockerfile
index 64a75ed..11dfd38 100644
--- a/jetty_12-jdk21-alpine-amazoncorretto/Dockerfile
+++ b/jetty_12-jdk21-alpine-amazoncorretto/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
 FROM amazoncorretto:21-alpine
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk21-alpine-eclipse-temurin/Dockerfile b/jetty_12-jdk21-alpine-eclipse-temurin/Dockerfile
index 3e3cdda..00c1cda 100644
--- a/jetty_12-jdk21-alpine-eclipse-temurin/Dockerfile
+++ b/jetty_12-jdk21-alpine-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
 FROM eclipse-temurin:21-jdk-alpine
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk21-amazoncorretto/Dockerfile b/jetty_12-jdk21-amazoncorretto/Dockerfile
index db22abb..ffb7056 100644
--- a/jetty_12-jdk21-amazoncorretto/Dockerfile
+++ b/jetty_12-jdk21-amazoncorretto/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-amazoncorretto and use update.sh
 FROM amazoncorretto:21
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk22-alpine-eclipse-temurin/Dockerfile b/jetty_12-jdk22-alpine-eclipse-temurin/Dockerfile
deleted file mode 100644
index 4b58d39..0000000
diff --git a/jetty_12-jdk22-eclipse-temurin/Dockerfile b/jetty_12-jdk22-eclipse-temurin/Dockerfile
deleted file mode 100644
index bbe7394..0000000
diff --git a/jetty_10-jdk11-alpine-amazoncorretto/Dockerfile b/jetty_12-jdk23-alpine-eclipse-temurin/Dockerfile
similarity index 97%
copy from jetty_10-jdk11-alpine-amazoncorretto/Dockerfile
copy to jetty_12-jdk23-alpine-eclipse-temurin/Dockerfile
index f37ebf9..ec2c97d 100644
--- a/jetty_10-jdk11-alpine-amazoncorretto/Dockerfile
+++ b/jetty_12-jdk23-alpine-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
-FROM amazoncorretto:11-alpine
+FROM eclipse-temurin:23-jdk-alpine
 
-ENV JETTY_VERSION 10.0.24
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk22-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_12-jdk23-alpine-eclipse-temurin/docker-entrypoint.sh
similarity index 100%
rename from jetty_12-jdk22-alpine-eclipse-temurin/docker-entrypoint.sh
rename to jetty_12-jdk23-alpine-eclipse-temurin/docker-entrypoint.sh
diff --git a/jetty_12-jdk22-alpine-eclipse-temurin/generate-jetty-start.sh b/jetty_12-jdk23-alpine-eclipse-temurin/generate-jetty-start.sh
similarity index 100%
rename from jetty_12-jdk22-alpine-eclipse-temurin/generate-jetty-start.sh
rename to jetty_12-jdk23-alpine-eclipse-temurin/generate-jetty-start.sh
diff --git a/jetty_10-jdk21-eclipse-temurin/Dockerfile b/jetty_12-jdk23-eclipse-temurin/Dockerfile
similarity index 98%
copy from jetty_10-jdk21-eclipse-temurin/Dockerfile
copy to jetty_12-jdk23-eclipse-temurin/Dockerfile
index 6264cc8..765da1b 100644
--- a/jetty_10-jdk21-eclipse-temurin/Dockerfile
+++ b/jetty_12-jdk23-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-slim and use update.sh
-FROM eclipse-temurin:21-jdk
+FROM eclipse-temurin:23-jdk
 
-ENV JETTY_VERSION 10.0.24
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jdk22-eclipse-temurin/docker-entrypoint.sh b/jetty_12-jdk23-eclipse-temurin/docker-entrypoint.sh
similarity index 100%
rename from jetty_12-jdk22-eclipse-temurin/docker-entrypoint.sh
rename to jetty_12-jdk23-eclipse-temurin/docker-entrypoint.sh
diff --git a/jetty_12-jdk22-eclipse-temurin/generate-jetty-start.sh b/jetty_12-jdk23-eclipse-temurin/generate-jetty-start.sh
similarity index 100%
rename from jetty_12-jdk22-eclipse-temurin/generate-jetty-start.sh
rename to jetty_12-jdk23-eclipse-temurin/generate-jetty-start.sh
diff --git a/jetty_12-jre17-alpine-eclipse-temurin/Dockerfile b/jetty_12-jre17-alpine-eclipse-temurin/Dockerfile
index f590c90..d19d438 100644
--- a/jetty_12-jre17-alpine-eclipse-temurin/Dockerfile
+++ b/jetty_12-jre17-alpine-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
 FROM eclipse-temurin:17-jre-alpine
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jre17-eclipse-temurin/Dockerfile b/jetty_12-jre17-eclipse-temurin/Dockerfile
index a069826..5fef2e1 100644
--- a/jetty_12-jre17-eclipse-temurin/Dockerfile
+++ b/jetty_12-jre17-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-slim and use update.sh
 FROM eclipse-temurin:17-jre
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jre21-alpine-eclipse-temurin/Dockerfile b/jetty_12-jre21-alpine-eclipse-temurin/Dockerfile
index 159fa5a..a4d41cf 100644
--- a/jetty_12-jre21-alpine-eclipse-temurin/Dockerfile
+++ b/jetty_12-jre21-alpine-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-alpine and use update.sh
 FROM eclipse-temurin:21-jre-alpine
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_12-jre21-eclipse-temurin/Dockerfile b/jetty_12-jre21-eclipse-temurin/Dockerfile
index 65ee491..1402d86 100644
--- a/jetty_12-jre21-eclipse-temurin/Dockerfile
+++ b/jetty_12-jre21-eclipse-temurin/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-slim and use update.sh
 FROM eclipse-temurin:21-jre
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_jdk17/Dockerfile b/jetty_jdk17/Dockerfile
index c122dcd..cc4a948 100644
--- a/jetty_jdk17/Dockerfile
+++ b/jetty_jdk17/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-slim and use update.sh
 FROM eclipse-temurin:17-jdk
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/jetty_jdk21/Dockerfile b/jetty_jdk21/Dockerfile
index b1f765a..b4a8ed1 100644
--- a/jetty_jdk21/Dockerfile
+++ b/jetty_jdk21/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit baseDockerfile-slim and use update.sh
 FROM eclipse-temurin:21-jdk
 
-ENV JETTY_VERSION 12.0.13
+ENV JETTY_VERSION 12.0.14
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty

Relevant Maintainers:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants