This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit af97d09bae922175fb23b2ccccf27239b5139c6e Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Thu Jul 7 09:41:30 2022 +0200 Attempt to fix javadoc for the next release. Doing some tests with mvn release:prepare -DdryRun --- container/mbean-annotation-api/pom.xml | 8 -------- container/openejb-api/pom.xml | 12 ------------ container/openejb-jee-accessors/pom.xml | 12 ------------ container/openejb-jee/pom.xml | 12 ------------ container/openejb-jpa-integration/pom.xml | 8 -------- container/openejb-loader/pom.xml | 12 ------------ pom.xml | 22 ++++++++++++---------- 7 files changed, 12 insertions(+), 74 deletions(-) diff --git a/container/mbean-annotation-api/pom.xml b/container/mbean-annotation-api/pom.xml index 5e5f842594..7791059d90 100644 --- a/container/mbean-annotation-api/pom.xml +++ b/container/mbean-annotation-api/pom.xml @@ -42,14 +42,6 @@ </compilerArgs> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </build> </project> diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml index 91e307dc9d..ee2ead5122 100644 --- a/container/openejb-api/pom.xml +++ b/container/openejb-api/pom.xml @@ -45,17 +45,5 @@ <artifactId>jakartaee-api</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml index 391347db12..7d61cb29b4 100644 --- a/container/openejb-jee-accessors/pom.xml +++ b/container/openejb-jee-accessors/pom.xml @@ -79,17 +79,5 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml index 6dd17c32db..86cf13adc5 100644 --- a/container/openejb-jee/pom.xml +++ b/container/openejb-jee/pom.xml @@ -126,17 +126,5 @@ </build> </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml index 8b3be68d09..709dc5f546 100644 --- a/container/openejb-jpa-integration/pom.xml +++ b/container/openejb-jpa-integration/pom.xml @@ -101,14 +101,6 @@ </arguments> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </build> </project> diff --git a/container/openejb-loader/pom.xml b/container/openejb-loader/pom.xml index b2cb5c2d4c..39b149bf59 100644 --- a/container/openejb-loader/pom.xml +++ b/container/openejb-loader/pom.xml @@ -40,16 +40,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/pom.xml b/pom.xml index 88f55a2acd..5ed4685d57 100644 --- a/pom.xml +++ b/pom.xml @@ -485,7 +485,16 @@ <pushChanges>false</pushChanges> <releaseProfiles /> <autoVersionSubmodules>true</autoVersionSubmodules> - <arguments>-Pno-examples,apache-release -Dmaven.javadoc.skip=true -DskipTests -DfailIfNoTests=false -Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none ${arguments}</arguments> + <arguments>-Pno-examples,apache-release -DskipTests -DfailIfNoTests=false -Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none ${arguments}</arguments> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <source>8</source> + <release>8</release> </configuration> </plugin> @@ -501,13 +510,6 @@ --> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -978,8 +980,8 @@ </additionalOptions> <doclint>none</doclint> <!-- Doclint is enabled by default in java 8+, this conf is needed disable it till a rewrite of javadoc is done (https://www.oracle.com/technetwork/java/javase/documentation/index-137868.html#format)--> <quiet>true</quiet> - <source>11</source> - <skip>true</skip> + <source>8</source> + <release>8</release> </configuration> </plugin> </plugins>
