This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 3cbc908 allow another jdk for apidoc
new fb470a7 Merge pull request #85 from ebarboni/apidocmaster
3cbc908 is described below
commit 3cbc9088d0338ee6e37586d49840ac988e3ee249
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Wed Apr 5 17:09:48 2023 +0200
allow another jdk for apidoc
---
meta/netbeansrelease.json | 1 +
vars/asfMainNetBeansBuild.groovy | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index a7885e0..f90b46a 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -968,6 +968,7 @@
"position": "50000",
"ant": "ant_latest",
"jdk": "jdk_11_latest",
+ "jdktoolapidoc" : "jdk_19_latest",
"jdk_apidoc": "https://docs.oracle.com/en/java/javase/11/docs/api/";,
"maven": "maven_3_latest",
"mavenversion": "dev-SNAPSHOT",
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 6c979a5..b23d2bd 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -123,6 +123,11 @@ def call(Map params = [:]) {
//2018-07-29T12:00:00Z
atomdate =
releaseInformation[branch].releasedate['year']+'-'+releaseInformation[branch].releasedate['month']+'-'+releaseInformation[branch].releasedate['day']+'T12:00:00Z'
tooling.jdktool = releaseInformation[branch].jdk
+ if (releaseInformation[branch].jdktoolapidoc) {
+ tooling.jdktoolapidoc =
releaseInformation[branch].jdktoolapidoc
+ }else {
+ tooling.jdktoolapidoc =
releaseInformation[branch].jdk
+ }
tooling.myMaven = releaseInformation[branch].maven
version = releaseInformation[branch].versionName;
vsixversion = releaseInformation[branch].vsixVersion;
@@ -163,6 +168,9 @@ def call(Map params = [:]) {
sh "ant getallmavencoordinates"
sh "ant build-nbms"
sh "ant build-source-zips"
+ }
+ withAnt(installation: tooling.myAnt, jdk:
tooling.jdktoolapidoc) {
+
sh "ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
junit
'nbbuild/build/javadoc/checklinks-errors.xml'
@@ -212,6 +220,8 @@ def call(Map params = [:]) {
steps {
withAnt(installation: tooling.myAnt) {
sh "ant"
+ }
+ withAnt(installation: tooling.myAnt, jdk:
tooling.jdktoolapidoc) {
sh "ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
}
junit 'nbbuild/build/javadoc/checklinks-errors.xml'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
