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 a2e7b9e migrate to new tools description new 2351b30 Merge pull request #22 from ebarboni/toolsref a2e7b9e is described below commit a2e7b9eb22c4f4ea911fdbe36c11ae3fa7ea9021 Author: Eric Barboni <sk...@apache.org> AuthorDate: Mon Oct 19 12:05:54 2020 +0200 migrate to new tools description --- meta/netbeanshtml4j.json | 12 ++++----- meta/netbeansrelease.json | 60 ++++++++++++++++++++++---------------------- vars/asfStandardBuild.groovy | 4 +-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/meta/netbeanshtml4j.json b/meta/netbeanshtml4j.json index 04886c4..415f0e5 100644 --- a/meta/netbeanshtml4j.json +++ b/meta/netbeanshtml4j.json @@ -1,7 +1,7 @@ { "release-1.5": { "position": "1", - "jdk": "JDK 1.8 (latest)", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", "version": "1.5", "tlp": "false", @@ -9,7 +9,7 @@ }, "release-1.5.1": { "position": "2", - "jdk": "JDK 1.8 (latest)", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", "version": "1.5.1", "tlp": "false", @@ -17,7 +17,7 @@ }, "release-1.6": { "position": "3", - "jdk": "JDK 1.8 (latest)", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", "version": "1.6", "tlp": "false", @@ -25,7 +25,7 @@ }, "release-1.6.1": { "position": "4", - "jdk": "JDK 1.8 (latest)", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", "version": "1.6.1", "tlp": "false", @@ -33,7 +33,7 @@ }, "release-1.7": { "position": "5", - "jdk": "JDK 1.8 (latest)", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", "version": "1.7", "tlp": "true", @@ -41,7 +41,7 @@ }, "master": { "position": "40000", - "jdk": "JDK 1.8 (latest)", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", "version": "dev", "tlp": "true", diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json index 8637987..8839b00 100644 --- a/meta/netbeansrelease.json +++ b/meta/netbeansrelease.json @@ -1,10 +1,10 @@ { "release90": { "position": "1", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "9.0", "mavenversion": "RELEASE90", "tlp": "false", @@ -24,10 +24,10 @@ }, "release100": { "position": "2", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "10", "mavenversion": "RELEASE100", "tlp": "false", @@ -47,10 +47,10 @@ }, "release110": { "position": "3", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "11.0", "mavenversion": "RELEASE110", "tlp": "false", @@ -70,10 +70,10 @@ }, "release111": { "position": "4", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "11.1", "mavenversion": "RELEASE111", "tlp": "true", @@ -116,10 +116,10 @@ }, "release112": { "position": "5", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "11.2", "mavenversion": "RELEASE112", "tlp": "true", @@ -161,10 +161,10 @@ }, "release113": { "position": "6", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "11.3", "mavenversion": "RELEASE113", "tlp": "true", @@ -206,10 +206,10 @@ }, "release120": { "position": "7", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "12.0", "mavenversion": "RELEASE120-u1", "tlp": "true", @@ -260,10 +260,10 @@ }, "release121": { "position": "8", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "12.1", "mavenversion": "RELEASE121", "tlp": "true", @@ -302,10 +302,10 @@ }, "release122": { "position": "9", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "versionName": "12.2", "mavenversion": "RELEASE122", "tlp": "true", @@ -331,10 +331,10 @@ }, "master": { "position": "50000", - "ant": "Ant (latest)", - "jdk": "JDK 1.8 (latest)", + "ant": "ant_latest", + "jdk": "jdk_1.8_latest", "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/", - "maven": "Maven 3.3.9", + "maven": "maven_3.3.9", "mavenversion": "dev-SNAPSHOT", "versionName": "dev", "tlp": "true", diff --git a/vars/asfStandardBuild.groovy b/vars/asfStandardBuild.groovy index 51cf65b..3364679 100644 --- a/vars/asfStandardBuild.groovy +++ b/vars/asfStandardBuild.groovy @@ -29,10 +29,10 @@ def call(Map params = [:]) { ]) // now determine params - def jdk = params.containsKey('jdk') ? params.jdk : 'JDK 1.8 (latest)' + def jdk = params.containsKey('jdk') ? params.jdk : 'jdk_1.8_latest' // use the cmdLine parameter otherwise default depending on current branch def cmdline = params.containsKey('cmdline') ? params.cmdline : (env.BRANCH_NAME == 'master'?"clean deploy site:jar":"clean install") - def mvnName = params.containsKey('mvnName') ? params.mvnName : 'Maven 3.5.4' + def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.5.4' def xvfb = params.containsKey('xvfb') ? true : false def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false), --------------------------------------------------------------------- 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