From ddf1532685a776cd766e1254c78472054c497f81 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 21 Nov 2024 10:15:17 -0500 Subject: [PATCH] wip --- .../maven/plugins/checkstyle/AbstractCheckstyleReport.java | 6 +----- .../plugins/checkstyle/exec/DefaultCheckstyleExecutor.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java index 76096446..947f42ae 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java @@ -18,8 +18,6 @@ */ package org.apache.maven.plugins.checkstyle; -import javax.inject.Named; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; @@ -455,9 +453,7 @@ public abstract class AbstractCheckstyleReport extends AbstractMavenReport { protected ByteArrayOutputStream stringOutputStream; public AbstractCheckstyleReport( - final ResourceManager locator, - final @Named("default") CheckstyleExecutor checkstyleExecutor, - final I18N i18n) { + final ResourceManager locator, final CheckstyleExecutor checkstyleExecutor, final I18N i18n) { this.locator = locator; this.checkstyleExecutor = checkstyleExecutor; this.i18n = i18n; diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java index 7472d154..588372c9 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java @@ -64,7 +64,7 @@ * @author Olivier Lamy * @since 2.5 */ -@Named("default") +@Named @Typed(CheckstyleExecutor.class) public class DefaultCheckstyleExecutor extends AbstractLogEnabled implements CheckstyleExecutor { private final ResourceManager locator;