You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2021/11/24 12:32:41 UTC

[cayenne] 02/03: CAY-2711 JDK 17 compatibility - fix javadoc options

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 91598c78045ac15e61e5b9251d0133a0e84e94cc
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Nov 19 11:12:38 2021 +0300

    CAY-2711 JDK 17 compatibility
     - fix javadoc options
    
    (cherry picked from commit f1bc36cfb52ba4fa11b029a28cdce8e02833eca1)
---
 pom.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b3bfa9..7e7a4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1728,14 +1728,23 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>java9-javadoc-html5</id>
+			<id>java9-javadoc-html5-no-modules</id>
 			<activation>
-				<jdk>[9,)</jdk>
+				<jdk>[9,14)</jdk>
 			</activation>
 			<properties>
 				<javadoc.additionalOptions>-html5 --no-module-directories</javadoc.additionalOptions>
 			</properties>
 		</profile>
+		<profile>
+			<id>java14-javadoc-html5</id>
+			<activation>
+				<jdk>[14,)</jdk>
+			</activation>
+			<properties>
+				<javadoc.additionalOptions>-html5</javadoc.additionalOptions>
+			</properties>
+		</profile>
 	</profiles>
 
     <reporting>