This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new c93f6131c Upgrade to Javadoc plugin 3.4.1
c93f6131c is described below
commit c93f6131ce1a4bab0707e786224691309e2fbb7e
Author: JamesBognar <[email protected]>
AuthorDate: Sat Nov 26 13:07:41 2022 -0500
Upgrade to Javadoc plugin 3.4.1
---
juneau-all/pom.xml | 4 ++--
juneau-core/juneau-assertions/pom.xml | 2 --
juneau-core/juneau-common/pom.xml | 2 --
juneau-core/juneau-config/pom.xml | 2 --
juneau-core/juneau-dto/pom.xml | 2 --
juneau-core/juneau-marshall-rdf/pom.xml | 2 --
juneau-core/juneau-marshall/pom.xml | 2 --
.../Topics/08.juneau-rest-server/01.jrs.Overview.html | 6 +++---
.../01.jrss.Overview.html | 4 ++--
juneau-doc/pom.xml | 3 ---
juneau-examples/juneau-examples-core/pom.xml | 2 --
juneau-examples/juneau-examples-rest-jetty/pom.xml | 4 ----
juneau-examples/juneau-examples-rest-springboot/pom.xml | 3 ---
juneau-examples/juneau-examples-rest/pom.xml | 8 ++------
juneau-microservice/juneau-microservice-core/pom.xml | 6 ++----
juneau-microservice/juneau-microservice-ftest/pom.xml | 4 ++--
juneau-microservice/juneau-microservice-jetty/pom.xml | 4 ++--
juneau-rest/juneau-rest-client/pom.xml | 2 --
juneau-rest/juneau-rest-common/pom.xml | 2 --
juneau-rest/juneau-rest-mock/pom.xml | 6 ++----
juneau-rest/juneau-rest-server-rdf/pom.xml | 7 +++----
juneau-rest/juneau-rest-server-springboot/pom.xml | 6 ++++--
juneau-rest/juneau-rest-server/pom.xml | 6 ++----
juneau-sc/juneau-sc-client/pom.xml | 1 -
juneau-utest/pom.xml | 4 ++--
pom.xml | 17 +++++++++--------
26 files changed, 37 insertions(+), 74 deletions(-)
diff --git a/juneau-all/pom.xml b/juneau-all/pom.xml
index 44b24b793..0c3f4f66e 100644
--- a/juneau-all/pom.xml
+++ b/juneau-all/pom.xml
@@ -55,8 +55,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-core/juneau-assertions/pom.xml
b/juneau-core/juneau-assertions/pom.xml
index ff3215c64..022a17a17 100644
--- a/juneau-core/juneau-assertions/pom.xml
+++ b/juneau-core/juneau-assertions/pom.xml
@@ -37,8 +37,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-core/juneau-common/pom.xml
b/juneau-core/juneau-common/pom.xml
index 6b13d7c0b..1950c19a2 100644
--- a/juneau-core/juneau-common/pom.xml
+++ b/juneau-core/juneau-common/pom.xml
@@ -36,8 +36,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-core/juneau-config/pom.xml
b/juneau-core/juneau-config/pom.xml
index 3a12697e6..ee79b5e67 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -37,8 +37,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index d863ae0fc..d7f94e845 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -41,8 +41,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml
b/juneau-core/juneau-marshall-rdf/pom.xml
index a76ef8fd8..9b7b6a1b8 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -46,8 +46,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-core/juneau-marshall/pom.xml
b/juneau-core/juneau-marshall/pom.xml
index 737845b9d..1e278ad11 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -29,8 +29,6 @@
<packaging>bundle</packaging>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
index 9f6a2f26b..efbc5c3d7 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
@@ -26,11 +26,11 @@
Spring Boot:
</p>
<ul class='javatree'>
- <li class='jp'>{@link oaj.examples.rest.jetty}
- <li class='jp'>{@link oaj.examples.rest.springboot}
+ <li class='jp'><c>org.apache.juneau.examples.rest.jetty</c>
+ <li class='jp'><c>org.apache.juneau.examples.rest.springboot</c>
</ul>
<p>
- The {@link oaj.examples.rest.springboot} application is
described in the section <a class="doclink" href="#jrss.Overview">SpringBoot
Overview</a>.
+ The <c>org.apache.juneau.examples.rest.springboot</c>
application is described in the section <a class="doclink"
href="#jrss.Overview">SpringBoot Overview</a>.
</p>
<p>
The Jetty application consists of the following application
class that registers our top-level servlet:
diff --git
a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
index 7fff361c9..f266a9d0e 100644
---
a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
+++
b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
@@ -33,7 +33,7 @@
configuration classes).
</p>
<p>
- The {@link oaj.examples.rest.springboot} package and {@link
oaj.examples.rest.springboot.App}
+ The <c>org.apache.juneau.examples.rest.springboot</c> package
and <c>org.apache.juneau.examples.rest.springboot.App</c>
application are a basic Spring Boot application that shows off
simple Juneau examples including injection beans.
</p>
<p class='bjava'>
@@ -127,7 +127,7 @@
<img class='bordered w800'
src='doc-files/jrss.Overview.RootResources.json.png'>
<p>
- The {@link oaj.examples.rest.springboot.HelloWorldResource}
class shows an example of a child resource
+ The
<c>org.apache.juneau.examples.rest.springboot.HelloWorldResource</c> class
shows an example of a child resource
defined as an injected bean.
</p>
<p class='bjava'>
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index 3a1f94761..4677af340 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -29,9 +29,6 @@
<packaging>bundle</packaging>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
<!-- Note: If you want to build the docs, you have to update
the following location for tools.jar -->
<toolsjar>/Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home/lib/tools.jar</toolsjar>
</properties>
diff --git a/juneau-examples/juneau-examples-core/pom.xml
b/juneau-examples/juneau-examples-core/pom.xml
index a1412d10f..f9860fa34 100644
--- a/juneau-examples/juneau-examples-core/pom.xml
+++ b/juneau-examples/juneau-examples-core/pom.xml
@@ -28,8 +28,6 @@
<description>Apache Juneau Core Examples</description>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
diff --git a/juneau-examples/juneau-examples-rest-jetty/pom.xml
b/juneau-examples/juneau-examples-rest-jetty/pom.xml
index a62077c42..4e0457f69 100644
--- a/juneau-examples/juneau-examples-rest-jetty/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/pom.xml
@@ -29,10 +29,6 @@
<properties>
<encoding>UTF-8</encoding>
-
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
</properties>
diff --git a/juneau-examples/juneau-examples-rest-springboot/pom.xml
b/juneau-examples/juneau-examples-rest-springboot/pom.xml
index 4c6893a30..507603f35 100644
--- a/juneau-examples/juneau-examples-rest-springboot/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/pom.xml
@@ -30,9 +30,6 @@
<properties>
<encoding>UTF-8</encoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
-
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
diff --git a/juneau-examples/juneau-examples-rest/pom.xml
b/juneau-examples/juneau-examples-rest/pom.xml
index 837705041..a1bf66cb3 100644
--- a/juneau-examples/juneau-examples-rest/pom.xml
+++ b/juneau-examples/juneau-examples-rest/pom.xml
@@ -29,10 +29,6 @@
<properties>
<encoding>UTF-8</encoding>
-
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
</properties>
@@ -77,8 +73,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/juneau-microservice/juneau-microservice-core/pom.xml
b/juneau-microservice/juneau-microservice-core/pom.xml
index 70c41aee3..159c72b1f 100644
--- a/juneau-microservice/juneau-microservice-core/pom.xml
+++ b/juneau-microservice/juneau-microservice-core/pom.xml
@@ -28,8 +28,6 @@
<description>Apache Juneau Microservice Core API</description>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
@@ -44,8 +42,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-microservice/juneau-microservice-ftest/pom.xml
b/juneau-microservice/juneau-microservice-ftest/pom.xml
index 8455ae198..d1c97de00 100644
--- a/juneau-microservice/juneau-microservice-ftest/pom.xml
+++ b/juneau-microservice/juneau-microservice-ftest/pom.xml
@@ -57,8 +57,8 @@
<artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
diff --git a/juneau-microservice/juneau-microservice-jetty/pom.xml
b/juneau-microservice/juneau-microservice-jetty/pom.xml
index 6fb6d5e8f..26f3aa92f 100644
--- a/juneau-microservice/juneau-microservice-jetty/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty/pom.xml
@@ -59,8 +59,8 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-rest/juneau-rest-client/pom.xml
b/juneau-rest/juneau-rest-client/pom.xml
index b11f9635a..85fe21418 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -49,8 +49,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-rest/juneau-rest-common/pom.xml
b/juneau-rest/juneau-rest-common/pom.xml
index d5f2b45ad..33d4c65df 100644
--- a/juneau-rest/juneau-rest-common/pom.xml
+++ b/juneau-rest/juneau-rest-common/pom.xml
@@ -46,8 +46,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index c63615cbf..d97ee35ca 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -52,14 +52,12 @@
<artifactId>javax.activation</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-rest/juneau-rest-server-rdf/pom.xml
b/juneau-rest/juneau-rest-server-rdf/pom.xml
index 1cd530b8b..085853a07 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-server-rdf/pom.xml
@@ -40,14 +40,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet.version}</version>
</dependency>
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-rest/juneau-rest-server-springboot/pom.xml
b/juneau-rest/juneau-rest-server-springboot/pom.xml
index df25826fc..797d9cff0 100644
--- a/juneau-rest/juneau-rest-server-springboot/pom.xml
+++ b/juneau-rest/juneau-rest-server-springboot/pom.xml
@@ -34,6 +34,10 @@
<artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
<!-- Spring Boot dependencies-->
<dependency>
@@ -50,8 +54,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index ff5e218d1..37f1f9c77 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -45,8 +45,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -67,8 +67,6 @@
</dependencies>
<properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
diff --git a/juneau-sc/juneau-sc-client/pom.xml
b/juneau-sc/juneau-sc-client/pom.xml
index 7716451d3..93b42a30b 100644
--- a/juneau-sc/juneau-sc-client/pom.xml
+++ b/juneau-sc/juneau-sc-client/pom.xml
@@ -29,7 +29,6 @@
<properties>
<encoding>UTF-8</encoding>
- <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
diff --git a/juneau-utest/pom.xml b/juneau-utest/pom.xml
index 19997c178..5eae9467f 100644
--- a/juneau-utest/pom.xml
+++ b/juneau-utest/pom.xml
@@ -63,8 +63,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.carrotsearch</groupId>
diff --git a/pom.xml b/pom.xml
index 11f5c9870..1b96c6b92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<jaxb.version>2.3.1</jaxb.version>
<junit.version>4.13.2</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
- <servlet.version>4.0.1</servlet.version>
+ <servlet.version>4.0.4</servlet.version>
<httpcore.version>4.4.15</httpcore.version>
<httpclient.version>4.5.13</httpclient.version>
<jetty.version>10.0.12</jetty.version>
@@ -51,7 +51,7 @@
<springboot.version>2.7.5</springboot.version>
<xml.apis.version>1.4.01</xml.apis.version>
<javadoc.executable />
- <javadoc.plugin.version>3.0.1</javadoc.plugin.version>
+ <javadoc.plugin.version>3.4.1</javadoc.plugin.version>
<jacoco.plugin.version>0.8.8</jacoco.plugin.version>
</properties>
@@ -69,8 +69,8 @@
<version>${jaxrs.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
@@ -229,7 +229,6 @@
<windowtitle>Apache Juneau
${project.version}</windowtitle>
<author>true</author>
<linksource>true</linksource>
- <source>1.8</source>
<bootclasspath>${sun.boot.class.path}</bootclasspath>
<classpath>${basedir}/juneau-doc/tools.jar</classpath>
<overview>${basedir}/juneau-doc/src/main/javadoc/overview.html</overview>
@@ -240,13 +239,15 @@
<linksource>true</linksource>
<links>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
-
<link>https://docs.oracle.com/javaee/5/api/</link>
+
<link>https://jakarta.ee/specifications/platform/8/apidocs/</link>
<link>https://hc.apache.org/httpcomponents-client-4.5.x/current/httpclient/apidocs/</link>
<link>https://hc.apache.org/httpcomponents-core-4.4.x/current/httpcore/apidocs/</link>
</links>
<docfilessubdirs>true</docfilessubdirs>
<javadocDirectory>${basedir}/juneau-doc/src/main/javadoc</javadocDirectory>
<javadocExecutable>${javadoc.executable}</javadocExecutable>
+ <source>8</source>
+
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
<executions>
<execution>
@@ -271,8 +272,8 @@
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
-
<compilerArgument>-parameters</compilerArgument>
-
<testCompilerArgument>-parameters</testCompilerArgument>
+
<!--compilerArgument>-parameters</compilerArgument>
+
<testCompilerArgument>-parameters</testCompilerArgument-->
</configuration>
</plugin>
