f14834c
From 6a3583cafd46194b6c2c5f4db061f72f16d014ef Mon Sep 17 00:00:00 2001
7c65552
From: Mikolaj Izdebski <mizdebsk@redhat.com>
7c65552
Date: Wed, 6 Nov 2013 12:46:26 +0100
f14834c
Subject: [PATCH 2/4] Update to Plexus Container 1.5.5
7c65552
7c65552
---
f14834c
 .../java/org/apache/maven/doxia/module/AbstractIdentityTest.java     | 3 ++-
f14834c
 .../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java | 5 +++--
f14834c
 .../test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java   | 3 ++-
f14834c
 pom.xml                                                              | 2 +-
f14834c
 4 files changed, 8 insertions(+), 5 deletions(-)
7c65552
7c65552
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
f14834c
index 2f4f495..540461d 100644
7c65552
--- a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
7c65552
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
7c65552
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.parser.Parser;
7c65552
 import org.apache.maven.doxia.sink.Sink;
f14834c
 import org.apache.maven.doxia.sink.impl.SinkTestDocument;
f14834c
 import org.apache.maven.doxia.sink.impl.TextSink;
7c65552
+import org.codehaus.plexus.DefaultPlexusContainer;
7c65552
 import org.codehaus.plexus.util.IOUtil;
7c65552
 
7c65552
 /**
7c65552
@@ -107,7 +108,7 @@ public abstract class AbstractIdentityTest
7c65552
         writer = new StringWriter();
7c65552
         sink = new TextSink( writer );
7c65552
         Parser parser = createParser();
7c65552
-        parser.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
7c65552
+        parser.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
7c65552
         parser.parse( reader, sink );
7c65552
         String actual = writer.toString();
7c65552
 
f14834c
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
f14834c
index a67a114..3ac8734 100644
f14834c
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
f14834c
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
f14834c
@@ -28,6 +28,7 @@ import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
f14834c
 import org.apache.maven.doxia.sink.Sink;
f14834c
 import org.apache.maven.doxia.sink.SinkEventAttributes;
f14834c
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
7c65552
+import org.codehaus.plexus.DefaultPlexusContainer;
7c65552
 import org.codehaus.plexus.util.IOUtil;
177ad9c
 import org.custommonkey.xmlunit.Diff;
177ad9c
 import org.custommonkey.xmlunit.XMLUnit;
f14834c
@@ -59,7 +60,7 @@ public abstract class AbstractSinkTest
7c65552
 
7c65552
         testWriter.reset();
7c65552
         sink = createSink( testWriter );
7c65552
-        sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
7c65552
+        sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
7c65552
     }
7c65552
 
177ad9c
     /**
f14834c
@@ -809,7 +810,7 @@ public abstract class AbstractSinkTest
f14834c
 
f14834c
         testWriter.reset();
f14834c
         sink = createSink( testWriter );
f14834c
-        sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
f14834c
+        sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ));
f14834c
 
f14834c
         comment = "-";
f14834c
         sink.comment( comment );
7c65552
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
7c65552
index 5f9108e..88db2b4 100644
7c65552
--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
7c65552
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
7c65552
@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedError;
7c65552
 
7c65552
 import org.apache.maven.doxia.parser.Parser;
7c65552
 
7c65552
+import org.codehaus.plexus.DefaultPlexusContainer;
7c65552
 import org.codehaus.plexus.PlexusTestCase;
7c65552
 import org.codehaus.plexus.logging.Logger;
7c65552
 
7c65552
@@ -96,7 +97,7 @@ public abstract class AbstractXmlValidator
7c65552
     public void testValidateFiles()
7c65552
         throws Exception
7c65552
     {
7c65552
-        final Logger logger = getContainer().getLoggerManager().getLoggerForComponent( Parser.ROLE );
7c65552
+        final Logger logger = ( ( DefaultPlexusContainer )getContainer() ).getLoggerManager().getLoggerForComponent( Parser.ROLE );
7c65552
 
7c65552
         for ( Iterator<Map.Entry<String, String>> it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
7c65552
         {
7c65552
diff --git a/pom.xml b/pom.xml
f14834c
index 134f8b8..fcf4f32 100644
7c65552
--- a/pom.xml
7c65552
+++ b/pom.xml
f14834c
@@ -180,7 +180,7 @@ under the License.
7c65552
       <dependency>
7c65552
         <groupId>org.codehaus.plexus</groupId>
7c65552
         <artifactId>plexus-container-default</artifactId>
7c65552
-        <version>1.0-alpha-30</version>
7c65552
+        <version>1.5.5</version>
7c65552
       </dependency>
7c65552
       <dependency>
7c65552
         <groupId>org.codehaus.plexus</groupId>
7c65552
-- 
f14834c
2.5.5
7c65552