summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2023-09-07 00:06:52 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2023-09-07 00:06:52 +0200
commitb438804847bae293761f425175f693d385013408 (patch)
tree08cbd22d7bba97110d6e7ffd6f9be96507bdf7c3
parentea02caf1e7fa818f3a470a768bc34d38f8f70e9d (diff)
downloadjgit-b438804847bae293761f425175f693d385013408.tar.gz
jgit-b438804847bae293761f425175f693d385013408.zip
Fix generation of maven site
- update maven-site-plugin to 4.0.0-M9 - use wagon-ssh extension for deployment - disable doclint - don't fail the build for javadoc warnings Change-Id: I81f7229deaf6892416ce4cebd6c122f00a857d51
-rw-r--r--org.eclipse.jgit.benchmarks/pom.xml4
-rw-r--r--pom.xml33
2 files changed, 31 insertions, 6 deletions
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index 541c76b4fb..2861e255c3 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -175,11 +175,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>4.0.0-M9</version>
<dependencies>
<dependency><!-- add support for ssh/scp -->
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
+ <artifactId>wagon-ssh</artifactId>
<version>3.5.3</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index bfd49db9b6..dd7f25b5b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,11 +337,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>4.0.0-M9</version>
<dependencies>
<dependency><!-- add support for ssh/scp -->
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
+ <artifactId>wagon-ssh</artifactId>
<version>3.5.3</version>
</dependency>
</dependencies>
@@ -468,7 +468,7 @@
to check javadoc on tests. We can reconsider to configure this on javadoc
when it starts supporting access specifiers so that we can set
-Xdoclint:all,-missing/private -->
- <additionalJOption>-Xdoclint:none</additionalJOption>-->
+ <additionalJOption>-Xdoclint:none</additionalJOption>
<encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet>
<failOnWarnings>true</failOnWarnings>
@@ -610,7 +610,32 @@
</reportSet>
</reportSets>
<configuration>
- <failOnWarnings>true</failOnWarnings>
+ <failOnWarnings>false</failOnWarnings>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <quiet>true</quiet>
+ <failOnWarnings>false</failOnWarnings>
+ <excludePackageNames>org.eclipse.jgit.http.test</excludePackageNames>
+ <links>
+ <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
+ </links>
+ <tags>
+ <tag>
+ <name>apiNote</name>
+ <placement>a</placement>
+ <head>API Note:</head>
+ </tag>
+ <tag>
+ <name>implSpec</name>
+ <placement>a</placement>
+ <head>Implementation Requirements:</head>
+ </tag>
+ <tag>
+ <name>implNote</name>
+ <placement>a</placement>
+ <head>Implementation Note:</head>
+ </tag>
+ </tags>
</configuration>
</plugin>
<plugin>