You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/02/24 16:01:36 UTC
[maven-doxia-converter] branch mvn4 updated: Switch a few core plugins to the new api
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
The following commit(s) were added to refs/heads/mvn4 by this push:
new 11b3d18 Switch a few core plugins to the new api
11b3d18 is described below
commit 11b3d18b6b08a9fb100087f9388e4cd6f59aa4e9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Feb 24 17:00:55 2022 +0100
Switch a few core plugins to the new api
---
pom.xml | 7 +++++++
.../java/org/apache/maven/doxia/Converter.java | 2 --
.../org/apache/maven/doxia/DefaultConverter.java | 22 +++++-----------------
.../org/apache/maven/doxia/cli/ConverterCli.java | 8 --------
4 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index db17387..1afb945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,13 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/src/main/java/org/apache/maven/doxia/Converter.java b/src/main/java/org/apache/maven/doxia/Converter.java
index 3c625e4..6864acb 100644
--- a/src/main/java/org/apache/maven/doxia/Converter.java
+++ b/src/main/java/org/apache/maven/doxia/Converter.java
@@ -19,7 +19,6 @@ package org.apache.maven.doxia;
* under the License.
*/
-import org.apache.maven.doxia.logging.LogEnabled;
import org.apache.maven.doxia.wrapper.InputFileWrapper;
import org.apache.maven.doxia.wrapper.InputReaderWrapper;
import org.apache.maven.doxia.wrapper.OutputFileWrapper;
@@ -31,7 +30,6 @@ import org.apache.maven.doxia.wrapper.OutputStreamWrapper;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
*/
public interface Converter
- extends LogEnabled
{
/**
* @return a not null array containing supported input formats, i.e. <code>apt</code>.
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index e6b7223..f9c6c8a 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -37,8 +37,6 @@ import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.doxia.logging.Log;
-import org.apache.maven.doxia.logging.SystemStreamLog;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
@@ -67,6 +65,8 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import com.ibm.icu.text.CharsetDetector;
import com.ibm.icu.text.CharsetMatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.lang.String.format;
@@ -133,14 +133,7 @@ public class DefaultConverter
private PlexusContainer plexus;
/** Doxia logger */
- private Log log;
-
- /** {@inheritDoc} */
- @Override
- public void enableLogging( Log log )
- {
- this.log = log;
- }
+ private Logger log;
/**
* Returns a logger for this sink.
@@ -148,11 +141,11 @@ public class DefaultConverter
*
* @return Log
*/
- protected Log getLog()
+ protected Logger getLog()
{
if ( log == null )
{
- log = new SystemStreamLog();
+ log = LoggerFactory.getLogger( getClass() );
}
return log;
@@ -247,7 +240,6 @@ public class DefaultConverter
try
{
parser = ConverterUtil.getParser( plexus, input.getFormat(), SUPPORTED_FROM_FORMAT );
- parser.enableLogging( log );
}
catch ( ComponentLookupException e )
{
@@ -278,7 +270,6 @@ public class DefaultConverter
{
throw new ConverterException( "IOException: " + e.getMessage(), e );
}
- sink.enableLogging( log );
if ( getLog().isDebugEnabled() )
{
@@ -345,7 +336,6 @@ public class DefaultConverter
try
{
parser = ConverterUtil.getParser( plexus, inputFormat, SUPPORTED_FROM_FORMAT );
- parser.enableLogging( log );
}
catch ( ComponentLookupException e )
{
@@ -428,8 +418,6 @@ public class DefaultConverter
throw new ConverterException( "IOException: " + e.getMessage(), e );
}
- sink.enableLogging( log );
-
if ( getLog().isDebugEnabled() )
{
getLog().debug( "Sink used: " + sink.getClass().getName() );
diff --git a/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java b/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java
index 27a169b..a3311f9 100644
--- a/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java
+++ b/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java
@@ -32,8 +32,6 @@ import org.apache.maven.doxia.Converter;
import org.apache.maven.doxia.ConverterException;
import org.apache.maven.doxia.DefaultConverter;
import org.apache.maven.doxia.UnsupportedFormatException;
-import org.apache.maven.doxia.logging.Log;
-import org.apache.maven.doxia.logging.SystemStreamLog;
import org.apache.maven.doxia.parser.AbstractParser;
import org.apache.maven.doxia.wrapper.InputFileWrapper;
import org.apache.maven.doxia.wrapper.OutputFileWrapper;
@@ -110,12 +108,6 @@ public class ConverterCli
}
Converter converter = new DefaultConverter();
- Log log = new SystemStreamLog();
- if ( debug )
- {
- log.setLogLevel( Log.LEVEL_DEBUG );
- }
- converter.enableLogging( log );
InputFileWrapper input;
OutputFileWrapper output;