Merge branch 'hotfix-10.8.71' into stable

.travis.yml

@@ -6,7 +6,6 @@ jdk:
 node_js:
   - "4.2.6"
 services:
-  - docker
   - mysql
 before_install:
   - mkdir /tmp/bin

README.md

@@ -9,6 +9,6 @@ PresideCMS
 
 PresideCMS is an open source CMS for the [Lucee Server](http://lucee.org) built on the [ColdBox MVC Framework](http://www.coldbox.org). It is developed and maintained by [Pixl8 Interactive](http://www.pixl8.co.uk).
 
-[Website (http://www.presidecms.com)](http://www.presidecms.com)
+[Website (https://www.preside.org)](https://www.preside.org)
 
-[Documentation and quick start guide (http://docs.presidecms.com)](http://docs.presidecms.com)
+[Documentation and quick start guide (https://docs.presidecms.org)](https://docs.preside.org)

box.json

@@ -5,7 +5,7 @@
     "createPackageDirectory":true,
     "packageDirectory":"preside",
     "homepage":"https://www.presidecms.com",
-    "documentation":"https://docs.presidecms.com",
+    "documentation":"https://docs.preside.org",
     "repository":{
         "type":"github",
         "URL":"https://github.com/pixl8/Preside-CMS"
@@ -14,7 +14,7 @@
     "slug":"presidecms",
     "shortDescription":"The PresideCMS platform by Pixl8 Interactive",
     "description":"",
-    "instructions":"https://docs.presidecms.com/quickstart.html",
+    "instructions":"https://docs.preside.org/quickstart.html",
     "changelog":"https://www.presidecms.com/release-notes.html",
     "keywords":"CMS,ColdBox,FOSS",
     "private":false,

box.json.no.deps

@@ -5,7 +5,7 @@
     "createPackageDirectory":true,
     "packageDirectory":"preside",
     "homepage":"https://www.presidecms.com",
-    "documentation":"https://docs.presidecms.com",
+    "documentation":"https://docs.preside.org",
     "repository":{
         "type":"github",
         "URL":"https://github.com/pixl8/Preside-CMS"
@@ -14,7 +14,7 @@
     "slug":"presidecms",
     "shortDescription":"The PresideCMS platform by Pixl8 Interactive",
     "description":"",
-    "instructions":"https://docs.presidecms.com/quickstart.html",
+    "instructions":"https://docs.preside.org/quickstart.html",
     "changelog":"https://www.presidecms.com/release-notes.html",
     "keywords":"CMS,ColdBox,FOSS",
     "private":false,

build.sh

@@ -8,13 +8,12 @@ echo "--------------------------------------------------------";
 echo "Welcome to the PresideCMS Test runner and build suite :)";
 echo "--------------------------------------------------------";
 echo "";
-echo "This script will install dependencies, run tests, and conditionally build docs and package preside into a ZIP file.";
+echo "This script will install dependencies, run tests, and conditionally package preside into a ZIP file.";
 echo "Each of these operations can be run independently with the following commands:";
 echo "";
 echo "box install                                   - installs dependencies";
 echo "cd system/assets/ && npm install && grunt all - builds static assets";
 echo "./test.sh                                     - runs tests";
-echo "./support/docs/build.sh                       - builds documentation";
 echo "ant -f ./support/build/build.xml              - packages PresideCMS into a zip file";
 echo "";
 echo "The script has dependencies on CommandBox, ant + an accessible database for running the test suite.";
@@ -51,18 +50,10 @@ if [[ $TRAVIS_JDK_VERSION == 'openjdk7' ]] ; then
 fi
 
 if  [[ $TRAVIS_PULL_REQUEST == 'true' ]] ; then
-	echo "Finished (not packaging up docs or source due to running in a pull request)."
+	echo "Finished (not packaging up source due to running in a pull request)."
 	exit 0;
 fi
 
-if [[ $TRAVIS_TAG == v* ]] ; then
-	./support/docs/build.sh
-
-	echo "";
-	echo "";
-else
-	echo "Skipping docs build, not on a release tag in a travis build. To build the docs yourself, run ./support/docs/build.sh"
-fi
 if [[ $TRAVIS_TAG == v* ]] || [[ $TRAVIS_BRANCH == release* ]] ; then
 	if [[ $TRAVIS_TAG == v* ]] ; then
 		VERSION_NUMBER="${TRAVIS_TAG//v}"
@@ -77,24 +68,6 @@ if [[ $TRAVIS_TAG == v* ]] || [[ $TRAVIS_BRANCH == release* ]] ; then
 	echo "";
 
 	ant -f support/build/build.xml -Dbranch=$TRAVIS_BRANCH -Dtag=$TRAVIS_TAG -Dversionnumber=$VERSION_NUMBER
-
-	echo "";
-	echo "";
-	echo "Creating and registering docker image";
-
-	if [[ $TRAVIS_TAG == v* ]] ; then
-		DOCKER_TAG=${TRAVIS_TAG:1}
-	else
-		DOCKER_TAG=bleeding-edge
-	fi
-
-	docker build -t pixl8/preside-cms:$DOCKER_TAG ./support/build
-	docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-	docker push pixl8/preside-cms:$DOCKER_TAG
-
-	if [[ $TRAVIS_TAG == v* ]] ; then
-		docker push pixl8/preside-cms:latest
-	fi
 else
 	echo "Skipping packaging, not on stable or release branch in a travis build. To package preside yourself, run ant -f ./support/build/build.xml"
 fi