Эх сурвалжийг харах

maven: add openjdk 15 & 16 slim (#9010)

* maven: add openjdk 15 (latest) & 16 slim, remove openjdk-14
Add git to openjdk images
upgrade adoptopenjdk openj9 to focal
Carlos Sanchez 5 жил өмнө
parent
commit
d65854b31a
1 өөрчлөгдсөн 30 нэмэгдсэн , 25 устгасан
  1. 30 25
      library/maven

+ 30 - 25
library/maven

@@ -8,7 +8,7 @@ Directory: openjdk-11
 
 Tags: 3.6.3-jdk-11-openj9, 3.6-jdk-11-openj9, 3-jdk-11-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
+GitCommit: b243010db790a1ab8f6a43d26ae86a76cba86b55
 Directory: adoptopenjdk-11-openj9
 
 Tags: 3.6.3-jdk-11-slim, 3.6-jdk-11-slim, 3-jdk-11-slim
@@ -16,11 +16,6 @@ Architectures: amd64, arm64v8
 GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
 Directory: openjdk-11-slim
 
-Tags: 3.6.3-jdk-14, 3.6-jdk-14, 3-jdk-14
-Architectures: amd64
-GitCommit: de6edcd9bb1015c65e38bb9c9f7c93b95dc88aa1
-Directory: openjdk-14
-
 Tags: 3.6.3-jdk-8, 3.6-jdk-8, 3-jdk-8
 Architectures: amd64
 GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
@@ -28,7 +23,7 @@ Directory: openjdk-8
 
 Tags: 3.6.3-jdk-8-openj9, 3.6-jdk-8-openj9, 3-jdk-8-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
+GitCommit: b243010db790a1ab8f6a43d26ae86a76cba86b55
 Directory: adoptopenjdk-8-openj9
 
 Tags: 3.6.3-jdk-8-slim, 3.6-jdk-8-slim, 3-jdk-8-slim
@@ -46,26 +41,26 @@ Architectures: amd64, arm64v8
 GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
 Directory: openjdk-11-slim
 
-Tags: 3.6.3-openjdk-14, 3.6.3, 3.6.3-openjdk, 3.6-openjdk-14, 3.6, 3.6-openjdk, 3-openjdk-14, 3, latest, 3-openjdk, openjdk
-Architectures: amd64
-GitCommit: de6edcd9bb1015c65e38bb9c9f7c93b95dc88aa1
-Directory: openjdk-14
-
-Tags: 3.6.3-openjdk-14-slim, 3.6.3-slim, 3.6-openjdk-14-slim, 3.6-slim, 3-openjdk-14-slim, slim
-Architectures: amd64
-GitCommit: 440e1f708e8fa5ea4d6ef509d22aee6d8265b209
-Directory: openjdk-14-slim
-
-Tags: 3.6.3-openjdk-15, 3.6-openjdk-15, 3-openjdk-15
+Tags: 3.6.3-openjdk-15, 3.6.3, 3.6.3-openjdk, 3.6-openjdk-15, 3.6, 3.6-openjdk, 3-openjdk-15, 3, latest, 3-openjdk, openjdk
 Architectures: amd64, arm64v8
-GitCommit: de6edcd9bb1015c65e38bb9c9f7c93b95dc88aa1
+GitCommit: a7de5419ae52d514d0fd5bcd08694fce2334aed4
 Directory: openjdk-15
 
+Tags: 3.6.3-openjdk-15-slim, 3.6-openjdk-15-slim, 3-openjdk-15-slim
+Architectures: amd64, arm64v8
+GitCommit: cc080bd044b5ae09731e5cb5f8de61fb5bdb32a5
+Directory: openjdk-15-slim
+
 Tags: 3.6.3-openjdk-16, 3.6-openjdk-16, 3-openjdk-16
 Architectures: amd64, arm64v8
-GitCommit: de6edcd9bb1015c65e38bb9c9f7c93b95dc88aa1
+GitCommit: a7de5419ae52d514d0fd5bcd08694fce2334aed4
 Directory: openjdk-16
 
+Tags: 3.6.3-openjdk-16-slim, 3.6-openjdk-16-slim, 3-openjdk-16-slim
+Architectures: amd64, arm64v8
+GitCommit: cc080bd044b5ae09731e5cb5f8de61fb5bdb32a5
+Directory: openjdk-16-slim
+
 Tags: 3.6.3-openjdk-8, 3.6-openjdk-8, 3-openjdk-8
 Architectures: amd64
 GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
@@ -83,27 +78,37 @@ Directory: adoptopenjdk-11
 
 Tags: 3.6.3-adoptopenjdk-11-openj9, 3.6-adoptopenjdk-11-openj9, 3-adoptopenjdk-11-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
+GitCommit: b243010db790a1ab8f6a43d26ae86a76cba86b55
 Directory: adoptopenjdk-11-openj9
 
-Tags: 3.6.3-adoptopenjdk-14, 3.6.3-adoptopenjdk, 3.6-adoptopenjdk-14, 3.6-adoptopenjdk, 3-adoptopenjdk-14, 3-adoptopenjdk, adoptopenjdk
+Tags: 3.6.3-adoptopenjdk-14, 3.6-adoptopenjdk-14, 3-adoptopenjdk-14
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 5768b638a84739d0ad85dbcbe42018075550b109
 Directory: adoptopenjdk-14
 
 Tags: 3.6.3-adoptopenjdk-14-openj9, 3.6-adoptopenjdk-14-openj9, 3-adoptopenjdk-14-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 5768b638a84739d0ad85dbcbe42018075550b109
+GitCommit: b243010db790a1ab8f6a43d26ae86a76cba86b55
 Directory: adoptopenjdk-14-openj9
 
-Tags: 3.6.3-adoptopenjdk-8, 3.6-adoptopenjdk-8, 3-adoptopenjdk-8
+Tags: 3.6.3-adoptopenjdk-15, 3.6.3-adoptopenjdk, 3.6-adoptopenjdk-15, 3.6-adoptopenjdk, 3-adoptopenjdk-15, 3-adoptopenjdk, adoptopenjdk
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ecb160edac810c845116ef70ffbda8bfeca21075
+Directory: adoptopenjdk-15
+
+Tags: 3.6.3-adoptopenjdk-15-openj9, 3.6-adoptopenjdk-15-openj9, 3-adoptopenjdk-15-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: b243010db790a1ab8f6a43d26ae86a76cba86b55
+Directory: adoptopenjdk-15-openj9
+
+Tags: 3.6.3-adoptopenjdk-8, 3.6-adoptopenjdk-8, 3-adoptopenjdk-8
+Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: d98fc55d68cbd5fa8df9e59c95678e1d702b0925
 Directory: adoptopenjdk-8
 
 Tags: 3.6.3-adoptopenjdk-8-openj9, 3.6-adoptopenjdk-8-openj9, 3-adoptopenjdk-8-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 26ba49149787c85b9c51222b47c00879b2a0afde
+GitCommit: b243010db790a1ab8f6a43d26ae86a76cba86b55
 Directory: adoptopenjdk-8-openj9
 
 Tags: 3.6.3-ibmjava-8, 3.6.3-ibmjava, 3.6-ibmjava-8, 3.6-ibmjava, 3-ibmjava-8, 3-ibmjava, ibmjava