diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..b2a6b3e Binary files /dev/null and b/.DS_Store differ 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