From f36d74f5e8d1672303e40bc7e976aa06a519815f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:35:16 +0000 Subject: [PATCH 1/3] Bump the gradle group with 18 updates Bumps the gradle group with 18 updates: | Package | From | To | | --- | --- | --- | | [com.opencastsoftware:prettier4j](https://github.com/opencastsoftware/prettier4j) | `0.1.1` | `0.3.1` | | org.apache.maven:maven-resolver-provider | `3.8.6` | `3.9.9` | | [org.apache.maven.resolver:maven-resolver-api](https://github.com/apache/maven-resolver) | `1.9.2` | `1.9.22` | | [org.apache.maven.resolver:maven-resolver-spi](https://github.com/apache/maven-resolver) | `1.9.2` | `1.9.22` | | [org.apache.maven.resolver:maven-resolver-util](https://github.com/apache/maven-resolver) | `1.9.2` | `1.9.22` | | [org.apache.maven.resolver:maven-resolver-impl](https://github.com/apache/maven-resolver) | `1.9.2` | `1.9.22` | | [org.apache.maven.resolver:maven-resolver-connector-basic](https://github.com/apache/maven-resolver) | `1.9.2` | `1.9.22` | | [org.apache.maven.resolver:maven-resolver-transport-file](https://github.com/apache/maven-resolver) | `1.9.2` | `1.9.22` | | org.apache.maven.resolver:maven-resolver-transport-http | `1.9.2` | `1.9.22` | | [org.junit:junit-bom](https://github.com/junit-team/junit5) | `5.11.3` | `5.12.2` | | [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.11.3` | `5.12.2` | | [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.11.3` | `5.12.2` | | [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) | `5.11.3` | `5.12.2` | | [org.assertj:assertj-core](https://github.com/assertj/assertj) | `3.26.3` | `3.27.3` | | [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) | `7.0.2` | `7.0.3` | | [software.amazon.smithy.gradle.smithy-jar](https://github.com/smithy-lang/smithy-gradle-plugin) | `1.1.0` | `1.2.0` | | [com.gradleup.shadow](https://github.com/GradleUp/shadow) | `8.3.5` | `8.3.6` | | org.jreleaser | `1.15.0` | `1.17.0` | Updates `com.opencastsoftware:prettier4j` from 0.1.1 to 0.3.1 - [Release notes](https://github.com/opencastsoftware/prettier4j/releases) - [Commits](https://github.com/opencastsoftware/prettier4j/compare/v0.1.1...v0.3.1) Updates `org.apache.maven:maven-resolver-provider` from 3.8.6 to 3.9.9 Updates `org.apache.maven.resolver:maven-resolver-api` from 1.9.2 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.2...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-spi` from 1.9.2 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.2...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-util` from 1.9.2 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.2...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-impl` from 1.9.2 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.2...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-connector-basic` from 1.9.2 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.2...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-transport-file` from 1.9.2 to 1.9.22 - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.2...maven-resolver-1.9.22) Updates `org.apache.maven.resolver:maven-resolver-transport-http` from 1.9.2 to 1.9.22 Updates `org.junit:junit-bom` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.3 to 5.12.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.3...r5.12.2) Updates `org.assertj:assertj-core` from 3.26.3 to 3.27.3 - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.3...assertj-build-3.27.3) Updates `com.diffplug.spotless:spotless-plugin-gradle` from 7.0.2 to 7.0.3 - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/gradle/7.0.2...gradle/7.0.3) Updates `software.amazon.smithy.gradle.smithy-jar` from 1.1.0 to 1.2.0 - [Changelog](https://github.com/smithy-lang/smithy-gradle-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/smithy-lang/smithy-gradle-plugin/compare/1.1.0...1.2.0) Updates `com.gradleup.shadow` from 8.3.5 to 8.3.6 - [Release notes](https://github.com/GradleUp/shadow/releases) - [Commits](https://github.com/GradleUp/shadow/compare/8.3.5...8.3.6) Updates `org.jreleaser` from 1.15.0 to 1.17.0 --- updated-dependencies: - dependency-name: com.opencastsoftware:prettier4j dependency-version: 0.3.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.maven:maven-resolver-provider dependency-version: 3.9.9 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-api dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-spi dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-util dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-impl dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-connector-basic dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-transport-file dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.apache.maven.resolver:maven-resolver-transport-http dependency-version: 1.9.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.junit:junit-bom dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 5.12.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.assertj:assertj-core dependency-version: 3.27.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-version: 7.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: software.amazon.smithy.gradle.smithy-jar dependency-version: 1.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: com.gradleup.shadow dependency-version: 8.3.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle - dependency-name: org.jreleaser dependency-version: 1.17.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 678b0b41313..99290bec732 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,21 @@ [versions] -junit5 = "5.11.3" +junit5 = "5.12.2" hamcrest = "3.0" jmh = "0.6.6" spotbugs = "6.0.22" -spotless = "7.0.2" -smithy-gradle = "1.1.0" -assertj = "3.26.3" -prettier4j = "0.1.1" -maven-resolver-provider = "3.8.6" -maven-resolver = "1.9.2" +spotless = "7.0.3" +smithy-gradle = "1.2.0" +assertj = "3.27.3" +prettier4j = "0.3.1" +maven-resolver-provider = "3.9.9" +maven-resolver = "1.9.22" slf4j = "1.7.36" mockserver = "3.10.8" compile-testing = "0.21.0" json-schema = "1.12.1" -shadow = "8.3.5" +shadow = "8.3.6" api-guardian = "1.1.2" -jreleaser = "1.15.0" +jreleaser = "1.17.0" runtime = "1.13.1" gradle-checksum = "1.4.0" From 2f40d644ebec9dc77466c34655e6379c8db58326 Mon Sep 17 00:00:00 2001 From: Yefri Gaitan <34199474+yefrig@users.noreply.github.com> Date: Thu, 17 Apr 2025 11:19:59 -0400 Subject: [PATCH 2/3] Hold prettier4j minor version as it introduces a breaking change --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 99290bec732..85264d36f16 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ spotbugs = "6.0.22" spotless = "7.0.3" smithy-gradle = "1.2.0" assertj = "3.27.3" -prettier4j = "0.3.1" +prettier4j = "0.3.0" maven-resolver-provider = "3.9.9" maven-resolver = "1.9.22" slf4j = "1.7.36" From ded75a22b951daa080580b28321463bde2f7831e Mon Sep 17 00:00:00 2001 From: Yefri Gaitan <34199474+yefrig@users.noreply.github.com> Date: Thu, 17 Apr 2025 14:30:49 -0400 Subject: [PATCH 3/3] Fix up expected string after maven resolver updates --- .../it/java/software/amazon/smithy/cli/MavenResolverTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverTest.java b/smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverTest.java index 9e0f2355591..4a05f2c3a3f 100644 --- a/smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverTest.java +++ b/smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverTest.java @@ -69,7 +69,7 @@ public void lowerSmithyVersionsAreUpgradedToNewerVersionsQuiet() { public void failsWhenBadVersionRequested() { IntegUtils.run("bad-smithy-version", ListUtils.of("validate"), result -> { assertThat(result.getExitCode(), equalTo(1)); - assertThat(result.getOutput(), containsString("software.amazon.smithy:smithy-model:jar:[999.999.999]")); + assertThat(result.getOutput(), containsString("software.amazon.smithy:smithy-model:jar:999.999.999")); }); }