From 0b476f1c5f9dbcf99fdd2c385afdab6e83501a88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 05:01:41 +0000 Subject: [PATCH 1/2] Bump org.apache.maven:maven-parent from 42 to 43 Bumps [org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 42 to 43. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits) --- updated-dependencies: - dependency-name: org.apache.maven:maven-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35baf93..00b1e12 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven maven-parent - 42 + 43 From 98ba100c60c08b8e6942eb7a522a26be9a7d9cbd Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 27 Jan 2025 18:15:53 +0100 Subject: [PATCH 2/2] Code style fixes --- .../api/di/testing/MavenDIExtension.java | 2 +- .../api/plugin/testing/MojoExtension.java | 31 ++++++++++++++++--- .../api/plugin/testing/stubs/ProjectStub.java | 17 ++++++++-- .../api/plugin/testing/stubs/SessionMock.java | 1 + 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java index c6f3b86..82802bc 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java @@ -18,7 +18,7 @@ */ package org.apache.maven.api.di.testing; -import java.io.*; +import java.io.File; import org.apache.maven.di.Injector; import org.apache.maven.di.Key; diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java index 30ab673..1c813a3 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java @@ -18,7 +18,12 @@ */ package org.apache.maven.api.plugin.testing; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; import java.lang.reflect.AccessibleObject; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; @@ -26,7 +31,15 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -46,7 +59,12 @@ import org.apache.maven.api.plugin.descriptor.MojoDescriptor; import org.apache.maven.api.plugin.descriptor.Parameter; import org.apache.maven.api.plugin.descriptor.PluginDescriptor; -import org.apache.maven.api.plugin.testing.stubs.*; +import org.apache.maven.api.plugin.testing.stubs.MojoExecutionStub; +import org.apache.maven.api.plugin.testing.stubs.PluginStub; +import org.apache.maven.api.plugin.testing.stubs.ProducedArtifactStub; +import org.apache.maven.api.plugin.testing.stubs.ProjectStub; +import org.apache.maven.api.plugin.testing.stubs.RepositorySystemSupplier; +import org.apache.maven.api.plugin.testing.stubs.SessionMock; import org.apache.maven.api.services.ArtifactDeployer; import org.apache.maven.api.services.ArtifactFactory; import org.apache.maven.api.services.ArtifactInstaller; @@ -81,7 +99,11 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.eclipse.aether.RepositorySystem; -import org.junit.jupiter.api.extension.*; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ParameterResolver; import org.junit.platform.commons.support.AnnotationSupport; import org.slf4j.LoggerFactory; @@ -212,6 +234,7 @@ private static String getGoalFromMojoImplementationClass(Class cl) throws IOE } @Override + @SuppressWarnings("checkstyle:MethodLength") public void beforeEach(ExtensionContext context) throws Exception { if (pluginBasedir == null) { pluginBasedir = MavenDIExtension.getBasedir(); diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java index b057c18..81b9021 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java @@ -19,9 +19,20 @@ package org.apache.maven.api.plugin.testing.stubs; import java.nio.file.Path; -import java.util.*; - -import org.apache.maven.api.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import org.apache.maven.api.DependencyCoordinates; +import org.apache.maven.api.Language; +import org.apache.maven.api.Packaging; +import org.apache.maven.api.PathType; +import org.apache.maven.api.ProducedArtifact; +import org.apache.maven.api.Project; +import org.apache.maven.api.Type; import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.model.Model; import org.apache.maven.api.model.PluginContainer; diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java index f8562d0..9261731 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java @@ -85,6 +85,7 @@ public static InternalSession getMockSession(String localRepo) { return getMockSession(localRepository); } + @SuppressWarnings("checkstyle:MethodLength") public static InternalSession getMockSession(LocalRepository localRepository) { InternalSession session = mock(InternalSession.class);