This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 3cd59aa make javadocs work under JDK > 8
3cd59aa is described below
commit 3cd59aa0226001b53894bcca21a86704acbd6045
Author: juanpablo <[email protected]>
AuthorDate: Sat Nov 7 21:25:14 2020 +0100
make javadocs work under JDK > 8
---
Jenkinsfile | 2 +-
pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f6c3f49..d695e23 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ try {
withCredentials( [ string( credentialsId:
'sonarcloud-jspwiki', variable: 'SONAR_TOKEN' ) ] ) {
def sonarOptions = "-Dsonar.projectKey=jspwiki-builder
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io
-Dsonar.login=$SONAR_TOKEN"
echo 'Will use SonarQube instance at
https://sonarcloud.io'
- sh "mvn clean
org.jacoco:jacoco-maven-plugin:prepare-agent install
org.jacoco:jacoco-maven-plugin:report -Pattach-additional-artifacts sonar:sonar
-up $sonarOptions"
+ sh "mvn clean
org.jacoco:jacoco-maven-plugin:prepare-agent install
org.jacoco:jacoco-maven-plugin:report -Pattach-additional-artifacts sonar:sonar
-up $sonarOptions -Djdk.javadoc.doclet.version=2.0.12"
}
pom = readMavenPom file: 'pom.xml'
writeFile file: 'target/classes/apidocs.txt', text: 'file
created in order to allow aggregated javadoc generation, target/classes is
needed for all modules'
diff --git a/pom.xml b/pom.xml
index 67bb01a..9b02336 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,6 +515,7 @@
<author>${project.organization.name}</author>
<bottom>Copyright © {inceptionYear}-{currentYear}
${project.organization.name}. All rights reserved.</bottom>
<breakiterator>true</breakiterator>
+ <detectJavaApiLink>false</detectJavaApiLink>
<doclet>nl.talsmasoftware.umldoclet.UMLDoclet</doclet>
<docletArtifact>
<groupId>nl.talsmasoftware</groupId>
