From 8200a2a2a70b500ae0d13dd55242402b921addb7 Mon Sep 17 00:00:00 2001 From: Joe Braley <106336504+joe-braley@users.noreply.github.com> Date: Mon, 24 Jul 2023 05:33:14 -0500 Subject: [PATCH 1/2] Updating Microsoft installer (#692) * Update for PSU * fix spec file loc --------- Co-authored-by: joebraley --- .../debian/src/main/packaging/microsoft/11/debian/changelog | 6 ++++++ .../jdk/debian/src/main/packaging/microsoft/11/debian/rules | 2 +- .../debian/src/main/packaging/microsoft/17/debian/changelog | 6 ++++++ .../jdk/debian/src/main/packaging/microsoft/17/debian/rules | 2 +- .../src/main/packaging/microsoft/11/msopenjdk-11.spec | 6 ++++-- .../src/main/packaging/microsoft/17/msopenjdk-17.spec | 6 ++++-- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog index f51fc406f..31faa4c19 100644 --- 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 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 index 7d0ffb2c1..37af5b5eb 100755 --- 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 index 8cd902369..f215e4a50 100644 --- 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 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 index b2fb8d85c..2742ceaa7 100755 --- 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 index 63e6abe14..7e8237ae2 100644 --- 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 11.0.20-1 +- Microsoft 11.0.20+8 initial release. * Tue Apr 18 2023 Microsoft Package Maintainers 11.0.19-1 - Microsoft 11.0.19+7 initial release. * Mon Apr 3 2023 Microsoft Package Maintainers 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 index 17ac7cad4..c160f5c1e 100644 --- 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 17.0.8-1 +- Microsoft 17.0.8+7 initial release. * Tue Apr 18 2023 Microsoft Package Maintainers 17.0.7-1 - Microsoft 17.0.7+7 initial release. * Fri Mar 10 2023 Microsoft Package Maintainers 17.0.6-1 From fd49c698b235d1a08f706acc84c071fcef18c78c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 12:12:27 +0100 Subject: [PATCH 2/2] Bump gradle/wrapper-validation-action from 1.0.6 to 1.1.0 (#695) Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.6 to 1.1.0. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/8d49e559aae34d3e0eb16cde532684bc9702762b...56b90f209b02bf6d1deae490e9ef18b21a389cd4) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0c12901a1..7e32e2923 100644 --- 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