Remove commented code (#356)

apache · Feb 23, 2025 · fbfc018 · fbfc018
1 parent 0912674
commit fbfc018
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/...ules/src/main/java/org/apache/maven/enforcer/rules/BanDuplicatePomDependencyVersions.java b/...ules/src/main/java/org/apache/maven/enforcer/rules/BanDuplicatePomDependencyVersions.java
@@ -62,32 +62,12 @@ public void execute() throws EnforcerRuleException {
         // re-read model, because M3 uses optimized model
         MavenXpp3Reader modelReader = new MavenXpp3Reader();
 
-        Model model;
         try (FileInputStream pomInputStream = new FileInputStream(project.getFile())) {
-            model = modelReader.read(pomInputStream, false);
+            Model model = modelReader.read(pomInputStream, false);
+            maven2Validation(model);
         } catch (IOException | XmlPullParserException e) {
             throw new EnforcerRuleError("Unable to retrieve the MavenProject: ", e);
         }
-
-        // @todo reuse ModelValidator when possible
-
-        // Object modelValidator = null;
-        // try
-        // {
-        // modelValidator = helper.getComponent( "org.apache.maven.model.validation.ModelValidator" );
-        // }
-        // catch ( ComponentLookupException e1 )
-        // {
-        // // noop
-        // }
-
-        // if( modelValidator == null )
-        // {
-        maven2Validation(model);
-        // }
-        // else
-        // {
-        // }
     }
 
     private void maven2Validation(Model model) throws EnforcerRuleException {

diff --git a/...ules/src/test/java/org/apache/maven/enforcer/rules/dependency/RequireReleaseDepsTest.java b/...ules/src/test/java/org/apache/maven/enforcer/rules/dependency/RequireReleaseDepsTest.java
@@ -26,7 +26,6 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.testing.ArtifactStubFactory;
 import org.apache.maven.project.MavenProject;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -62,12 +61,6 @@ class RequireReleaseDepsTest {
     @InjectMocks
     private RequireReleaseDeps rule;
 
-    @BeforeEach
-    void setUp() {
-        // ruleHelper = EnforcerTestUtils.getHelper(project);
-        // rule = new RequireReleaseDeps();
-    }
-
     @Test
     void testSearchNonTransitive() throws IOException {
         when(session.getCurrentProject()).thenReturn(project);