Merge pull request #9 from cubastanley/QACI-448-refactor-legacy

[QACI-448] - Refactor Legacy Scripts
payara · Sep 15, 2020 · 50f3b7c · 50f3b7c
2 parents dc8c6de + e6ef3a3
commit 50f3b7c
Show file tree

Hide file tree

Showing 11 changed files with 526 additions and 1,880 deletions.
diff --git a/Legacy/4/build-and-stage-4.sh b/Legacy/4/build-and-stage-4.sh
diff --git a/Legacy/4/build-and-stage-new-rc-4.sh b/Legacy/4/build-and-stage-new-rc-4.sh
diff --git a/Legacy/4/rebuild-and-stage-4.sh b/Legacy/4/rebuild-and-stage-4.sh
diff --git a/Legacy/4/reupload-staging-4.sh b/Legacy/4/reupload-staging-4.sh
diff --git a/Legacy/4/upload-patches-4.sh b/Legacy/4/upload-patches-4.sh
diff --git a/Legacy/Blue/build-and-stage-blue.sh b/Legacy/Blue/build-and-stage-blue.sh
diff --git a/Legacy/Blue/build-and-stage-new-rc-blue.sh b/Legacy/Blue/build-and-stage-new-rc-blue.sh
diff --git a/Legacy/Blue/rebuild-and-stage-blue.sh b/Legacy/Blue/rebuild-and-stage-blue.sh
diff --git a/Legacy/Blue/reupload-staging-blue.sh b/Legacy/Blue/reupload-staging-blue.sh
diff --git a/Legacy/Blue/upload-patches-blue.sh b/Legacy/Blue/upload-patches-blue.sh
diff --git a/Legacy/legacy-release-config.properties b/Legacy/legacy-release-config.properties
@@ -4,40 +4,15 @@
 # The name of the Payara GitHub repository remote
 MASTER_REMOTE=
 
-# The name of the Payara Bitbucket repository remote
-MAINTENANCE_REMOTE=
-
 # The path to your local Payara Git repository
 REPO_DIR=
 
-### New Version Variables ###
-# The new full version of Payara (e.g. 5.183.2)
-VERSION=
+### Legacy Version Variables ###
+# The patch version for this release - DO NOT INCLUDE SNAPSHOTS
+RELEASE_PATCH_VERSION=
 
-# The new update version of Payara (e.g. blank if doing a community stream release, 1 for the first patch release, 2 for the second patch release etc.)
-UPDATE_VERSION=
-
-# The new full version of Payara with escaped .'s (e.g. 5\.183\.2)
-ESCAPED_VERSION=
-
-### Old Version Variables ###
-# The maintenance branch version (e.g. 5.183) - ONLY FOR FEATURE/STABILITY STREAM RELEASES
-MAINTENANCE_VERSION=
-
-# The current full version present in the POMs (e.g. 5.183.1 if doing the 5.183.2 patch release, 5.184-SNAPSHOT if doing the 5.184 community release)
-OLD_VERSION=
-
-# The current update version present in the POMs (e.g. blank if the previous release was a community stream release, 1 if the previous release was 5.183.1)
-OLD_UPDATE_VERSION=
-
-# The update version for the next release to come (e.g. if releasing 4.1.2.191.16 now, enter 17)
-FUTURE_UPDATE_VERSION=
-
-# The current full version present in the POMs with escaped .'s (e.g. 5\.183\.1)
-ESCAPED_OLD_VERSION=
-
-# The next full version to release (i.e. if releasing 4.1.2.191.16, enter as 4\.1\.2\.191\.17)
-ESCAPED_FUTURE_VERSION=
+# The patch version for the NEXT release - DO NOT INCLUDE SNAPSHOTS
+FUTURE_PATCH_VERSION=
 
 ### Build Variables ###
 # The Release Candidate version
@@ -50,20 +25,17 @@ BUILD_NUMBER=
 JIRA_NUMBER=
 
 ### JDK Locations ###
+# If building blue, use directory for IBM JDK in these parameters
+
 # The path to the home directory of your JDK8 installation (e.g. /opt/java/jdk8) - NOT THE BIN DIRECTORY!
 JDK8_PATH=
 
 # The path to the home directory of your JDK7 installation (e.g. /opt/java/jdk7) - NOT THE BIN DIRECTORY AND ONLY FOR 4.x RELEASES!
 JDK7_PATH=
-
-### Blue JDK Locations - ONLY FOR BLUE RELEASES ###
-# The path to the home directory of your IBM JDK8 installation (e.g. /opt/java/jdk8) - NOT THE BIN DIRECTORY!
-BLUE_JDK8_PATH=
-
-# The path to the home directory of your IBM JDK7 installation (e.g. /opt/java/jdk7) - NOT THE BIN DIRECTORY AND ONLY FOR 4.x RELEASES!
-BLUE_JDK7_PATH=
 
-################################################
-##### ONLY UPDATE IF THE BASE POM CHANGES ######
-################################################
+##########################################################
+##### ONLY UPDATE IF THE BASE POM AND BRANCH CHANGE ######
+##########################################################
 OLD_VERSION=4.1.1.171.0.1
+BASE_VERSION=4.1.2.191
+ESCAPED_BASE_VERSION=4\.1\.2\.191