From 735c206cb42a031f61bd1e37978ea8f249397db8 Mon Sep 17 00:00:00 2001
From: Maxime Tremblay <maxime.tremblay.consultant@gmail.com>
Date: Fri, 5 Oct 2018 18:27:54 -0400
Subject: [PATCH] Updated for latest versions of ORDS and APEX as-of 2018-10-05

---
 .DS_Store                    | Bin 0 -> 6148 bytes
 README.md                    |   4 ++--
 scripts/config_validation.sh |   4 +++-
 scripts/ords.sh              |   4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b2a6b3e6c870dde3f033c72e8cfe8a9aab8f5326
GIT binary patch
literal 6148
zcmeHKOG-mQ5UkdK0XJD@IalxoLx?BH1p*O5K%yk-`mJ&<k7o4;F}!3WxRGk;u9=>$
zdAwS@eht7D?@tfF48WA`h?9r0`MLYZZYpC$I`4SJ8;&2V!~XeYRDC(&+&dhx!2!FU
z{QWj>y-ZV93P=GdAO)m=6!@hA-g{}&`$R=4AO)nrw*vlsXmrP3I3&iWgCRx$;)Lli
zu49%UHct?H;gHA-&5}w?s?~^LNoT%QT`wFGlMbul!|KUa6N<&td4G#?SWi@x0#e{y
zf!o~9y#GJaugw4FB<-Yt6!=#P*krj{F8E5-TSqVFy|&TUbg%iOyKx;9hG@scXvf@m
fJDx{T)-_-AycZ6ML1#YbMEwl7E;1?b*9v?AELauN

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index b356ffc..753f761 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ App              | Version                 | Description
 ------           | ------                  | ------
 Oracle XE        | 11.2.0.2.0              |
 SQLcl            | 4.2.0                   | Command line SQL
-APEX             | 18.1                    | Currently supports APEX 18.x, 5.x and APEX 4.x releases. Just reference the appropriate file in `config.properties`
-ORDS             | 18.1.1                  |
+APEX             | 18.2                    | Currently supports APEX 18.x, 5.x and APEX 4.x releases. Just reference the appropriate file in `config.properties`
+ORDS             | 18.3.0                  |
 Tomcat           | 7.0.57                  |
 Node JS          | 8.x                     |
 APEX Office Print| 3.0                     | Currently only supports 5.x. Disable the option to install this add-on if you are installing versions earlier or later than 5.x
diff --git a/scripts/config_validation.sh b/scripts/config_validation.sh
index 1d03d5a..44de405 100644
--- a/scripts/config_validation.sh
+++ b/scripts/config_validation.sh
@@ -75,7 +75,9 @@ if [ "$OOS_MODULE_ORDS" = "Y" ]; then
         && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "3.0.11" ]] \
         && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "3.0.12" ]] \
         && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "17.4.1" ]] \
-        && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.1.1" ]]; then
+        && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.1.1" ]] \
+        && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.2.0" ]] \
+        && [[ ! "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.3.0" ]]; then
         echo "This version of ORDS is not yet supprted in OXAR" >&2
         echo "Please report this at http://github.com/OraOpenSource/oxar/issues" >&2
         exit 1
diff --git a/scripts/ords.sh b/scripts/ords.sh
index e8c3b59..4319400 100644
--- a/scripts/ords.sh
+++ b/scripts/ords.sh
@@ -78,7 +78,9 @@ elif [[ "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "3.0.5"
     || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "3.0.11"
     || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "3.0.12"
     || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "17.4.1"
-    || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.1.1" ]]; then
+    || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.1.1"
+    || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.2.0"
+    || "${ORDS_MAJOR}.${ORDS_MINOR}.${ORDS_REVISION}" == "18.3.0" ]]; then
     java -jar ords.war install simple
 fi