Merge branch 'master' into dependabot/gradle/linux/org.junit.jupiter-…

…junit-jupiter-5.10.0
adoptium · Jul 24, 2023 · 78ab917 · 78ab917
2 parents f6910a9 + fd49c69
commit 78ab917
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 7 deletions.
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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # v1.0.6
+      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-11 (11.0.20-1) STABLE; urgency=medium
+
+  * Microsoft 11.0.20-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Fri, 07 Jul 2023 23:05:13 +0000
+
 msopenjdk-11 (11.0.19-1) STABLE; urgency=medium
 
   * Microsoft 11.0.19-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-11
 priority = 1111
 jvm_tools = jaotc jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jjs jlink jmap jmod jps jrunscript jshell jstack jstat jstatd keytool pack200 rmic rmid rmiregistry serialver unpack200 jexec jspawnhelper
-url_version = 11.0.19
+url_version = 11.0.20
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/17/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/17/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-17 (17.0.8-1) STABLE; urgency=medium
+
+  * Microsoft 17.0.8-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Fri, 07 Jul 2023 19:29:34 +0000
+
 msopenjdk-17 (17.0.7-1) STABLE; urgency=medium
 
   * Microsoft 17.0.7-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/17/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/17/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-17
 priority = 1711
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd keytool rmiregistry serialver jexec jspawnhelper
-url_version = 17.0.7
+url_version = 17.0.8
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/11/msopenjdk-11.spec b/linux/jdk/redhat/src/main/packaging/microsoft/11/msopenjdk-11.spec
@@ -1,7 +1,7 @@
-%global upstream_version 11.0.19+7
+%global upstream_version 11.0.20+8
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 11.0.19
+%global spec_version 11.0.20
 %global spec_release 1
 %global priority 1111
 
@@ -228,6 +228,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 # Make below specific 
 %changelog
+* Fri Jul 07 2023 Microsoft Package Maintainers <[email protected]> 11.0.20-1
+- Microsoft 11.0.20+8 initial release.
 * Tue Apr 18 2023 Microsoft Package Maintainers <[email protected]> 11.0.19-1
 - Microsoft 11.0.19+7 initial release.
 * Mon Apr 3 2023 Microsoft Package Maintainers <[email protected]> 11.0.18-1

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/17/msopenjdk-17.spec b/linux/jdk/redhat/src/main/packaging/microsoft/17/msopenjdk-17.spec
@@ -1,7 +1,7 @@
-%global upstream_version 17.0.7+7
+%global upstream_version 17.0.8+7
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 17.0.7
+%global spec_version 17.0.8
 %global spec_release 1
 %global priority 1161
 
@@ -225,6 +225,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Fri Jul 07 2023 Microsoft Package Maintainers <[email protected]> 17.0.8-1
+- Microsoft 17.0.8+7 initial release.
 * Tue Apr 18 2023 Microsoft Package Maintainers <[email protected]> 17.0.7-1
 - Microsoft 17.0.7+7 initial release.
 * Fri Mar 10 2023 Microsoft Package Maintainers <[email protected]> 17.0.6-1