Replayed relevant changes from scaladoc3.

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.alchim31.maven</groupId>
   <artifactId>scala-maven-plugin</artifactId>
-  <version>4.6.3-SNAPSHOT</version>
+  <version>4.6.3-EXPERIMENTAL</version>
   <packaging>maven-plugin</packaging>
 
   <name>scala-maven-plugin</name>
@@ -399,7 +399,7 @@
             <attach>false</attach>
             <doclint>-missing</doclint>
             <links>
-              <link>http://java.sun.com/j2se/${maven.compiler.source}/docs/api/</link>
+              <link>https://docs.oracle.com/javase/8/docs/api/</link>
               <link>http://slf4j.org/api/</link>
               <link>http://commons.apache.org/lang/api-release/</link>
               <link>http://commons.apache.org/io/api-release/</link>

src/it/test_scaladoc3/invoker.properties

@@ -0,0 +1 @@
+invoker.goals=clean package

src/it/test_scaladoc3/pom.xml

@@ -0,0 +1,113 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>it.scala-maven-plugin</groupId>
+  <artifactId>scaladoc-jar-test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+
+  <properties>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <encoding>UTF-8</encoding>
+    <scala-maven-plugin.version>4.6.3-EXPERIMENTAL</scala-maven-plugin.version>
+    <displayCmd>false</displayCmd>
+  </properties>
+
+  <build>
+    <sourceDirectory>src/main/scala</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>de.christofreichardt</groupId>
+      <artifactId>tracelogger</artifactId>
+      <version>1.9.0</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>scala3</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>@project.groupId@</groupId>
+            <artifactId>@project.artifactId@</artifactId>
+            <version>@project.version@</version>
+            <executions>
+              <execution>
+                <id>Scalac</id>
+                <goals>
+                  <goal>compile</goal>
+                  <goal>testCompile</goal>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <args>
+                    <arg>-deprecation</arg>
+                    <arg>-release:11</arg>
+                    <arg>-encoding</arg>
+                    <arg>utf-8</arg>
+                  </args>
+                </configuration>
+              </execution>
+              <execution>
+                <id>Scaladoc-jar</id>
+                <goals>
+                  <goal>doc-jar</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <displayCmd>true</displayCmd>
+                  <jvmArgs>
+                    <jvmArg>-Xms64m</jvmArg>
+                    <jvmArg>-Xmx1024m</jvmArg>
+                  </jvmArgs>
+                  <args>
+                    <arg>-doc-footer</arg>
+                    <arg>Scala Maven Plugin - Scaladoc for Scala 3</arg>
+                    <arg>-doc-title</arg>
+                    <arg>scaladoc-jar-test</arg>
+                    <arg>-doc-version</arg>
+                    <arg>${project.version}</arg>
+                    <arg>-author</arg>
+                  </args>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala3-library_3</artifactId>
+          <version>3.1.2</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+</project>

src/it/test_scaladoc3/src/main/scala/de/christofreichardt/scala/diagnosis/Tracing.scala

@@ -0,0 +1,58 @@
+/*
+ * Shamirs Keystore
+ *
+ * Copyright (C) 2017, 2021, Christof Reichardt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.christofreichardt.scala.diagnosis
+
+import de.christofreichardt.diagnosis.TracerFactory
+import de.christofreichardt.diagnosis.AbstractTracer
+
+/**
+ * Contains some add-ons for the <a href="http://www.christofreichardt.de/Projektstudien/TraceLogger/index.html">TraceLogger</a> library.
+ *
+ * @author Christof Reichardt
+ */
+trait Tracing {
+  /**
+   * Custom control structure for tracing of embraced code blocks.
+   *
+   * @param resultType denotes the return type
+   * @param callee     the call site
+   * @param method     denotes the method signature
+   * @param block      the embraced code block
+   * @tparam T the actual type of the embraced code block
+   * @return returns whatever block returns
+   */
+  def withTracer[T](resultType: String, callee: AnyRef, method: String)(block: => T): T = {
+    val tracer = getCurrentTracer()
+    tracer.entry(resultType, callee, method)
+    try {
+      block
+    }
+    finally {
+      tracer.wayout()
+    }
+  }
+
+  /**
+   * Returns the present tracer for this object.
+   *
+   * @return the current tracer, by default the NullTracer
+   */
+  def getCurrentTracer(): AbstractTracer = TracerFactory.getInstance().getDefaultTracer()
+}

src/it/test_scaladoc3/src/main/scala/de/christofreichardt/scala/diagnosis/package.scala

@@ -0,0 +1,26 @@
+/*
+ * Shamirs Keystore
+ *
+ * Copyright (C) 2017, 2021, Christof Reichardt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.christofreichardt.scala
+
+/**
+ * Contains an utility useful for debugging and diagnosis.
+ */
+package object diagnosis {
+}

src/it/test_scaladoc3/src/main/scala/de/christofreichardt/scala/math/Polynomial.scala

@@ -0,0 +1,59 @@
+package de.christofreichardt.scala.math
+
+import de.christofreichardt.diagnosis.{AbstractTracer, TracerFactory}
+import de.christofreichardt.scala.diagnosis.Tracing
+
+/**
+ * Defines a polynomial in its canonical form.
+ *
+ * @author Christof Reichardt
+ *
+ * @constructor
+ * @param coefficients the polynoms coefficients
+ * @param prime the prime modulus
+ */
+class Polynomial(
+                  val coefficients: IndexedSeq[BigInt],
+                  val prime:        BigInt)
+  extends Tracing {
+
+  require(prime.isProbablePrime(100))
+
+  /** the remaining coefficients while dropping leading zeros */
+  val a: Seq[BigInt] = coefficients.dropWhile(c => c == BigInt(0))
+  /** the degree of the polynomial */
+  val degree: Int = a.length - 1
+  /** indicates the zero polynomial */
+  val isZero: Boolean = degree == -1
+
+  /**
+   * Computes y = P(x).
+   *
+   * @param x the x value
+   * @return the y value
+   */
+  def evaluateAt(x: BigInt): BigInt = {
+    withTracer("BigInt", this, "evaluateAt(x: BigInt)") {
+      val tracer = getCurrentTracer()
+      tracer.out().printfIndentln("x = %s", x)
+      if (isZero) BigInt(0)
+      else {
+        Range.inclusive(0, degree)
+          .map(i => {
+            tracer.out().printfIndentln("a(%d) = %s", degree - i: Integer, a(i))
+            (a(i) * x.modPow(degree - i, prime)).mod(prime)
+          })
+          .foldLeft(BigInt(0))((t0, t1) => (t0 + t1).mod(prime))
+      }
+    }
+  }
+
+  /**
+   * Returns a string representation of the Polynomial.
+   *
+   * @return the string representation of the Polynomial
+   */
+  override def toString = String.format("Polynomial[a=(%s), degree=%d, isZero=%b, prime=%s]", a.mkString(","), degree: Integer, isZero: java.lang.Boolean, prime)
+
+  override def getCurrentTracer(): AbstractTracer = TracerFactory.getInstance().getDefaultTracer
+}

src/it/test_scaladoc3/validate.groovy

@@ -0,0 +1,11 @@
+try {
+
+def file = new File(basedir, 'target/scaladoc-jar-test-1.0-SNAPSHOT-javadoc.jar')
+assert file.exists()
+
+return true
+
+} catch(Throwable e) {
+  e.printStackTrace()
+  return false
+}

src/main/java/scala_maven/ScalaDocMojo.java

@@ -17,6 +17,7 @@
 import org.codehaus.plexus.util.StringUtils;
 import scala_maven_dependency.Context;
 import scala_maven_executions.JavaMainCaller;
+import scala_maven_executions.ScalaDoc3Caller;
 import util.FileUtils;
 
 /** Produces Scala API documentation. */
@@ -153,7 +154,14 @@ protected JavaMainCaller getScalaCommand() throws Exception {
     // This ensures we have a valid scala version...
     checkScalaVersion();
     Context sc = findScalaContext();
-    JavaMainCaller jcmd = getEmptyScalaCommand(sc.apidocMainClassName(scaladocClassName));
+    String apidocMainClassName = sc.apidocMainClassName(scaladocClassName);
+    JavaMainCaller jcmd;
+    if (sc.version().major < 3) {
+      jcmd = getEmptyScalaCommand(apidocMainClassName);
+    } else {
+      String targetClassesDir = project.getModel().getBuild().getOutputDirectory();
+      jcmd = new ScalaDoc3Caller(this, apidocMainClassName, targetClassesDir);
+    }
     jcmd.addArgs(args);
     jcmd.addJvmArgs(jvmArgs);
     addCompilerPluginOptions(jcmd);
@@ -171,7 +179,13 @@ protected JavaMainCaller getScalaCommand() throws Exception {
                 .getOutputDirectory())); // remove output to avoid "error for" : error: XXX is
     // already defined as package XXX ... object XXX {
     addAdditionalDependencies(paths);
-    if (!paths.isEmpty()) jcmd.addOption("-classpath", FileUtils.toMultiPath(paths));
+    if (sc.version().major == 3) {
+      addScalaDocToClasspath(paths);
+    }
+
+    if (!paths.isEmpty()) {
+      jcmd.addOption("-classpath", FileUtils.toMultiPath(paths));
+    }
     // jcmd.addOption("-sourcepath", sourceDir.getAbsolutePath());
 
     jcmd.addArgs("-doc-format:html");
@@ -196,8 +210,10 @@ public void generate(Sink sink, Locale locale) throws MavenReportException {
       if (sources.size() > 0) {
         JavaMainCaller jcmd = getScalaCommand();
         jcmd.addOption("-d", reportOutputDir.getAbsolutePath());
-        for (File x : sources) {
-          jcmd.addArgs(FileUtils.pathOf(x, useCanonicalPath));
+        if (this.scalaContext.version().major < 3) {
+          for (File x : sources) {
+            jcmd.addArgs(FileUtils.pathOf(x, useCanonicalPath));
+          }
         }
         jcmd.run(displayCmd);
       }

src/main/java/scala_maven/ScalaMojoSupport.java

@@ -219,7 +219,7 @@ public MavenArtifactResolver findMavenArtifactResolver() {
     return mavenArtifactResolver;
   }
 
-  private Context scalaContext;
+  protected Context scalaContext;
 
   public Context findScalaContext() throws Exception {
     // reuse/lazy scalaContext creation (doesn't need to be Thread safe, scalaContext should be
@@ -290,6 +290,13 @@ void addLibraryToClasspath(Set<File> classpath) throws Exception {
     }
   }
 
+  void addScalaDocToClasspath(Set<File> classpath) throws Exception {
+    Context sc = findScalaContext();
+    for (Artifact dep : sc.findScalaDocAndDependencies()) {
+      classpath.add(dep.getFile());
+    }
+  }
+
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
     try {

src/main/java/scala_maven_dependency/ArtifactIds.java

@@ -16,6 +16,8 @@ public interface ArtifactIds {
 
   String scalaCompilerArtifactId() throws Exception;
 
+  String scalaDocArtifactId() throws Exception;
+
   String compilerMainClassName(boolean useFsc) throws Exception;
 
   String consoleMainClassName() throws Exception;

src/main/java/scala_maven_dependency/ArtifactIds4Scala2.java

@@ -34,6 +34,11 @@ public String scalaCompilerArtifactId() throws Exception {
     return SCALA_COMPILER_ARTIFACTID;
   }
 
+  @Override
+  public String scalaDocArtifactId() throws Exception {
+    return null;
+  }
+
   public String compilerMainClassName(boolean useFsc) throws Exception {
     return useFsc ? "scala.tools.nsc.CompileClient" : "scala.tools.nsc.Main";
   }