From a45705fdb8dda6cb76ba15e7b4adfb81ebff70cc Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Wed, 29 Mar 2023 12:49:22 +0200 Subject: Fix javadoc generation broken on JDK 20 Firstly, Javadoc 20 cannot handle source level 1.7 anymore, so I bumped it to 11, which hopefully will be around for another while. It also matches the ajc minimum of Java 11, i.e. ajdoc and ajc are synchronised in this regard now. Secondly, as of JDK 20, the javadoc tool renders HTML pages with section headers specific to the JVM default locale. The workaround is to set the locale to English before calling javadoc. Signed-off-by: Alexander Kriegisch --- ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java | 2 +- ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'ajdoc/src/test/java/org/aspectj') diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java index 8bf87bb73..342435b4d 100644 --- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java +++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AJDocConstants.java @@ -13,6 +13,6 @@ package org.aspectj.tools.ajdoc; */ public class AJDocConstants { - public final static String VERSION = "1.7"; + public final static String VERSION = "11"; } diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java index 35916f030..e9ce22822 100644 --- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java +++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java @@ -167,7 +167,8 @@ public abstract class AjdocTestCase extends TestCase { !sourceLevel.equals("1.7") && !sourceLevel.equals("1.8") && !sourceLevel.equals("1.9") && - !sourceLevel.equals("10")) { + !sourceLevel.startsWith("10") && + !sourceLevel.startsWith("11")) { fail("need to pass ajdoc '1.3' > '1.9' as the source level"); } String[] args = new String[6 + inputFiles.length + ajOptions.length]; @@ -199,7 +200,8 @@ public abstract class AjdocTestCase extends TestCase { !sourceLevel.equals("1.8") && !sourceLevel.equals("1.9") && !sourceLevel.startsWith("9") && - !sourceLevel.startsWith("10")) { + !sourceLevel.startsWith("10") && + !sourceLevel.startsWith("11")) { fail("need to pass suitable version to ajdoc as the source level"); } if (inputFiles.length == 0) { -- cgit v1.2.3