Merge branch 'master' into adipiciu-patch-4

adoptium · Mar 16, 2024 · dda5b68 · dda5b68
2 parents a9e428c + 4ca7781
commit dda5b68
Show file tree

Hide file tree

Showing 107 changed files with 2,196 additions and 276 deletions.
diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml
@@ -20,16 +20,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      - uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
         with:
           java-version: '17'
           java-package: jdk
           architecture: x64
           distribution: 'temurin'
 
-      - uses: jfrog/setup-jfrog-cli@ea63b044d08a3e2d68a22f0c2584483e54a52348 # v3.4.2
+      - uses: jfrog/setup-jfrog-cli@d82fe26823e1f25529250895d5673f65b02af085 # v4.0.1
         env:
           JF_URL: https://adoptium.jfrog.io
           JF_USER: ${{ secrets.ARTIFACTORY_USER }}

diff --git a/.github/workflows/code-freeze.yml b/.github/workflows/code-freeze.yml
@@ -7,6 +7,10 @@ on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   codefreeze:
     uses: adoptium/.github/.github/workflows/code-freeze.yml@main

diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -1,6 +1,10 @@
 name: Dependabot auto-merge
 on: pull_request_target
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   dependabot:
     uses: adoptium/.github/.github/workflows/dependabot-auto-merge.yml@main
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -29,7 +29,7 @@ jobs:
       cacerts: ${{ steps.changes.outputs.cacerts }}
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           fetch-depth: 0
 
@@ -129,9 +129,9 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      - uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
         with:
           java-version: '17'
           java-package: jdk
@@ -164,9 +164,9 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
-      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      - uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
         with:
           java-version: '17'
           java-package: jdk
@@ -197,5 +197,5 @@ jobs:
     if: github.event_name == 'pull_request' || github.repository_owner != 'adoptium'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
diff --git a/.github/workflows/pgkbuild.yml b/.github/workflows/pgkbuild.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-latest
     steps:
 
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
     - name: Install dependencies
       run: brew install --cask packages

diff --git a/.github/workflows/wix.yml b/.github/workflows/wix.yml
@@ -52,7 +52,7 @@ jobs:
     name: wix
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Install dependencies
         run: |

diff --git a/README.md b/README.md
@@ -60,4 +60,7 @@ The following documentation describes how to create and publish these Linux inst
       - For rpm:
         - under sub-folder "\<distro>/\<os_version>/\<arch>/Packages/"
         - file "temurin-\<MAJOR_VERSION>-jdk-*.\<arch>.rpm" exist, e.g: temurin-19-jdk-19.0.1.0.0.10-1.armv7hl.rpm for jdk-19.0.1 hotspot JDK
-
+
+## Troubleshooting Tips
+
+Should errors occur during the upload process, and errant files created on Artifactory, any rogue files must be deleted by an artifactory administrator. Each file should be deleted individually, ahead of any errant folders being deleted. This ensures the artifactory metadata gets refreshed correctly.  This has been seen in this [issue](https://github.com/adoptium/temurin-build/issues/3618) and on rare other occasions.
diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
     }
     parameters {
         choice(name: 'TYPE', choices: Types.ALL, description: 'Build JDK or JRE')
-        choice(name: 'VERSION', choices: ['8', '11', '17', '21'], description: 'Build for specific JDK VERSION')
+        choice(name: 'VERSION', choices: ['8', '11', '17', '21', '22'], description: 'Build for specific JDK VERSION')
         choice(name: 'ARCH', choices: ['x86_64', 'armv7hl', 'armv7l', 'aarch64', 'ppc64le', 's390x', 'all'], description: 'Build for specific platform\n s390x not for VERSION 8\n Use armv7l for DebARM32 armv7hl for RH/Suse')
         choice(name: 'DISTRO', choices: ['all', 'Alpine', 'Debian', 'RedHat', 'Suse'], description: 'Build for specific Distro\n Select RPM builds for RedHat and Suse')
         booleanParam(name: 'uploadPackage', defaultValue: false, description: 'Tick this box to upload the deb/rpm files (exclude src.rpm) to Artifactory for official release')
@@ -211,7 +211,7 @@ def jenkinsStepDeb() {
         debArchAllList.remove('s390x')
     }
     // remove armv7l for JDK20
-    if ("${VERSION}" == '20') {
+    if ("${VERSION}" >= '20') {
         debArchAllList.remove('armv7l')
     }
     debArchAllList.each { DebARCH ->
@@ -233,7 +233,7 @@ def jenkinsStepDeb() {
             buildAndTest('Debian', "${DebARCH}","${VERSION}")
             if (params.uploadPackage.toBoolean()) {
                 echo "Upload artifacts for ${VERSION} - ${DebARCH} - Debian"
-                uploadArtifacts('Debian', "${DebARCH}")
+                uploadArtifacts('Debian', "${DebARCH}", "${VERSION}")
             }
         }
     }
@@ -253,7 +253,7 @@ def jenkinsStepAlpine() {
         apkArchAllList = ['x86_64', 'aarch64']
     }
     // remove aarch64 for JDK20 and below
-    if ("${VERSION}" != '21') {
+    if (${VERSION} -lt 21) {
         apkArchAllList.remove('aarch64')
     }
 
@@ -272,7 +272,7 @@ def jenkinsStepAlpine() {
             buildAndTest('Alpine', "${ApkARCH}", "${VERSION}")
             if (params.uploadPackage.toBoolean()) {
                 echo "Upload artifacts for ${VERSION} - ${ApkARCH} - Alpine"
-                uploadArtifacts('Alpine', "${ApkARCH}")
+                uploadArtifacts('Alpine', "${ApkARCH}", "${VERSION}")
             }
         }
     }
@@ -286,7 +286,7 @@ def jenkinsStepNonDeb(String DISTRO) {
     buildAndTest("${DISTRO}", "${ARCH}", "${VERSION}")
     if (params.uploadPackage.toBoolean()) {
         echo "Upload artifacts for ${VERSION} - ${ARCH} - ${DISTRO}"
-        uploadArtifacts("${DISTRO}", "${ARCH}")
+        uploadArtifacts("${DISTRO}", "${ARCH}", "${VERSION}")
     }
 }
 
@@ -348,10 +348,10 @@ private void buildCli(String DISTRO, String buildArch, String GPG_KEY = null, St
     sh(buildCli)
 }
 
-def uploadArtifacts(String DISTRO, String buildArch) {
+def uploadArtifacts(String DISTRO, String buildArch, String Version) {
     switch(DISTRO) {
         case "Debian":
-            uploadDebArtifacts(buildArch)
+            uploadDebArtifacts(buildArch, Version)
             break
         case "Alpine":
             uploadAlpineArtifacts(buildArch)
@@ -381,7 +381,8 @@ def uploadAlpineArtifacts(String buildArch) {
     // unset BUILDARCH environment variable
 }
 
-def uploadDebArtifacts(String buildArch) {
+def uploadDebArtifacts(String buildArch, String Version) {
+    env.VERSION = Version
     def Distro = "Debian"
     def debArchList = [
         'x86_64' : 'amd64',
@@ -395,7 +396,7 @@ def uploadDebArtifacts(String buildArch) {
         debArchList.remove('s390x')
     }
     // if VERSION is 20 remove armv7l from the list
-    if (VERSION == '20') {
+    if (VERSION >= '20') {
         debArchList.remove('armv7l')
     }
 
@@ -410,7 +411,7 @@ def uploadDebArtifacts(String buildArch) {
             "buster",   // Debian/10
             "jammy",    // Ubuntu/22.04 (LTS)
             "focal",    // Ubuntu/20.04 (LTS)
-            "bionic",   // Ubuntu/18.04 (LTS)
+            "bionic"   // Ubuntu/18.04 (LTS)
     ]
     def distro_list = ''
     deb_versions.each { deb_version ->
@@ -433,6 +434,7 @@ def uploadDebArtifacts(String buildArch) {
             def PackFiles = findFiles(glob: "**/build/ospackage/temurin-*${debArchList[buildArch]}.deb") // List All Packages To Upload
             for (PackFile in PackFiles) {
               def FileName = PackFile.name
+              echo "Prepare For Version = ${VERSION}"
               def Target = "https://adoptium.jfrog.io/artifactory/deb/pool/main/t/temurin-${VERSION}/${FileName}"
 
               CheckAndUpload(Target, Distro, BUILDARCH, VERSION, DISTROLIST, '', '', '', '' )
@@ -459,11 +461,11 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
             'rpm/oraclelinux/7',
             'rpm/oraclelinux/8',
             'rpm/amazonlinux/2'
-
         ],
         'suse'   : [
             'rpm/opensuse/15.3',
             'rpm/opensuse/15.4',
+            'rpm/opensuse/15.5',
             'rpm/sles/12',
             'rpm/sles/15'
         ]
@@ -481,7 +483,7 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
         rpmArchList.remove('s390x')
     }
     // if VERSION is 20 remove armv7hl from the list
-    if (VERSION == '20') {
+    if (VERSION >= '20') {
         rpmArchList.remove('armv7hl')
     }
 

diff --git a/linux/README.md b/linux/README.md
@@ -229,6 +229,7 @@ SRPM also available.
 | oraclelinux/8 |         x86_64         |                                             |
 | opensuse/15.3 |         x86_64         |                                             |
 | opensuse/15.4 |         x86_64         |                                             |
+| opensuse/15.5 |         x86_64         |                                             |
 | rocky/8       |         x86_64         |                                             |
 | rpm/rhel/7    |         x86_64         |                                             |
 | rpm/rhel/8    |         x86_64         |                                             |

diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.7"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jdk/alpine/build.gradle b/linux/jdk/alpine/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.3"
-	assertjCoreVersion = "3.25.1"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.7"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-11
-pkgver=11.0.21_p9
+pkgver=11.0.22_p7
 # replace _p1 with _1
 _pkgver=${pkgver/_p/_}
 _pkgverplus=${pkgver/_p/+}
@@ -95,7 +95,7 @@ _jdk() {
 }
 
 sha256sums="
-d5e2235d3707526f7c9ba3f0dc194e60d5dec33eceff2a2dcf9d874464cc0e9e  OpenJDK11U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
+b541c99a5de71ebbe53e7815f9222e377b814fa1025f9f5274cb7bad226809f8  OpenJDK11U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
 e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378  HelloWorld.java
 22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0  TestCryptoLevel.java
 9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933  TestECDSA.java

diff --git a/linux/jdk/alpine/src/main/packaging/temurin/17/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/17/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-17
-pkgver=17.0.9_p9
+pkgver=17.0.10_p7
 # replace _p1 with _1
 _pkgver=${pkgver/_p/_}
 _pkgverplus=${pkgver/_p/+}
@@ -95,7 +95,7 @@ _jdk() {
 }
 
 sha256sums="
-c2a571a56e5bd3f30956b17b048880078c7801ed9e8754af6d1e38b9176059a9  OpenJDK17U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
+ce4085548f73ec97fa870de3f7da87634b4cbbf9753600365e2e0b255585e7e1  OpenJDK17U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
 e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378  HelloWorld.java
 22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0  TestCryptoLevel.java
 9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933  TestECDSA.java

diff --git a/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-21
-pkgver=21.0.1_p12
+pkgver=21.0.2_p13
 # replace _p1 with _1
 _pkgver=${pkgver/_p/_}
 _pkgverplus=${pkgver/_p/+}
@@ -97,10 +97,10 @@ _jdk() {
 
 case "$CARCH" in
 	x86_64)
-		_arch_sum="422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff"
+		_arch_sum="f1aef3652dd52778e81eb4897a88a34e38ca0159d22f160f7205e69907a0f14d"
 		;;
 	aarch64)
-		_arch_sum="77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c"
+		_arch_sum="ae933ea8eeb4a077f19277842ba95ba93d29177e44d53cec7a98afd3b9abb2c3"
 		;;
 esac