Update Geoserver Version Checking (#1280)

* Geoserver version fix

* Comment out docker builds

* Add debug flags

* Add geoserver version into info message

* Change filename

* Move geoserver version to vendor build

* Fix missing fi statement

* Revert dockerfile

* Revert Jenkinsfile

deploy/packaging/docker/build-rpm/build-services-rpm.sh

@@ -36,11 +36,13 @@ done
 GEOWAVE_VERSION=$(cat $WORKSPACE/deploy/target/version.txt)
 FPM_SCRIPTS="${WORKSPACE}/deploy/packaging/docker/build-rpm/fpm_scripts"
 GEOWAVE_DIR="/usr/local/geowave-${GEOWAVE_VERSION}-${VENDOR_VERSION}"
+GEOSERVER_VERSION=$(cat $WORKSPACE/deploy/target/geoserver_version.txt)
 
 echo "---------------------------------------------------------------"
 echo "      Building Services RPMS with the following settings"
 echo "---------------------------------------------------------------"
 echo "GEOWAVE_VERSION=${GEOWAVE_VERSION}"
+echo "GEOSERVER_VERSION=${GEOSERVER_VERSION}"
 echo "TIME_TAG=${TIME_TAG}"
 echo "BUILD_ARGS=${BUILD_ARGS}"
 echo "VENDOR_VERSION=${VENDOR_VERSION}"
@@ -55,10 +57,15 @@ cd services_tmp
 
 #grab the geoserver war file and tomcat tarball
 #Check if the files already exists before grabbing them
-GEOSERVER_VERSION="$(mvn -q -Dexec.executable="echo" -Dexec.args='${geoserver.version}' --non-recursive -f $WORKSPACE/pom.xml exec:exec $BUILD_ARGS)"
 if [ ! -f geoserver-$GEOSERVER_VERSION-war.zip ]; then
   echo "Downloading geoserver-$GEOSERVER_VERSION-war"
-  wget -q https://s3.amazonaws.com/geowave/third-party-downloads/geoserver/geoserver-$GEOSERVER_VERSION-war.zip
+  if [[ $(curl -I --write-out %{http_code} --silent --output /dev/null  https://s3.amazonaws.com/geowave/third-party-downloads/geoserver/geoserver-$GEOSERVER_VERSION-war.zip) == 200 ]]; then
+    echo "Downloading from Geoserver Bucket"
+    wget -q https://s3.amazonaws.com/geowave/third-party-downloads/geoserver/geoserver-$GEOSERVER_VERSION-war.zip
+  else
+    echo "Downloading from Geoserver.org"
+    wget -q https://build.geoserver.org/geoserver/release/$GEOSERVER_VERSION/geoserver-$GEOSERVER_VERSION-war.zip
+  fi
 fi
 
 if [ ! -f apache-tomcat-8.5.20.tar.gz ]; then

deploy/packaging/docker/build-src/build-geowave-vendor.sh

@@ -38,6 +38,9 @@ mvn clean
 # Throughout the build, capture jace artifacts to support testing
 mkdir -p $WORKSPACE/deploy/target/geowave-c++/bin
 
+GEOSERVER_VERSION="$(mvn -q -Dexec.executable="echo" -Dexec.args='${geoserver.version}' --non-recursive -f $WORKSPACE/pom.xml exec:exec $BUILD_ARGS)"
+echo $GEOSERVER_VERSION > $WORKSPACE/deploy/target/geoserver_version.txt
+
 GEOWAVE_VERSION_STR="$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive -f $WORKSPACE/pom.xml exec:exec)"
 GEOWAVE_VERSION="$(echo ${GEOWAVE_VERSION_STR} | sed -e 's/"//g' -e 's/-SNAPSHOT//g')"
 echo $GEOWAVE_VERSION > $WORKSPACE/deploy/target/version.txt