From 72b415e498c27a04a683b1bde29e2ab031945904 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 31 Mar 2025 08:15:21 -0400 Subject: [PATCH 1/2] Remove methods that duplicate superclass methods --- .../maven/project/DefaultMavenProjectBuilderTest.java | 5 ----- .../org/apache/maven/impl/model/DefaultModelValidator.java | 6 ------ 2 files changed, 11 deletions(-) diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index dd77dc16bf2e..5139c96ac447 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -149,11 +149,6 @@ void testBuildStubModelForMissingRemotePom() throws Exception { assertFalse(project.isExecutionRoot()); } - @Override - protected ArtifactRepository getLocalRepository() throws Exception { - return repositorySystem.createLocalRepository(getLocalRepositoryPath()); - } - @Test void testPartialResultUponBadDependencyDeclaration() throws Exception { File pomFile = getTestFile("src/test/resources/projects/bad-dependency.xml"); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java index 712de25dace1..2e13c5844926 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java @@ -127,12 +127,6 @@ public Activation transformActivation(Activation target) { } } - @Override - protected Activation.Builder transformActivation_ActiveByDefault( - Supplier creator, Activation.Builder builder, Activation target) { - return builder; - } - @Override protected Activation.Builder transformActivation_File( Supplier creator, Activation.Builder builder, Activation target) { From 4c62cef3244f07acfa2539239871c9634a88fc52 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 31 Mar 2025 08:45:03 -0400 Subject: [PATCH 2/2] spotless --- .../org/apache/maven/project/DefaultMavenProjectBuilderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 5139c96ac447..9f7cc8ebe014 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -28,7 +28,6 @@ import org.apache.maven.api.model.InputLocation; import org.apache.maven.api.model.InputSource; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.impl.InternalSession; import org.apache.maven.internal.impl.DefaultProject; import org.apache.maven.internal.impl.InternalMavenSession;