diff --git a/pom.xml b/pom.xml index 3b5067cd..5d903008 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ UTF-8 github 8 - 3.1.1 + 4.0.0 3.8.1 3.9 UTF-8 @@ -259,7 +259,7 @@ org.apache.maven.doxia doxia-sink-api - 1.12.0 + 2.0.0 provided diff --git a/src/it/includesExcludes/pom.xml b/src/it/includesExcludes/pom.xml index 83692635..bf2ec194 100644 --- a/src/it/includesExcludes/pom.xml +++ b/src/it/includesExcludes/pom.xml @@ -16,6 +16,26 @@ ${scala.version.lastrelease} + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + **/*.scala + **/TestClass.java + + + bad.scala + + + + + + @@ -43,25 +63,7 @@ org.apache.maven.plugins maven-site-plugin - 3.3 - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - **/*.scala - **/TestClass.java - - - bad.scala - - - - - + 3.21.0 org.apache.maven.plugins diff --git a/src/it/test1/pom.xml b/src/it/test1/pom.xml index 1ebeec72..ea35a9e2 100644 --- a/src/it/test1/pom.xml +++ b/src/it/test1/pom.xml @@ -82,9 +82,8 @@ - org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.21.0 diff --git a/src/it/test_custom_outputdir/pom.xml b/src/it/test_custom_outputdir/pom.xml index 838c28a6..b844a014 100644 --- a/src/it/test_custom_outputdir/pom.xml +++ b/src/it/test_custom_outputdir/pom.xml @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.21.0 org.apache.maven.plugins diff --git a/src/it/test_goal_doc/invoker.properties b/src/it/test_goal_doc/invoker.properties index c6a1875f..7f86aa43 100644 --- a/src/it/test_goal_doc/invoker.properties +++ b/src/it/test_goal_doc/invoker.properties @@ -1 +1 @@ -invoker.goals=clean compile site -e +invoker.goals=clean compile scala:doc -e diff --git a/src/it/test_goal_doc/pom.xml b/src/it/test_goal_doc/pom.xml index 4864c21e..e4bedf60 100644 --- a/src/it/test_goal_doc/pom.xml +++ b/src/it/test_goal_doc/pom.xml @@ -22,43 +22,9 @@ ANYTHING ANYTHING - - - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - Hello - - -doc-root-content - src/main/scala/rootdoc.txt - - - -Xms1024m - -Xmx4096m - - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - org.apache.maven.plugins maven-project-info-reports-plugin diff --git a/src/it/test_goal_site/pom.xml b/src/it/test_goal_site/pom.xml index 9ba3e1b8..db0b7cdf 100644 --- a/src/it/test_goal_site/pom.xml +++ b/src/it/test_goal_site/pom.xml @@ -40,7 +40,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.21.0 org.apache.maven.plugins diff --git a/src/main/java/scala_maven/ScalaDocMojo.java b/src/main/java/scala_maven/ScalaDocMojo.java index 9672cb42..50a4a0f4 100644 --- a/src/main/java/scala_maven/ScalaDocMojo.java +++ b/src/main/java/scala_maven/ScalaDocMojo.java @@ -6,6 +6,7 @@ import java.io.File; import java.util.*; +import org.apache.maven.doxia.sink.Sink; import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -13,7 +14,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; -import org.codehaus.doxia.sink.Sink; import org.codehaus.plexus.util.StringUtils; import scala_maven_dependency.Context; import scala_maven_executions.JavaMainCaller;