svn commit: r1788692 - in /maven/doxia/doxia/trunk: ./ doxia-core/src/test/java/org/apache/maven/doxia/module/ doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/ doxia-core/src/test/java/org/apache/maven/doxia/xsd/

[hboutemy]

Author: hboutemy
Date: Sat Mar 25 21:58:00 2017
New Revision: 1788692

URL: http://svn.apache.org/viewvc?rev=1788692&view=rev
Log:
[DOXIA-504] upgraded Plexus container to latest
Submitted by: Mikolaj Izdebski

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
    maven/doxia/doxia/trunk/pom.xml

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java?rev=1788692&r1=1788691&r2=1788692&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
 Sat Mar 25 21:58:00 2017
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.parser.Par
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.impl.SinkTestDocument;
 import org.apache.maven.doxia.sink.impl.TextSink;
+import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.util.IOUtil;
 
 /**
@@ -107,7 +108,7 @@ public abstract class AbstractIdentityTe
         writer = new StringWriter();
         sink = new TextSink( writer );
         Parser parser = createParser();
-        parser.enableLogging( new PlexusLoggerWrapper( 
getContainer().getLogger() ) );
+        parser.enableLogging( new PlexusLoggerWrapper( ( ( 
DefaultPlexusContainer )getContainer() ).getLogger() ) );
         parser.parse( reader, sink );
         String actual = writer.toString();
 

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java?rev=1788692&r1=1788691&r2=1788692&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
 Sat Mar 25 21:58:00 2017
@@ -28,6 +28,7 @@ import org.apache.maven.doxia.logging.Pl
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
+import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.util.IOUtil;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
@@ -59,7 +60,7 @@ public abstract class AbstractSinkTest
 
         testWriter.reset();
         sink = createSink( testWriter );
-        sink.enableLogging( new PlexusLoggerWrapper( 
getContainer().getLogger() ) );
+        sink.enableLogging( new PlexusLoggerWrapper( ( ( 
DefaultPlexusContainer )getContainer() ).getLogger() ) );
     }
 
     /**
@@ -809,7 +810,7 @@ public abstract class AbstractSinkTest
 
         testWriter.reset();
         sink = createSink( testWriter );
-        sink.enableLogging( new PlexusLoggerWrapper( 
getContainer().getLogger() ) );
+        sink.enableLogging( new PlexusLoggerWrapper( ( ( 
DefaultPlexusContainer )getContainer() ).getLogger() ) );
 
         comment = "-";
         sink.comment( comment );

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java?rev=1788692&r1=1788691&r2=1788692&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
 Sat Mar 25 21:58:00 2017
@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedEr
 
 import org.apache.maven.doxia.parser.Parser;
 
+import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.logging.Logger;
 
@@ -96,7 +97,8 @@ public abstract class AbstractXmlValidat
     public void testValidateFiles()
         throws Exception
     {
-        final Logger logger = 
getContainer().getLoggerManager().getLoggerForComponent( Parser.ROLE );
+        final Logger logger =
+            ( (DefaultPlexusContainer) getContainer() 
).getLoggerManager().getLoggerForComponent( Parser.ROLE );
 
         for ( Iterator<Map.Entry<String, String>> it = 
getTestDocuments().entrySet().iterator(); it.hasNext(); )
         {

Modified: maven/doxia/doxia/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1788692&r1=1788691&r2=1788692&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Sat Mar 25 21:58:00 2017
@@ -179,7 +179,7 @@ under the License.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
-        <version>1.0-alpha-30</version>
+        <version>1.5.5</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>