Merge branch 'master' into adipiciu-patch-1

adoptium · Feb 12, 2024 · d1ceb9c · d1ceb9c
2 parents 0a262d4 + 86dd4a9
commit d1ceb9c
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 39 deletions.
diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml
@@ -29,7 +29,7 @@ jobs:
           architecture: x64
           distribution: 'temurin'
 
-      - uses: jfrog/setup-jfrog-cli@0f30b43d62ccad81fba40748d2c671c4665b2d27 # v3.5.3
+      - uses: jfrog/setup-jfrog-cli@26da2259ee7690e63b5410d7451b2938d08ce1f9 # v4.0.0
         env:
           JF_URL: https://adoptium.jfrog.io
           JF_USER: ${{ secrets.ARTIFACTORY_USER }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -198,4 +198,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
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.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	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.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jdk/debian/build.gradle b/linux/jdk/debian/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules
@@ -59,9 +59,6 @@ override_dh_auto_install:
 	# Add jinfo file (alternatives support).
 	cp debian/jinfo "$(d)/$(jvm_home)/.$(pkg_alias).jinfo"
 
-	# Strip bundled Freetype and use OS package instead.
-	rm -f "$(d)/$(jvm_home)/$(jvm_dir)/lib/libfreetype.so"
-
 	# Replace bundled cacerts and redirect to adoptium-ca-certificates.
 	rm -f "$(d)/$(jvm_home)/$(jvm_dir)/lib/security/cacerts"
 	ln -s /etc/ssl/certs/adoptium/cacerts "$(d)/$(jvm_home)/$(jvm_dir)/lib/security/cacerts"

diff --git a/linux/jdk/redhat/build.gradle b/linux/jdk/redhat/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -135,9 +135,6 @@ mkdir -p %{buildroot}%{prefix}
 cd %{buildroot}%{prefix}
 tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
 
-# Strip bundled Freetype and use OS package instead.
-rm -f "%{buildroot}%{prefix}/lib/libfreetype.so"
-
 # Use cacerts included in OS
 rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
 pushd "%{buildroot}%{prefix}/lib/security"

diff --git a/linux/jdk/suse/build.gradle b/linux/jdk/suse/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -128,9 +128,6 @@ mkdir -p %{buildroot}%{prefix}
 cd %{buildroot}%{prefix}
 tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
 
-# Strip bundled Freetype and use OS package instead.
-rm -f "%{buildroot}%{prefix}/lib/libfreetype.so"
-
 # Use cacerts included in OS
 rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
 pushd "%{buildroot}%{prefix}/lib/security"

diff --git a/linux/jre/alpine/build.gradle b/linux/jre/alpine/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jre/debian/build.gradle b/linux/jre/debian/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jre/redhat/build.gradle b/linux/jre/redhat/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/linux/jre/suse/build.gradle b/linux/jre/suse/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 ext {
-	junitVersion = "5.10.1"
-	testcontainersVersion = "1.19.4"
-	assertjCoreVersion = "3.25.2"
+	junitVersion = "5.10.2"
+	testcontainersVersion = "1.19.5"
+	assertjCoreVersion = "3.25.3"
 }
 
 repositories {

diff --git a/wix/Lang/OpenJDK.Base.en-us.wxl.template b/wix/Lang/OpenJDK.Base.en-us.wxl.template
@@ -17,7 +17,7 @@
 	<String Id="FeatureJarFileRunWithDescription">Associate .jar files to run with {vendor_branding}</String>
 	<String Id="DowngradeDenied">"A later version of [ProductName] is already installed. Setup will now exit."</String>
 	<String Id="FeatureOracleJavaSoftName">JavaSoft (Oracle) registry keys</String>
-	<String Id="FeatureOracleJavaSoftDescription">Overwrites the reg keys HKLM\Software\JavaSoft (Oracle). After uninstallation of {vendor_branding}, Oracle Java running from PATH "C:\Program Files (x86)\Common Files\Oracle\Java\javapath" does not work. You need to reinstall it to recreate these registry keys</String>
+	<String Id="FeatureOracleJavaSoftDescription">Overwrites Oracle's reg key HKLM\Software\JavaSoft. After uninstallation of {vendor_branding}, Oracle Java needs to be reinstalled to re-create these registry keys.</String>
 	<String Id="FeatureIcedTeaWebTitle">IcedTea-Web</String>
 	<String Id="FeatureIcedTeaWebDescription">Install the IcedTea-Web package</String>
 	<String Id="FeatureJNLPFileRunWithTitle">Associate .jnlp</String>