forked from pool/maven-doxia
101 lines
4.7 KiB
Diff
101 lines
4.7 KiB
Diff
From 6a3583cafd46194b6c2c5f4db061f72f16d014ef Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Wed, 6 Nov 2013 12:46:26 +0100
|
|
Subject: [PATCH 2/4] Update to Plexus Container 1.5.5
|
|
|
|
---
|
|
.../java/org/apache/maven/doxia/module/AbstractIdentityTest.java | 3 ++-
|
|
.../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java | 5 +++--
|
|
.../test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java | 3 ++-
|
|
pom.xml | 2 +-
|
|
4 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
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 2f4f495..540461d 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
|
|
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.parser.Parser;
|
|
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 AbstractIdentityTest
|
|
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();
|
|
|
|
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 a67a114..3ac8734 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
|
|
@@ -28,6 +28,7 @@ import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
|
|
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 );
|
|
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
|
|
index 5f9108e..88db2b4 100644
|
|
--- 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
|
|
@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedError;
|
|
|
|
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,7 @@ public abstract class AbstractXmlValidator
|
|
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(); )
|
|
{
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 134f8b8..fcf4f32 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -180,7 +180,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>
|
|
--
|
|
2.5.5
|
|
|