From ee4132f9d0f6f412784e108305524cf3b3a3009a Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Mon, 17 Jan 2022 16:22:58 +0100
Subject: [PATCH] [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain

---
 .../invoker.properties                        | 19 +++++
 .../projects/MJAVADOC-704_toolchains/pom.xml  | 78 +++++++++++++++++++
 .../src/main/java/com/foo/MyClass.java        | 25 ++++++
 .../src/main/java/module-info.java            | 22 ++++++
 .../MJAVADOC-704_toolchains/verify.groovy     | 23 ++++++
 5 files changed, 167 insertions(+)
 create mode 100644 src/it/projects/MJAVADOC-704_toolchains/invoker.properties
 create mode 100644 src/it/projects/MJAVADOC-704_toolchains/pom.xml
 create mode 100644 src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
 create mode 100644 src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
 create mode 100644 src/it/projects/MJAVADOC-704_toolchains/verify.groovy

diff --git a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
new file mode 100644
index 000000000..2342848e5
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.toolchain.jdk.version = 11
+invoker.maven.version = 3.3.1
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-704_toolchains/pom.xml b/src/it/projects/MJAVADOC-704_toolchains/pom.xml
new file mode 100644
index 000000000..08e2c40e8
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.javadoc.it</groupId>
+  <artifactId>mjavadoc704</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <url>https://issues.apache.org/jira/browse/MJAVADOC-704</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.6</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.9.0</version>
+        <configuration>
+          <release>11</release>
+          <jdkToolchain>
+            <version>11</version>
+          </jdkToolchain>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <release>11</release>
+          <jdkToolchain>
+            <version>11</version>
+          </jdkToolchain>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
new file mode 100644
index 000000000..7370ac086
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
@@ -0,0 +1,25 @@
+package com.foo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class MyClass
+{
+
+}
diff --git a/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
new file mode 100644
index 000000000..45f7f3d91
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module M.N {
+    requires org.apache.commons.lang3;
+}
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-704_toolchains/verify.groovy b/src/it/projects/MJAVADOC-704_toolchains/verify.groovy
new file mode 100644
index 000000000..fedfda71b
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/verify.groovy
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ 
+def log = new File( basedir, 'build.log').text
+
+assert log.count( "[INFO] Toolchain in maven-compiler-plugin: JDK" ) == 2
+assert log.count( "[INFO] Toolchain in maven-javadoc-plugin: JDK" ) == 1
\ No newline at end of file