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-sitetools.git
commit be8e0db20af83277cc64993b8ecb9d80a2e0d472 Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Feb 3 14:06:24 2022 +0100 Upgrade to doxia 2.0.0-M2-SNAPSHOT, JUnit 5, Maven 3.1.1 --- doxia-integration-tools/pom.xml | 25 +++++++++++++++++++++- .../siterenderer/DefaultSiteRendererTest.java | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml index fca5e18..b195b05 100644 --- a/doxia-integration-tools/pom.xml +++ b/doxia-integration-tools/pom.xml @@ -79,7 +79,6 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-resolver-provider</artifactId> <version>${mavenVersion}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -188,6 +187,30 @@ <artifactId>plexus-testing</artifactId> <version>1.1.0</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-testing</artifactId> + <version>1.1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-connector-wagon</artifactId> + <version>0.9.0.M2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + <version>1.0</version> + <scope>test</scope> </dependency> </dependencies> diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java index f2ada6b..dadb6b4 100644 --- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java +++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java @@ -109,7 +109,7 @@ public class DefaultSiteRendererTest protected void setUp() throws Exception { - renderer = (Renderer) container.lookup( Renderer.class ); + renderer = container.lookup( Renderer.class ); // copy the default-site.vm and default-site-macros.vm copyVm( "default-site.vm", "\n\n\n\r\n\r\n\r\n" );
