Merge pull request #20 from mcdonnell-john/updates_based_on_pr2211
Updating the pipeline to include additional files
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index c83291e..3eb8f8c 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -211,7 +211,7 @@
"jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/",
"maven": "Maven 3.3.9",
"versionName": "12.0",
- "mavenversion": "RELEASE120-1",
+ "mavenversion": "RELEASE120-u1",
"tlp": "true",
"apidocurl": "https://bits.netbeans.org/12.0/javadoc",
"update_url": "https://netbeans.apache.org/nb/updates/12.0/updates.xml.gz?{$netbeans.hash.code}",
@@ -241,12 +241,16 @@
"version": "beta6",
"vote":"1",
"position": "6"
- }
+ },
+ "efd543aaefdb0a9f8f0073896cb12c82fe4ef9c8": {
+ "version": "u1",
+ "position": "7"
+ }
},
"releasedate": {
- "day": "04",
- "month": "06",
- "year": "2020"
+ "day": "-",
+ "month": "-",
+ "year": "-"
},
"previousreleasedate": {
"day": "24",
@@ -254,6 +258,48 @@
"year": "2020"
}
},
+ "release121": {
+ "position": "8",
+ "ant": "Ant (latest)",
+ "jdk": "JDK 1.8 (latest)",
+ "jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/",
+ "maven": "Maven 3.3.9",
+ "versionName": "12.1",
+ "mavenversion": "RELEASE121",
+ "tlp": "true",
+ "apidocurl": "https://bits.netbeans.org/12.1/javadoc",
+ "update_url": "https://netbeans.apache.org/nb/updates/12.1/updates.xml.gz?{$netbeans.hash.code}",
+ "plugin_url": "https://netbeans.apache.org/nb/plugins/12.1/catalog.xml.gz",
+ "milestones": {
+ "08d65f163be3bb1232098cc66b558438e90ddc01": {
+ "version": "beta1",
+ "position": "1"
+ },
+ "95e4be413811ba9206721bb39c97523022a0180c": {
+ "version": "beta2",
+ "position": "2"
+ },
+ "26e6ce805bae6d79990354fb9bdc4971228f28ad": {
+ "version": "beta3",
+ "position": "3"
+ },
+ "cade25887c5450e4595fa59e616daee4d2520ee0": {
+ "version": "beta4",
+ "vote": "1",
+ "position": "4"
+ }
+ },
+ "releasedate": {
+ "day": "-",
+ "month": "-",
+ "year": "-"
+ },
+ "previousreleasedate": {
+ "day": "04",
+ "month": "06",
+ "year": "2020"
+ }
+ },
"master": {
"position": "50000",
"ant": "Ant (latest)",
diff --git a/resources/org/apache/netbeans/installermac.sh b/resources/org/apache/netbeans/installermac.sh
index 5a68c97..a075626 100644
--- a/resources/org/apache/netbeans/installermac.sh
+++ b/resources/org/apache/netbeans/installermac.sh
@@ -20,19 +20,20 @@
## param 1 workspace filename for binaries-zip
## param 2 version number xx.y (mandatory)
## param 3 timestamp YYMMDD
+## param 4 absolute file path to Apple Developer ID Certificate text file
BASE_DIR=`pwd`
NB_ALL=$BASE_DIR
export BASE_DIR NB_ALL
-DIST=$BASE_DIR/dist
-export DIST
-
if [[ "$4" ]]; then
echo 'I need 4 arguments:'
echo 'usage: installer usage [file path to Apache NetBeans binaries-zip] [versionumber formated xx.y] [timestamp YYMMDD] [path to a certificate]'
fi
+DIST=$BASE_DIR/dist
+export DIST
+
if [ -d $DIST ] ; then
rm -rf $DIST
fi
@@ -131,9 +132,6 @@
BUILD_DESC=$BASENAME_PREFIX
export NB_VER_NUMBER BUILDNUMBER BASENAME_PREFIX NB_BUILD_NUMBER DATESTAMP BUILD_DESC
-MAC_PATH=$DIST
-#export MAC_PATH
-
#To build MAC installer on mac host set BUILD_MAC to 1
BUILD_MAC=1
export BUILD_MAC
