From 304563b2ba4911254013374cad2014c496188094 Mon Sep 17 00:00:00 2001 From: Alexis Date: Thu, 29 Aug 2024 20:04:11 +0200 Subject: [PATCH] Update dependencies and plugins - Update the `maven-core` dependency to `3.9.9` - Update `maven-resolver-connector-basic` and `maven-resolver-transport-http` dependencies to `1.9.22` - Update the `gradle-tooling-api` dependency to `8.10` - Update the `github-api` dependency to `1.324` - Update the `commons-cli` dependency to `1.9.0` - Update the `junit-jupiter` dependency to `5.11.0` - Update `mockito-core` and `mockito-junit-jupiter` dependencies to `5.13.0` - Update the `maven-pmd-plugin` plugin to `3.25.0` - Update `maven-surefire-plugin` and `maven-failsafe-plugin` plugins to `3.5.0` - Update the `maven-javadoc-plugin` plugin to `3.10.0` - Update the `maven-gpg-plugin` plugin to `3.2.5` --- CHANGELOG.md | 12 ++++++- pom.xml | 32 +++++++++---------- .../artifact/type/GradleArtifactType.java | 2 +- .../artifact/type/MavenArtifactType.java | 2 +- .../build/resolver/GradleBuildResolverIT.java | 9 +++++- 5 files changed, 37 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fea15c9..fab6790 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,18 @@ ## 1.7.0 (unreleased) ### Notes +- Update the `maven-core` dependency to `3.9.9` +- Update `maven-resolver-connector-basic` and `maven-resolver-transport-http` dependencies to `1.9.22` +- Update the `gradle-tooling-api` dependency to `8.10` +- Update the `github-api` dependency to `1.324` +- Update the `commons-cli` dependency to `1.9.0` +- Update the `junit-jupiter` dependency to `5.11.0` +- Update `mockito-core` and `mockito-junit-jupiter` dependencies to `5.13.0` +- Update the `maven-pmd-plugin` plugin to `3.25.0` - Update `pmd-core` and `pmd-java` dependencies to `7.4.0` -- Update the `maven-javadoc-plugin` plugin to `3.8.0` +- Update `maven-surefire-plugin` and `maven-failsafe-plugin` plugins to `3.5.0` +- Update the `maven-javadoc-plugin` plugin to `3.10.0` +- Update the `maven-gpg-plugin` plugin to `3.2.5` ## [1.6.2](https://github.com/AlexisJehan/MvnCheck/releases/tag/v1.6.2) (2024-07-16) diff --git a/pom.xml b/pom.xml index fb035ab..99fa844 100644 --- a/pom.xml +++ b/pom.xml @@ -72,46 +72,46 @@ org.apache.maven maven-core - 3.9.8 + 3.9.9 org.apache.maven.resolver maven-resolver-connector-basic - 1.9.20 + 1.9.22 runtime org.apache.maven.resolver maven-resolver-transport-http - 1.9.20 + 1.9.22 runtime org.gradle gradle-tooling-api - 8.9 + 8.10 org.kohsuke github-api - 1.323 + 1.324 com.infradna.tool bridge-method-annotation - 1.29 + 1.29 provided com.github.spotbugs spotbugs-annotations - 4.8.6 + 4.8.6 provided commons-cli commons-cli - 1.8.0 + 1.9.0 org.fusesource.jansi @@ -145,7 +145,7 @@ org.junit.jupiter junit-jupiter - 5.10.3 + 5.11.0 test @@ -157,13 +157,13 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 test org.mockito mockito-junit-jupiter - 5.12.0 + 5.13.0 test @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.24.0 + 3.25.0 pmd-check @@ -266,7 +266,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.1 + 3.5.0 ${argLine} -Xshare:off -XX:+EnableDynamicAgentLoading @@ -275,7 +275,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.1 + 3.5.0 failsafe-integration-test @@ -364,7 +364,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 javadoc-jar @@ -436,7 +436,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.5 gpg-sign diff --git a/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/GradleArtifactType.java b/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/GradleArtifactType.java index aa9b01f..c02a5b4 100644 --- a/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/GradleArtifactType.java +++ b/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/GradleArtifactType.java @@ -29,7 +29,7 @@ /** *

Enumeration of Gradle artifact types.

- *

Note: Based on {@code org.gradle:gradle-tooling-api:8.9}.

+ *

Note: Based on {@code org.gradle:gradle-tooling-api:8.10}.

* @see https://docs.gradle.org/current/userguide/java_plugin.html#sec:java_plugin_and_dependency_management * @see https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_configurations_graph * @since 1.0.0 diff --git a/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/MavenArtifactType.java b/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/MavenArtifactType.java index 5c37c1a..5ba2796 100644 --- a/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/MavenArtifactType.java +++ b/src/main/java/com/github/alexisjehan/mvncheck/core/component/artifact/type/MavenArtifactType.java @@ -27,7 +27,7 @@ /** *

Enumeration of Maven artifact types.

- *

Note: Based on {@code org.apache.maven:maven-core:3.9.8}.

+ *

Note: Based on {@code org.apache.maven:maven-core:3.9.9}.

* @see https://maven.apache.org/ref/current/maven-model/maven.html * @since 1.0.0 */ diff --git a/src/test/java/com/github/alexisjehan/mvncheck/core/component/build/resolver/GradleBuildResolverIT.java b/src/test/java/com/github/alexisjehan/mvncheck/core/component/build/resolver/GradleBuildResolverIT.java index 4a39dc7..a0e2d71 100644 --- a/src/test/java/com/github/alexisjehan/mvncheck/core/component/build/resolver/GradleBuildResolverIT.java +++ b/src/test/java/com/github/alexisjehan/mvncheck/core/component/build/resolver/GradleBuildResolverIT.java @@ -56,7 +56,7 @@ final class GradleBuildResolverIT { @Test void testUpToDate() { - assertThat(GradleUtils.VERSION).startsWith("8.9"); // Ensure tests are up-to-date after updating Gradle + assertThat(GradleUtils.VERSION).startsWith("8.10"); // Ensure tests are up-to-date after updating Gradle } @ParameterizedTest @@ -150,6 +150,13 @@ void testResolveSinceGradle68UntilJava22(final String gradleVersion, @TempDir fi testResolveSinceGradle68(gradleVersion, tmpDirectory); } + @ParameterizedTest + @EnabledForJreRange(max = JRE.JAVA_23) + @ValueSource(strings = "8.10") + void testResolveSinceGradle68UntilJava23(final String gradleVersion, @TempDir final Path tmpDirectory) { + testResolveSinceGradle68(gradleVersion, tmpDirectory); + } + private void testResolveUntilGradle67(final String gradleVersion, final Path tmpDirectory) { try (var mockedStaticGradleUtils = Mockito.mockStatic(GradleUtils.class)) { mockedStaticGradleUtils.when(GradleUtils::retrieveOptionalHome)