Skip to content

Commit

Permalink
[MRESOLVER-422] Fix javadoc configuration (#359)
Browse files Browse the repository at this point in the history
Not much to fix really, but simply put the "minimally required Java" and Javadoc URL needs to be kept in sync. But, as former is a range, latter is a "base version", it goes only manually.

Hence, I left a note in POM for this.

Site related fixes:
* Javadoc craps out on 19 and 21 JDK transport modules (nothing to document).
* PMD does not supports Java 21.

---

https://issues.apache.org/jira/browse/MRESOLVER-422
  • Loading branch information
cstamas authored Nov 8, 2023
1 parent b3d0aea commit 0a9dafe
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>19</javaVersion>
<!-- Different workarounds for site -->
<maven.javadoc.skip>true</maven.javadoc.skip>
<pmd.skip>true</pmd.skip>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@
<Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>19</javaVersion>
<javaVersion>21</javaVersion>
<!-- Different workarounds for site -->
<maven.javadoc.skip>true</maven.javadoc.skip>
<pmd.skip>true</pmd.skip>
</properties>

<dependencies>
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<!-- used by supplier and demo only -->
<mavenVersion>4.0.0-alpha-8</mavenVersion>
<minimalMavenBuildVersion>[3.8.8,)</minimalMavenBuildVersion>
<!-- MRESOLVER-422: keep this in sync with Javadoc plugin configuration (but cannot directly, as this below is range) -->
<minimalJavaBuildVersion>[21.0.1,)</minimalJavaBuildVersion>
<project.build.outputTimestamp>2023-11-02T11:01:10Z</project.build.outputTimestamp>
</properties>
Expand Down Expand Up @@ -398,9 +399,9 @@
<linksource>true</linksource>
<notimestamp>true</notimestamp>
<legacyMode>true</legacyMode>
<release>11</release>
<release>21</release>
<links>
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
<link>https://docs.oracle.com/en/java/javase/21/docs/api/</link>
</links>
<tags>
<tag>
Expand Down

0 comments on commit 0a9dafe

Please sign in to comment.