From 3a90de597adff7c8f8c4a420400f24c7386e9880 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@apache.org>
Date: Wed, 9 Oct 2024 11:56:17 -0600
Subject: [PATCH] [MJAVADOC-787] Automatic detection of release option for JDK
 < 9

Similar to MCOMPILER-582, automatically disregard the `--release` flag
for javadoc version < 9.

This closes #326
---
 .../projects/MJAVADOC-787/invoker.properties  | 18 +++++
 src/it/projects/MJAVADOC-787/pom.xml          | 78 +++++++++++++++++++
 .../src/main/java/com/foo/MyClass.java        | 25 ++++++
 3 files changed, 121 insertions(+)
 create mode 100644 src/it/projects/MJAVADOC-787/invoker.properties
 create mode 100644 src/it/projects/MJAVADOC-787/pom.xml
 create mode 100644 src/it/projects/MJAVADOC-787/src/main/java/com/foo/MyClass.java

diff --git a/src/it/projects/MJAVADOC-787/invoker.properties b/src/it/projects/MJAVADOC-787/invoker.properties
new file mode 100644
index 000000000..965ea1bf1
--- /dev/null
+++ b/src/it/projects/MJAVADOC-787/invoker.properties
@@ -0,0 +1,18 @@
+# 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 = 1.8
diff --git a/src/it/projects/MJAVADOC-787/pom.xml b/src/it/projects/MJAVADOC-787/pom.xml
new file mode 100644
index 000000000..df18867c6
--- /dev/null
+++ b/src/it/projects/MJAVADOC-787/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>mjavadoc787</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <url>https://issues.apache.org/jira/browse/MJAVADOC-787</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>@compilerPluginVersion@</version>
+        <configuration>
+          <release>8</release>
+          <jdkToolchain>
+            <version>1.8</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>8</release>
+          <jdkToolchain>
+            <version>1.8</version>
+          </jdkToolchain>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/it/projects/MJAVADOC-787/src/main/java/com/foo/MyClass.java b/src/it/projects/MJAVADOC-787/src/main/java/com/foo/MyClass.java
new file mode 100644
index 000000000..7370ac086
--- /dev/null
+++ b/src/it/projects/MJAVADOC-787/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
+{
+
+}