maven: add eclipse-temurin-*-focal

[carlossg]

remove eclipse-temurin-16

[github-actions]

Diff for 28e3e03:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index d481903..f9c4361 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -25,6 +25,11 @@ Tags: 3.8.5-eclipse-temurin-8-alpine, 3.8-eclipse-temurin-8-alpine, 3-eclipse-te
 GitCommit: 3439db2aeb3eb45d1480ba619538aa3f6bb3f0f2
 Directory: eclipse-temurin-8-alpine
 
+Tags: 3.8.5-eclipse-temurin-8-focal, 3.8-eclipse-temurin-8-focal, 3-eclipse-temurin-8-focal
+Architectures: amd64, arm32v7, arm64v8, ppc64le
+GitCommit: bb633d689109eec148e76ea886690c050842908f
+Directory: eclipse-temurin-8-focal
+
 Tags: 3.8.5-eclipse-temurin-11, 3.8-eclipse-temurin-11, 3-eclipse-temurin-11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 925e49a1d0986070208e3c06a11c41f8f2cada82
@@ -34,14 +39,10 @@ Tags: 3.8.5-eclipse-temurin-11-alpine, 3.8-eclipse-temurin-11-alpine, 3-eclipse-
 GitCommit: 925e49a1d0986070208e3c06a11c41f8f2cada82
 Directory: eclipse-temurin-11-alpine
 
-Tags: 3.8.5-eclipse-temurin-16, 3.8-eclipse-temurin-16, 3-eclipse-temurin-16
+Tags: 3.8.5-eclipse-temurin-11-focal, 3.8-eclipse-temurin-11-focal, 3-eclipse-temurin-11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 925e49a1d0986070208e3c06a11c41f8f2cada82
-Directory: eclipse-temurin-16
-
-Tags: 3.8.5-eclipse-temurin-16-alpine, 3.8-eclipse-temurin-16-alpine, 3-eclipse-temurin-16-alpine
-GitCommit: 925e49a1d0986070208e3c06a11c41f8f2cada82
-Directory: eclipse-temurin-16-alpine
+GitCommit: bb633d689109eec148e76ea886690c050842908f
+Directory: eclipse-temurin-11-focal
 
 Tags: 3.8.5-eclipse-temurin-17, 3.8.5, 3.8.5-eclipse-temurin, 3.8-eclipse-temurin-17, 3.8, 3.8-eclipse-temurin, 3-eclipse-temurin-17, 3, latest, 3-eclipse-temurin, eclipse-temurin
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -52,6 +53,11 @@ Tags: 3.8.5-eclipse-temurin-17-alpine, 3.8-eclipse-temurin-17-alpine, 3-eclipse-
 GitCommit: 925e49a1d0986070208e3c06a11c41f8f2cada82
 Directory: eclipse-temurin-17-alpine
 
+Tags: 3.8.5-eclipse-temurin-17-focal, 3.8-eclipse-temurin-17-focal, 3-eclipse-temurin-17-focal
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: bb633d689109eec148e76ea886690c050842908f
+Directory: eclipse-temurin-17-focal
+
 Tags: 3.8.5-eclipse-temurin-18, 3.8-eclipse-temurin-18, 3-eclipse-temurin-18
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: daef59c76ee2b568c48e53b28212fa6b34b9c872
diff --git a/_bashbrew-list b/_bashbrew-list
index 27b540a..77ee3f8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,12 +6,13 @@ maven:3-amazoncorretto-17
 maven:3-eclipse-temurin
 maven:3-eclipse-temurin-8
 maven:3-eclipse-temurin-8-alpine
+maven:3-eclipse-temurin-8-focal
 maven:3-eclipse-temurin-11
 maven:3-eclipse-temurin-11-alpine
-maven:3-eclipse-temurin-16
-maven:3-eclipse-temurin-16-alpine
+maven:3-eclipse-temurin-11-focal
 maven:3-eclipse-temurin-17
 maven:3-eclipse-temurin-17-alpine
+maven:3-eclipse-temurin-17-focal
 maven:3-eclipse-temurin-18
 maven:3-eclipse-temurin-18-alpine
 maven:3-ibmjava
@@ -40,12 +41,13 @@ maven:3.8-amazoncorretto-17
 maven:3.8-eclipse-temurin
 maven:3.8-eclipse-temurin-8
 maven:3.8-eclipse-temurin-8-alpine
+maven:3.8-eclipse-temurin-8-focal
 maven:3.8-eclipse-temurin-11
 maven:3.8-eclipse-temurin-11-alpine
-maven:3.8-eclipse-temurin-16
-maven:3.8-eclipse-temurin-16-alpine
+maven:3.8-eclipse-temurin-11-focal
 maven:3.8-eclipse-temurin-17
 maven:3.8-eclipse-temurin-17-alpine
+maven:3.8-eclipse-temurin-17-focal
 maven:3.8-eclipse-temurin-18
 maven:3.8-eclipse-temurin-18-alpine
 maven:3.8-ibmjava
@@ -74,12 +76,13 @@ maven:3.8.5-amazoncorretto-17
 maven:3.8.5-eclipse-temurin
 maven:3.8.5-eclipse-temurin-8
 maven:3.8.5-eclipse-temurin-8-alpine
+maven:3.8.5-eclipse-temurin-8-focal
 maven:3.8.5-eclipse-temurin-11
 maven:3.8.5-eclipse-temurin-11-alpine
-maven:3.8.5-eclipse-temurin-16
-maven:3.8.5-eclipse-temurin-16-alpine
+maven:3.8.5-eclipse-temurin-11-focal
 maven:3.8.5-eclipse-temurin-17
 maven:3.8.5-eclipse-temurin-17-alpine
+maven:3.8.5-eclipse-temurin-17-focal
 maven:3.8.5-eclipse-temurin-18
 maven:3.8.5-eclipse-temurin-18-alpine
 maven:3.8.5-ibmjava
diff --git a/maven_3-eclipse-temurin-16/Dockerfile b/maven_3-eclipse-temurin-11-focal/Dockerfile
similarity index 96%
copy from maven_3-eclipse-temurin-16/Dockerfile
copy to maven_3-eclipse-temurin-11-focal/Dockerfile
index eef9bf7..4f30ecc 100644
--- a/maven_3-eclipse-temurin-16/Dockerfile
+++ b/maven_3-eclipse-temurin-11-focal/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:16-jdk
+FROM eclipse-temurin:11-jdk-focal
 
 RUN apt-get update \
     && apt-get install -y git \
diff --git a/maven_3-eclipse-temurin-16-alpine/mvn-entrypoint.sh b/maven_3-eclipse-temurin-11-focal/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-eclipse-temurin-16-alpine/mvn-entrypoint.sh
rename to maven_3-eclipse-temurin-11-focal/mvn-entrypoint.sh
diff --git a/maven_3-eclipse-temurin-16-alpine/settings-docker.xml b/maven_3-eclipse-temurin-11-focal/settings-docker.xml
similarity index 100%
rename from maven_3-eclipse-temurin-16-alpine/settings-docker.xml
rename to maven_3-eclipse-temurin-11-focal/settings-docker.xml
diff --git a/maven_3-eclipse-temurin-16-alpine/Dockerfile b/maven_3-eclipse-temurin-16-alpine/Dockerfile
deleted file mode 100644
index e4641da..0000000
diff --git a/maven_3-eclipse-temurin-16/Dockerfile b/maven_3-eclipse-temurin-17-focal/Dockerfile
similarity index 96%
copy from maven_3-eclipse-temurin-16/Dockerfile
copy to maven_3-eclipse-temurin-17-focal/Dockerfile
index eef9bf7..f8a94dd 100644
--- a/maven_3-eclipse-temurin-16/Dockerfile
+++ b/maven_3-eclipse-temurin-17-focal/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:16-jdk
+FROM eclipse-temurin:17-jdk-focal
 
 RUN apt-get update \
     && apt-get install -y git \
diff --git a/maven_3-eclipse-temurin-16/mvn-entrypoint.sh b/maven_3-eclipse-temurin-17-focal/mvn-entrypoint.sh
similarity index 100%
rename from maven_3-eclipse-temurin-16/mvn-entrypoint.sh
rename to maven_3-eclipse-temurin-17-focal/mvn-entrypoint.sh
diff --git a/maven_3-eclipse-temurin-16/settings-docker.xml b/maven_3-eclipse-temurin-17-focal/settings-docker.xml
similarity index 100%
rename from maven_3-eclipse-temurin-16/settings-docker.xml
rename to maven_3-eclipse-temurin-17-focal/settings-docker.xml
diff --git a/maven_3-eclipse-temurin-16/Dockerfile b/maven_3-eclipse-temurin-8-focal/Dockerfile
similarity index 96%
rename from maven_3-eclipse-temurin-16/Dockerfile
rename to maven_3-eclipse-temurin-8-focal/Dockerfile
index eef9bf7..73b1e06 100644
--- a/maven_3-eclipse-temurin-16/Dockerfile
+++ b/maven_3-eclipse-temurin-8-focal/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:16-jdk
+FROM eclipse-temurin:8-jdk-focal
 
 RUN apt-get update \
     && apt-get install -y git \
diff --git a/maven_3-amazoncorretto-17/mvn-entrypoint.sh b/maven_3-eclipse-temurin-8-focal/mvn-entrypoint.sh
similarity index 100%
copy from maven_3-amazoncorretto-17/mvn-entrypoint.sh
copy to maven_3-eclipse-temurin-8-focal/mvn-entrypoint.sh
diff --git a/maven_3-amazoncorretto-17/settings-docker.xml b/maven_3-eclipse-temurin-8-focal/settings-docker.xml
similarity index 100%
copy from maven_3-amazoncorretto-17/settings-docker.xml
copy to maven_3-eclipse-temurin-8-focal/settings-docker.xml

Relevant Maintainers:

• maven: @carlossg