This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 15b0aec JENA-2232: Fix javadoc production for java11
new 0fe1bbf Merge pull request #1144 from afs/javadoc-modules-fix
15b0aec is described below
commit 15b0aeccffcadcaed8f334250267dbe355f47326
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Tue Dec 28 18:27:51 2021 +0000
JENA-2232: Fix javadoc production for java11
---
jena-core/pom.xml | 1 -
jena-geosparql/pom.xml | 15 ---------------
pom.xml | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index 34ee3c3..697f3c4 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -172,7 +172,6 @@
<windowtitle>Apache Jena</windowtitle>
<doctitle>Apache Jena Core ${project.version}</doctitle>
<bottom>Licenced under the Apache License, Version 2.0</bottom>
-<!--
<excludePackageNames>org.apache.jena.shared.*:*.impl:org.apache.jena.assembler.assemblers:*.exceptions:*.regexptrees:org.apache.jena.mem:org.apache.jena.mem.*:org.apache.jena.n3:org.apache.jena.n3.*:org.apache.jena.rdf.arp.*:org.apache.jena.util.*:jena.cmdline:jena.util</excludePackageNames>
-->
<excludePackageNames>org.apache.jena.n3:org.apache.jena.n3.*</excludePackageNames>
<groups>
<group>
diff --git a/jena-geosparql/pom.xml b/jena-geosparql/pom.xml
index 2bc66f4..ba7a10c 100644
--- a/jena-geosparql/pom.xml
+++ b/jena-geosparql/pom.xml
@@ -94,20 +94,6 @@
</dependencies>
- <profiles>
- <!-- Tests: Java8 only
- A change in the doubles is resulting in
- test failures on precision but the test
- is string based of WKT.
- -->
- <profile>
- <id>java-after-8</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- </profile>
- </profiles>
-
<build>
<plugins>
@@ -117,7 +103,6 @@
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
- <!-- See profile. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index a46646b..0eb58e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,27 @@
</modules>
</profile>
+
+ <profile>
+ <!-- https://bugs.openjdk.java.net/browse/JDK-8215291 -->
+ <id>java11-javadoc</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- Java 11 only, removed at Java13 -->
+ <additionalOptions>--no-module-directories</additionalOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
<dependencyManagement>
