Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAMEL-21190 - Configure Maven Javadoc Plugin for Java version used for compilation #15983

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

CAMEL-21190 - Configure Maven Javadoc Plugin for Java version used for compilation #15983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3546,12 +3546,12 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<attach>true</attach>
<source>${jdk.version}</source>
<release>${maven.javadoc.release}</release>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understood well, we should be able to even not provide the release version now as it would pick it up from maven-compiler.release https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html#release
But maybe better to keep it for now to have a finer grained control.

<quiet>true</quiet>
<bottom>Apache Camel</bottom>
<detectOfflineLinks>false</detectOfflineLinks>
<javadocVersion>1.8.0</javadocVersion>
<encoding>UTF-8</encoding>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -3717,14 +3717,15 @@
<version>${maven-javadoc-plugin-version}</version>
<configuration>
<links>
<link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>http://docs.oracle.com/javaee/7/api/</link>
<link>http://docs.spring.io/spring/docs/${spring-version}/javadoc-api/</link>
<link>https://docs.oracle.com/javase/17/docs/api/</link>
<link>https://docs.oracle.com/javaee/7/api/</link>
<link>https://docs.spring.io/spring/docs/${spring-version}/javadoc-api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>500m</maxmemory>
<source>${jdk.version}</source>
<release>${maven.javadoc.release}</release>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<maven.compiler.release>${jdk.version}</maven.compiler.release>
<maven.javadoc.release>${jdk.version}</maven.javadoc.release>
<minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>

<!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
Expand Down Expand Up @@ -634,7 +635,7 @@
<goal>jar</goal>
</goals>
<configuration>
<source>11</source>
<release>${maven.javadoc.release}</release>
<doclint>none</doclint>
</configuration>
</execution>
Expand Down Expand Up @@ -708,7 +709,7 @@
</execution>
</executions>
<configuration>
<source>8</source>
<release>${maven.javadoc.release}</release>
<additionalOptions>${javadoc.opts}</additionalOptions>
<!-- disable Javadoc linting for buildung the release with Java 11 -->
<doclint>none</doclint>
Expand Down
Loading