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 4b9ce6e Add Release informations and adjust build for it
4b9ce6e is described below
commit 4b9ce6e5d62b949e87f8c444c4eaa7e5c8ea0f84
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat May 18 18:24:33 2019 +0200
Add Release informations and adjust build for it
---
README | 19 +++++++++++++++++++
meta/README | 22 ++++++++++++++++++++++
meta/netbeansrelease.json | 38 ++++++++++++++++++++++++++++++++++++++
vars/asfMainNetBeansBuild.groovy | 25 ++++++++++---------------
4 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/README b/README
index 7af3655..fbfe60f 100644
--- a/README
+++ b/README
@@ -1 +1,20 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+
Shared Jenkins pipeline for Apache NetBeans Maven related builds
diff --git a/meta/README b/meta/README
new file mode 100644
index 0000000..fb3ddaa
--- /dev/null
+++ b/meta/README
@@ -0,0 +1,22 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+
+Json file containing release information for Apache NetBeans.
+
+Json cannot contains ASF Header
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
new file mode 100644
index 0000000..7527db2
--- /dev/null
+++ b/meta/netbeansrelease.json
@@ -0,0 +1,38 @@
+{
+ "release90": {
+ "ant": "Ant (latest)",
+ "jdk": "JDK 1.8 (latest)",
+ "maven": "Maven 3.3.9",
+ "releaseDate": "29 Jul 2018",
+ "atomreleaseDate": "2018-07-29T12:00:00Z",
+ "tlp": "false",
+ "apidocurl": "https://bits.netbeans.org/9.0/javadoc";
+ },
+ "release100": {
+ "ant": "Ant (latest)",
+ "jdk": "JDK 1.8 (latest)",
+ "maven": "Maven 3.3.9",
+ "releaseDate": "27 Dec 2018",
+ "atomreleaseDate": "2018-12-27T12:00:00Z",
+ "tlp": "false",
+ "apidocurl": "https://bits.netbeans.org/10.0/javadoc";
+ },
+ "release110": {
+ "ant": "Ant (latest)",
+ "jdk": "JDK 1.8 (latest)",
+ "maven": "Maven 3.3.9",
+ "releaseDate": "13 Feb 2019",
+ "atomreleaseDate": "2019-02-13T12:00:00Z",
+ "tlp": "false",
+ "apidocurl": "https://bits.netbeans.org/11.0/javadoc";
+ },
+ "master": {
+ "ant": "Ant (latest)",
+ "jdk": "JDK 1.8 (latest)",
+ "maven": "Maven 3.3.9",
+ "releaseDate": "-",
+ "atomreleaseDate": "-",
+ "tlp": "true",
+ "apidocurl": "https://bits.netbeans.org/dev/javadoc";
+ }
+}
\ No newline at end of file
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 54dc976..6a825b4 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -21,7 +21,7 @@
// this script is taken from olamy works on archiva-jenkins-lib for the Apache
Archiva project
def call(Map params = [:]) {
-// variable needed for apidoc
+ // variable needed for apidoc
def myAnt = ""
def apidocurl = ""
def date = ""
@@ -40,26 +40,21 @@ def call(Map params = [:]) {
steps{
script {
// test if we can do that
- sh 'curl
https://netbeans.apache.org/community/index.html -o test.html'
- echo "curl over"
- // write a custom json with valid data
- writeFile(file: 'test.json', text: '{ "release90":
{ "ant": "Ant (latest)", "jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9", "releaseDate": "29 Jul 2018",
"atomreleaseDate": "2018-07-29T12:00:00Z", "tlp": "false",
"apidocurl": "https://bits.netbeans.org/9.0/javadoc";
}, "release100": { "ant": "Ant (latest)", "jdk": "JDK 1.8
(latest)", "maven": "Maven 3.3.9", [...]
-
- def foo = readJSON file: 'test.json'
- sh 'rm -f test.json'
-
- myAnt = foo[env.BRANCH_NAME].ant;
- apidocurl = foo[env.BRANCH_NAME].apidocurl
- date = foo[env.BRANCH_NAME].releaseDate
- atomdate = foo[env.BRANCH_NAME].atomreleaseDate
- jdktool = foo[env.BRANCH_NAME].jdk
+ sh 'curl
https://github.com/apache/netbeans-jenkins-lib/meta/netbeansrelease.json -o
netbeansrelease.json'
+ def releaseData = readJSON file: 'netbeansrelease.json'
+ sh 'rm -f netbeansrelease.json'
+ myAnt = releaseData[env.BRANCH_NAME].ant;
+ apidocurl = releaseData[env.BRANCH_NAME].apidocurl
+ date = releaseData[env.BRANCH_NAME].releaseDate
+ atomdate = releaseData[env.BRANCH_NAME].atomreleaseDate
+ jdktool = releaseData[env.BRANCH_NAME].jdk
}
}
}
stage ("Apidoc") {
tools {
- jdk jdktool
+ jdk jdktool
}
steps {
withAnt(installation: myAnt) {
---------------------------------------------------------------------
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
