[GitHub] slachiewicz closed pull request #5: [DOXIA-534] Migrate logging to Sl4j

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[GitHub] slachiewicz closed pull request #5: [DOXIA-534] Migrate logging to Sl4j

GitBox
slachiewicz closed pull request #5: [DOXIA-534] Migrate logging to Sl4j
URL: https://github.com/apache/maven-doxia/pull/5
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index 371e56af..cb6cc4c9 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -39,8 +39,13 @@ under the License.
       <artifactId>doxia-sink-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-logging-api</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>org.slf4j</groupId>
+       <artifactId>slf4j-simple</artifactId>
+       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java b/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
index b39e026c..f3144a56 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.parser.manager.ParserManager;
@@ -28,7 +27,6 @@
 
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.io.Reader;
 
@@ -42,7 +40,6 @@
  */
 @Component( role = Doxia.class )
 public class DefaultDoxia
-    extends AbstractLogEnabled
     implements Doxia
 {
     @Requirement
@@ -60,8 +57,6 @@ public void parse( Reader source, String parserId, Sink sink )
     {
         Parser parser = parserManager.getParser( parserId );
 
-        parser.enableLogging( new PlexusLoggerWrapper( getLogger() ) );
-
         parser.parse( source, sink );
     }
 
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
index 79b88fad..65dd35e2 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
@@ -21,11 +21,11 @@
 
 import java.util.Map;
 
-import org.apache.maven.doxia.logging.Log;
-import org.apache.maven.doxia.logging.SystemStreamLog;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abstract base class to execute <code>Macro</code>.
@@ -38,13 +38,7 @@
     implements Macro
 {
     /** Log instance. */
-    private Log logger;
-
-    /** {@inheritDoc} */
-    public void enableLogging( Log log )
-    {
-        this.logger = log;
-    }
+    private Logger logger;
 
     /**
      * Returns a logger for this macro.
@@ -53,11 +47,11 @@ public void enableLogging( Log log )
      * @return Log
      * @since 1.1
      */
-    protected Log getLog()
+    protected Logger getLog()
     {
         if ( logger == null )
         {
-            logger = new SystemStreamLog();
+            logger = LoggerFactory.getLogger( this.getClass() );
         }
 
         return logger;
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
index 1c8e37b5..c1d7d7b6 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.logging.LogEnabled;
 import org.apache.maven.doxia.sink.Sink;
 
 /**
@@ -30,7 +29,6 @@
  * @since 1.0
  */
 public interface Macro
-    extends LogEnabled
 {
     /** The Plexus lookup role. */
     String ROLE = Macro.class.getName();
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
index cf5599d5..77c76b45 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
@@ -27,8 +27,6 @@
 
 import java.util.Properties;
 
-import org.apache.maven.doxia.logging.Log;
-import org.apache.maven.doxia.logging.SystemStreamLog;
 import org.apache.maven.doxia.macro.Macro;
 import org.apache.maven.doxia.macro.MacroExecutionException;
 import org.apache.maven.doxia.macro.MacroRequest;
@@ -36,6 +34,8 @@
 import org.apache.maven.doxia.macro.manager.MacroNotFoundException;
 import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An abstract base class that defines some convenience methods for parsers.
@@ -55,7 +55,7 @@
     private MacroManager macroManager;
 
     /** Log instance. */
-    private Log logger;
+    private Logger logger;
 
     /**
      * Emit Doxia comment events when parsing comments?
@@ -131,8 +131,6 @@ public void executeMacro( String macroId, MacroRequest request, Sink sink )
     {
         Macro macro = getMacroManager().getMacro( macroId );
 
-        macro.enableLogging( getLog() );
-
         macro.execute( sink, request );
     }
 
@@ -200,12 +198,6 @@ protected boolean isSecondParsing()
         return secondParsing;
     }
 
-    /** {@inheritDoc} */
-    public void enableLogging( Log log )
-    {
-        this.logger = log;
-    }
-
     /**
      * Returns the current logger for this parser.
      * If no logger has been configured yet, a new SystemStreamLog is returned.
@@ -213,11 +205,11 @@ public void enableLogging( Log log )
      * @return Log
      * @since 1.1
      */
-    protected Log getLog()
+    protected Logger getLog()
     {
         if ( logger == null )
         {
-            logger = new SystemStreamLog();
+            logger = LoggerFactory.getLogger( this.getClass() );
         }
 
         return logger;
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
index ec25f194..30ba7d1d 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
@@ -124,7 +124,7 @@ public void parse( Reader source, Sink sink )
                 throw new ParseException( "Error reading the model: " + e.getMessage(), e );
             }
 
-            new XmlValidator( getLog() ).validate( content );
+            new XmlValidator( ).validate( content );
 
             src = new StringReader( content );
         }
@@ -140,8 +140,6 @@ public void parse( Reader source, Sink sink )
             // Note: do it after input is set, otherwise values are reset
             initXmlParser( parser );
 
-            sink.enableLogging( getLog() );
-
             parseXml( parser, sink );
         }
         catch ( XmlPullParserException ex )
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
index 15fd3136..085674ab 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.logging.LogEnabled;
 import org.apache.maven.doxia.sink.Sink;
 
 import java.io.Reader;
@@ -34,7 +33,6 @@
  * @since 1.0
  */
 public interface Parser
-    extends LogEnabled
 {
     /** The Plexus lookup role. */
     String ROLE = Parser.class.getName();
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/AbstractSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/AbstractSink.java
index 33b46843..f061c6e7 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/AbstractSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/AbstractSink.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.logging.Log;
-import org.apache.maven.doxia.logging.SystemStreamLog;
 import org.apache.maven.doxia.markup.Markup;
 import org.apache.maven.doxia.sink.Sink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An abstract base class that defines some convenience methods for sinks.
@@ -35,13 +35,7 @@
 public abstract class AbstractSink
     implements Sink, Markup
 {
-    private Log logger;
-
-    /** {@inheritDoc} */
-    public void enableLogging( Log log )
-    {
-        this.logger = log;
-    }
+    private Logger logger;
 
     /**
      * Returns a logger for this sink.
@@ -49,11 +43,11 @@ public void enableLogging( Log log )
      *
      * @return Log
      */
-    protected Log getLog()
+    protected Logger getLog()
     {
         if ( logger == null )
         {
-            logger = new SystemStreamLog();
+            logger = LoggerFactory.getLogger( this.getClass() );
         }
 
         return logger;
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
index 5b912a49..1f560b2a 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.maven.doxia.logging.Log;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.SinkFactory;
@@ -920,10 +919,4 @@ public void verbatim_()
     {
         currentSink.verbatim_();
     }
-
-    @Override
-    public void enableLogging( Log log )
-    {
-        currentSink.enableLogging( log );
-    }
 }
\ No newline at end of file
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
index 2595b496..ae0955fb 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
@@ -27,11 +27,12 @@
 
 import javax.xml.XMLConstants;
 
-import org.apache.maven.doxia.logging.Log;
 import org.apache.maven.doxia.markup.XmlMarkup;
 import org.apache.maven.doxia.parser.AbstractXmlParser.CachedFileEntityResolver;
 import org.apache.maven.doxia.parser.ParseException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -59,16 +60,15 @@
     /** lazy xmlReader to validate xml content*/
     private XMLReader xmlReader;
 
-    private Log logger;
+    private Logger logger = LoggerFactory.getLogger( XmlValidator.class );
 
     /**
      * Constructor.
      *
-     * @param log a logger, not null.
      */
-    public XmlValidator( Log log )
+    public XmlValidator( )
     {
-        this.logger = log;
+
     }
 
     /**
@@ -127,7 +127,7 @@ private XMLReader getXmlReader( boolean hasDtdAndXsd )
     {
         if ( xmlReader == null )
         {
-            MessagesErrorHandler errorHandler = new MessagesErrorHandler( getLog() );
+            MessagesErrorHandler errorHandler = new MessagesErrorHandler( );
 
             xmlReader = XMLReaderFactory.createXMLReader();
             xmlReader.setFeature( "http://xml.org/sax/features/validation", true );
@@ -141,7 +141,7 @@ private XMLReader getXmlReader( boolean hasDtdAndXsd )
         return xmlReader;
     }
 
-    private Log getLog()
+    private Logger getLog()
     {
         return logger;
     }
@@ -166,13 +166,12 @@ private Log getLog()
         private static final Pattern ELEMENT_TYPE_PATTERN =
             Pattern.compile( "Element type \".*\" must be declared.", Pattern.DOTALL );
 
-        private final Log log;
+        private final Logger log = LoggerFactory.getLogger( MessagesErrorHandler.class );
 
         private boolean hasDtdAndXsd;
 
-        private MessagesErrorHandler( Log log )
+        private MessagesErrorHandler( )
         {
-            this.log = log;
         }
 
         /**
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
index 33b5f3fa..01433c2f 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
@@ -74,7 +74,6 @@ public void testExecute()
     public void testLog()
     {
         EchoMacro macro = new EchoMacro();
-        macro.enableLogging( null );
         assertNotNull ( macro.getLog() );
         assertNotNull ( macro.getLog() );
     }
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
index e656eea8..f8a8da2e 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
@@ -26,7 +26,6 @@
 
 import org.apache.maven.doxia.AbstractModuleTest;
 
-import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.Parser;
 
@@ -108,7 +107,6 @@ public void testIdentity()
         writer = new StringWriter();
         sink = new TextSink( writer );
         Parser parser = createParser();
-        parser.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
         parser.parse( reader, sink );
         String actual = writer.toString();
 
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
index 593194ca..75ccf56a 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 
-import org.apache.maven.doxia.logging.Log;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.apache.maven.doxia.sink.impl.SinkEventElement;
 import org.apache.maven.doxia.sink.impl.SinkEventTestingSink;
@@ -44,7 +43,6 @@
     protected Parser createParser()
     {
         parser = new XhtmlBaseParser();
-        parser.getLog().setLogLevel( Log.LEVEL_ERROR );
         return parser;
     }
 
@@ -60,7 +58,6 @@ protected void setUp() throws Exception
         super.setUp();
 
         parser = new XhtmlBaseParser();
-        parser.getLog().setLogLevel( Log.LEVEL_ERROR );
         sink.reset();
     }
 
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
index 11627f0e..a297884c 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
@@ -24,7 +24,6 @@
 import java.io.Writer;
 
 import org.apache.maven.doxia.AbstractModuleTest;
-import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.codehaus.plexus.DefaultPlexusContainer;
@@ -60,7 +59,6 @@ protected void setUp()
 
         testWriter.reset();
         sink = createSink( testWriter );
-        sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
     }
 
     /**
@@ -214,6 +212,15 @@ public void testHead()
         assertEquals( "Wrong head!", expected, actual );
     }
 
+    protected static String normalizeLineEnds(String s) {
+        if ( s != null) {
+            return s.replace("\r\n", "\n" );
+//                    .replace('\r', '\n');
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Checks that the sequence <code>[body(), body_()]</code>,
      * invoked on the current sink, produces the same result as
@@ -808,7 +815,6 @@ public void testComment()
 
         testWriter.reset();
         sink = createSink( testWriter );
-        sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
 
         comment = "-";
         sink.comment( comment );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
index 7f6c896f..54e6f2c2 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.logging.Log;
-import org.apache.maven.doxia.logging.SystemStreamLog;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.XmlStreamReader;
@@ -39,8 +37,7 @@ public void testValidate()
     {
         String xml = IOUtil.toString( new XmlStreamReader( this.getClass().getResourceAsStream( "/test.xhtml" ) ) );
 
-        Log log = new SystemStreamLog();
-        XmlValidator validator = new XmlValidator( log );
+        XmlValidator validator = new XmlValidator( );
 
         validator.validate( xml );
     }
diff --git a/doxia-logging-api/pom.xml b/doxia-logging-api/pom.xml
deleted file mode 100644
index df3cb208..00000000
--- a/doxia-logging-api/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>doxia</artifactId>
-    <groupId>org.apache.maven.doxia</groupId>
-    <version>1.8-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>doxia-logging-api</artifactId>
-  <name>Doxia :: Logging API</name>
-  <description>Doxia Logging API.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/Log.java b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/Log.java
index 7b42e0b4..88b652fb 100644
--- a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/Log.java
+++ b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/Log.java
@@ -35,6 +35,7 @@
  * @version $Id$
  * @since 1.1
  */
+@Depecated replaced by slf4j
 public interface Log
 {
     /** Typecode for debugging messages. */
diff --git a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java
index 11007f58..a63a6255 100644
--- a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java
+++ b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java
@@ -29,6 +29,7 @@
  * @version $Id$
  * @since 1.1
  */
+@Deprecated replaced by slf4j
 public interface LogEnabled
 {
     /**
diff --git a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java
deleted file mode 100644
index 6e3134f8..00000000
--- a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.apache.maven.doxia.logging;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.logging.Logger;
-
-/**
- * Wrap a Plexus logger into a Doxia logger.
- * Based on org.apache.maven.plugin.logging.Log.
- *
- * @author <a href="mailto:[hidden email]">Vincent Siveton</a>
- * @version $Id$
- * @since 1.1
- */
-public class PlexusLoggerWrapper
-    implements Log
-{
-    private final Logger logger;
-
-    /**
-     * <p>Constructor for PlexusLoggerWrapper.</p>
-     *
-     * @param logger the Plexus logger to wrap.
-     */
-    public PlexusLoggerWrapper( Logger logger )
-    {
-        this.logger = logger;
-    }
-
-    /** {@inheritDoc} */
-    public void setLogLevel( int level )
-    {
-        if ( level <= LEVEL_DEBUG )
-        {
-            logger.setThreshold( Logger.LEVEL_DEBUG );
-        }
-        else if ( level <= LEVEL_INFO )
-        {
-            logger.setThreshold( Logger.LEVEL_INFO );
-        }
-        else if ( level <= LEVEL_WARN )
-        {
-            logger.setThreshold( Logger.LEVEL_WARN );
-        }
-        else if ( level <= LEVEL_ERROR )
-        {
-            logger.setThreshold( Logger.LEVEL_ERROR );
-        }
-        else
-        {
-            logger.setThreshold( Logger.LEVEL_DISABLED );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void debug( CharSequence content )
-    {
-        logger.debug( toString( content ) );
-    }
-
-    /** {@inheritDoc} */
-    public void debug( CharSequence content, Throwable error )
-    {
-        logger.debug( toString( content ), error );
-    }
-
-    /** {@inheritDoc} */
-    public void debug( Throwable error )
-    {
-        logger.debug( "", error );
-    }
-
-    /** {@inheritDoc} */
-    public void info( CharSequence content )
-    {
-        logger.info( toString( content ) );
-    }
-
-    /** {@inheritDoc} */
-    public void info( CharSequence content, Throwable error )
-    {
-        logger.info( toString( content ), error );
-    }
-
-    /** {@inheritDoc} */
-    public void info( Throwable error )
-    {
-        logger.info( "", error );
-    }
-
-    /** {@inheritDoc} */
-    public void warn( CharSequence content )
-    {
-        logger.warn( toString( content ) );
-    }
-
-    /** {@inheritDoc} */
-    public void warn( CharSequence content, Throwable error )
-    {
-        logger.warn( toString( content ), error );
-    }
-
-    /** {@inheritDoc} */
-    public void warn( Throwable error )
-    {
-        logger.warn( "", error );
-    }
-
-    /** {@inheritDoc} */
-    public void error( CharSequence content )
-    {
-        logger.error( toString( content ) );
-    }
-
-    /** {@inheritDoc} */
-    public void error( CharSequence content, Throwable error )
-    {
-        logger.error( toString( content ), error );
-    }
-
-    /** {@inheritDoc} */
-    public void error( Throwable error )
-    {
-        logger.error( "", error );
-    }
-
-    /** {@inheritDoc} */
-    public boolean isDebugEnabled()
-    {
-        return logger.isDebugEnabled();
-    }
-
-    /** {@inheritDoc} */
-    public boolean isInfoEnabled()
-    {
-        return logger.isInfoEnabled();
-    }
-
-    /** {@inheritDoc} */
-    public boolean isWarnEnabled()
-    {
-        return logger.isWarnEnabled();
-    }
-
-    /** {@inheritDoc} */
-    public boolean isErrorEnabled()
-    {
-        return logger.isErrorEnabled();
-    }
-
-    // ----------------------------------------------------------------------
-    // Private methods
-    // ----------------------------------------------------------------------
-
-    private String toString( CharSequence content )
-    {
-        if ( content == null )
-        {
-            return "";
-        }
-
-        return content.toString();
-    }
-}
diff --git a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/SystemStreamLog.java b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/SystemStreamLog.java
index 44099d58..e69de29b 100644
--- a/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/SystemStreamLog.java
+++ b/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/SystemStreamLog.java
@@ -1,239 +0,0 @@
-package org.apache.maven.doxia.logging;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * Logger with "standard" output and error output stream. The log prefix is voluntarily in lower case.
- * <br>
- * Based on <code>org.apache.maven.plugin.logging.SystemStreamLog</code>.
- *
- * @author jdcasey
- * @author ltheussl
- * @version $Id$
- * @since 1.1
- */
-public class SystemStreamLog
-    implements Log
-{
-    private static final String EOL = System.getProperty( "line.separator" );
-
-    private int currentLevel = LEVEL_INFO;
-
-    /** {@inheritDoc} */
-    public void setLogLevel( int level )
-    {
-        if ( level <= LEVEL_DEBUG )
-        {
-            currentLevel = LEVEL_DEBUG;
-        }
-        else if ( level <= LEVEL_INFO )
-        {
-            currentLevel = LEVEL_INFO;
-        }
-        else if ( level <= LEVEL_WARN )
-        {
-            currentLevel = LEVEL_WARN;
-        }
-        else if ( level <= LEVEL_ERROR )
-        {
-            currentLevel = LEVEL_ERROR;
-        }
-        else
-        {
-            currentLevel = LEVEL_DISABLED;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void debug( CharSequence content )
-    {
-        if ( isDebugEnabled() )
-        {
-            print( "debug", content );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void debug( CharSequence content, Throwable error )
-    {
-        if ( isDebugEnabled() )
-        {
-            print( "debug", content, error );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void debug( Throwable error )
-    {
-        if ( isDebugEnabled() )
-        {
-            print( "debug", error );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void info( CharSequence content )
-    {
-        if ( isInfoEnabled() )
-        {
-            print( "info", content );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void info( CharSequence content, Throwable error )
-    {
-        if ( isInfoEnabled() )
-        {
-            print( "info", content, error );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void info( Throwable error )
-    {
-        if ( isInfoEnabled() )
-        {
-            print( "info", error );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void warn( CharSequence content )
-    {
-        if ( isWarnEnabled() )
-        {
-            print( "warn", content );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void warn( CharSequence content, Throwable error )
-    {
-        if ( isWarnEnabled() )
-        {
-            print( "warn", content, error );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void warn( Throwable error )
-    {
-        if ( isWarnEnabled() )
-        {
-            print( "warn", error );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void error( CharSequence content )
-    {
-        if ( isErrorEnabled() )
-        {
-            System.err.println( "[error] " + content.toString() );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void error( CharSequence content, Throwable error )
-    {
-        if ( isErrorEnabled() )
-        {
-            StringWriter sWriter = new StringWriter();
-            PrintWriter pWriter = new PrintWriter( sWriter );
-
-            error.printStackTrace( pWriter );
-
-            System.err.println( "[error] " + content.toString()
-                + EOL + EOL + sWriter.toString() );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void error( Throwable error )
-    {
-        if ( isErrorEnabled() )
-        {
-            StringWriter sWriter = new StringWriter();
-            PrintWriter pWriter = new PrintWriter( sWriter );
-
-            error.printStackTrace( pWriter );
-
-            System.err.println( "[error] " + sWriter.toString() );
-        }
-    }
-
-    /** {@inheritDoc} */
-    public boolean isDebugEnabled()
-    {
-        return ( currentLevel <= LEVEL_DEBUG );
-    }
-
-    /** {@inheritDoc} */
-    public boolean isInfoEnabled()
-    {
-        return ( currentLevel <= LEVEL_INFO );
-    }
-
-    /** {@inheritDoc} */
-    public boolean isWarnEnabled()
-    {
-        return ( currentLevel <= LEVEL_WARN );
-    }
-
-    /** {@inheritDoc} */
-    public boolean isErrorEnabled()
-    {
-        return ( currentLevel <= LEVEL_ERROR );
-    }
-
-      //
-     // private
-    //
-
-    private void print( String prefix, CharSequence content )
-    {
-        System.out.println( "[" + prefix + "] " + content.toString() );
-    }
-
-    private void print( String prefix, Throwable error )
-    {
-        StringWriter sWriter = new StringWriter();
-        PrintWriter pWriter = new PrintWriter( sWriter );
-
-        error.printStackTrace( pWriter );
-
-        System.out.println( "[" + prefix + "] " + sWriter.toString() );
-    }
-
-    private void print( String prefix, CharSequence content, Throwable error )
-    {
-        StringWriter sWriter = new StringWriter();
-        PrintWriter pWriter = new PrintWriter( sWriter );
-
-        error.printStackTrace( pWriter );
-
-        System.out.println( "[" + prefix + "] " + content.toString()
-            + EOL + EOL + sWriter.toString() );
-    }
-}
diff --git a/doxia-logging-api/src/site/site.xml b/doxia-logging-api/src/site/site.xml
deleted file mode 100644
index 5ab71c2e..00000000
--- a/doxia-logging-api/src/site/site.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- -->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
-
-  <body>
-
-    <menu ref="parent"/>
-
-    <menu name="Overview">
-      <item name="Introduction" href="index.html"/>
-      <item name="JavaDocs" href="apidocs/index.html"/>
-      <item name="Source Xref" href="xref/index.html"/>
-      <!--item name="FAQ" href="faq.html"/-->
-    </menu>
-
-    <menu ref="reports"/>
-
-  </body>
-
-</project>
\ No newline at end of file
diff --git a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
index b918a5f8..49c59b5c 100644
--- a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
+++ b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
@@ -213,7 +213,6 @@ public void parse( Reader source, Sink sink, String reference )
             this.source = new AptReaderSource( new StringReader( sourceContent ), reference );
 
             this.sink = sink;
-            sink.enableLogging( getLog() );
 
             blockFileName = null;
 
diff --git a/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java b/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
index d617321b..017c40b0 100644
--- a/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
+++ b/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
@@ -558,7 +558,6 @@ private void writeFaqs( Sink sink )
         throws ParseException
     {
         FmlContentParser xdocParser = new FmlContentParser();
-        xdocParser.enableLogging( getLog() );
 
         sink.head();
         sink.title();
diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml
index 056eee36..8f0c06dc 100644
--- a/doxia-modules/doxia-module-fo/pom.xml
+++ b/doxia-modules/doxia-module-fo/pom.xml
@@ -57,12 +57,6 @@ under the License.
   </contributors>
 
   <dependencies>
-    <!-- Doxia -->
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-logging-api</artifactId>
-    </dependency>
-
     <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -88,12 +82,16 @@ under the License.
       <version>0.95</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
       <!-- runtime dep for fop -->
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-core</artifactId>
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
index af42ce92..fde27613 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
@@ -1274,7 +1274,7 @@ private SinkEventAttributeSet getGraphicsAttributes( String logo )
         }
         catch ( IOException e )
         {
-            getLog().debug( e );
+            getLog().debug( e.getMessage() );
         }
 
         if ( atts == null )
diff --git a/doxia-modules/doxia-module-fo/src/site/xdoc/usage.xml b/doxia-modules/doxia-module-fo/src/site/xdoc/usage.xml
index 14226fea..39a885d3 100644
--- a/doxia-modules/doxia-module-fo/src/site/xdoc/usage.xml
+++ b/doxia-modules/doxia-module-fo/src/site/xdoc/usage.xml
@@ -144,7 +144,7 @@ public class Apt2FO
         (tested versions in parentheses).<br/>
         Compile:
         <code>doxia-core (1.1.4)</code>, <code>doxia-module-fo (1.1.1)</code>,
-        <code>doxia-sink-api (1.1.4)</code>, <code>doxia-logging-api (1.1.4)</code>.<br/>
+        <code>doxia-sink-api (1.1.4)</code><br/>
         Run:
         <code>commons-configuration (1.10)</code>, <code>commons-lang (2.6)</code>,
         <code>plexus-utils (2.0.5)</code>, <code>commons-collections (3.2.1)</code>,
diff --git a/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java b/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
index 0bce4519..07c7659b 100644
--- a/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
+++ b/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
@@ -1411,8 +1411,7 @@ protected String defaultSinkCommands()
         catch ( IOException ioe )
         {
             // this should not happen
-            getLog().warn( "Could not read default LaTeX commands, the generated LaTeX file will not compile!" );
-            getLog().debug( ioe );
+            getLog().warn( "Could not read default LaTeX commands, the generated LaTeX file will not compile!", ioe );
 
             return "";
         }
@@ -1432,8 +1431,7 @@ protected String defaultPreamble()
         catch ( IOException ioe )
         {
             // this should not happen
-            getLog().warn( "Could not read default LaTeX preamble, the generated LaTeX file will not compile!" );
-            getLog().debug( ioe );
+            getLog().warn( "Could not read default LaTeX preamble, the generated LaTeX file will not compile!", ioe );
 
             return "";
         }
diff --git a/doxia-modules/pom.xml b/doxia-modules/pom.xml
index 5140bd89..fb50be8e 100644
--- a/doxia-modules/pom.xml
+++ b/doxia-modules/pom.xml
@@ -62,7 +62,11 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-annotations</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- test -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
diff --git a/doxia-sink-api/pom.xml b/doxia-sink-api/pom.xml
index 4e826c6b..e35a0477 100644
--- a/doxia-sink-api/pom.xml
+++ b/doxia-sink-api/pom.xml
@@ -35,8 +35,8 @@ under the License.
 
   <dependencies>
       <dependency>
-        <groupId>org.apache.maven.doxia</groupId>
-        <artifactId>doxia-logging-api</artifactId>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
       </dependency>
   </dependencies>
 </project>
diff --git a/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java b/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
index 5be0d4f7..3b403ad0 100644
--- a/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
+++ b/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.logging.LogEnabled;
-
 /**
  * A <i>Sink</i> consumes Doxia events to produce a resultant output format
  * (eg Docbook, PDF, XHTML...).
@@ -57,7 +55,6 @@
  * @version $Id$
  */
 public interface Sink
-    extends LogEnabled
 {
     /** The Plexus Sink Role. */
     String ROLE = Sink.class.getName();
diff --git a/doxia-sink-api/src/site/apt/index.apt b/doxia-sink-api/src/site/apt/index.apt
index f27b941f..1cc81536 100644
--- a/doxia-sink-api/src/site/apt/index.apt
+++ b/doxia-sink-api/src/site/apt/index.apt
@@ -64,6 +64,8 @@ sink.paragraph_();
 | 1.0-alpha-9  | added <<<org.apache.maven.doxia.sink.SinkFactory>>> interface |
 *--------------+--------------------------+
 | 1.1          | added <<<org.apache.maven.doxia.sink.SinkEventAttributes>>> interface and a dependency on <<<doxia-logging-api>>> |
+*--------------+--------------------------+
+| 1.8          | removed <<<doxia-logging-api>>> - replaced by slf4j|
 *--------------+--------------------------+
 
   Note that <<<doxia-sink-api 1.0>>> is equivalent to <<<doxia-sink-api 1.0-alpha-9>>>.
diff --git a/pom.xml b/pom.xml
index 7c2d8428..35929e61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@ under the License.
   </contributors>
 
   <modules>
-    <module>doxia-logging-api</module>
     <module>doxia-sink-api</module>
     <module>doxia-test-docs</module>
     <module>doxia-core</module>
@@ -95,6 +94,7 @@ under the License.
     <mavenVersion>2.2.1</mavenVersion>
     <maven.site.path>doxia-archives/doxia-LATEST</maven.site.path>
     <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber</checkstyle.violation.ignore>
+    <sl4j.version>1.7.25</sl4j.version>
   </properties>
 
   <dependencyManagement>
@@ -105,11 +105,6 @@ under the License.
         <artifactId>doxia-sink-api</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven.doxia</groupId>
-        <artifactId>doxia-logging-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven.doxia</groupId>
         <artifactId>doxia-test-docs</artifactId>
@@ -215,6 +210,24 @@ under the License.
         <artifactId>plexus-utils</artifactId>
         <version>3.1.0</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${sl4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${sl4j.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>${sl4j.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -328,6 +341,7 @@ under the License.
                 <exclude>org/apache/maven/doxia/parser/AbstractXmlParser</exclude>
                 <exclude>org/apache/maven/doxia/module/*/*Sink</exclude>
                 <exclude>org/apache/maven/doxia/module/*/*SinkFactory</exclude>
+                <exclude>org/codehaus/doxia/sink/Sink</exclude>
               </excludes>
             </configuration>
           </execution>
@@ -344,6 +358,11 @@ under the License.
           </dependency>
         </dependencies>
       </plugin>
+        <plugin><!-- TODO remove when upgrading parent pom -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.20.1</version>
+        </plugin>
     </plugins>
   </build>
 
@@ -480,10 +499,6 @@ under the License.
                   <title>Doxia Sink API</title>
                   <packages>org.apache.maven.doxia.sink:org.codehaus.doxia.sink</packages>
                 </group>
-                <group>
-                  <title>Doxia Logging API</title>
-                  <packages>org.apache.maven.doxia.logging</packages>
-                </group>
                 <group>
                   <title>Doxia Modules</title>
                   <packages>org.apache.maven.doxia.module*</packages>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 5a44eaa7..5a745f1d 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -43,7 +43,6 @@
         <img src="images/doxia-deps.png" width="647" height="335" border="0" usemap="#Doxia_dependencies" />
         <map name="Doxia_dependencies">
           <area shape="rect" coords="98,303,220,335"  href="./doxia-test-docs/" />
-          <area shape="rect" coords="262,303,385,335" href="./doxia-logging-api/" />
           <area shape="rect" coords="262,254,385,285" href="./doxia-sink-api/" />
           <area shape="rect" coords="262,201,385,234" href="./doxia-core/" />
           <area shape="rect" coords="41,12,167,44"    href="./doxia-modules/doxia-module-apt/" />


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[hidden email]


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]