Merge pull request #11794 from Michael-Gardner/HPCC-20518

HPCC-20518 Add java dependency information into packages containing spark

Reviewed-By: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

cmake_modules/dependencies/artful.cmake

@@ -1,2 +1,6 @@
 # Ubuntu 17.04
 SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS g++ openssh-client openssh-server expect rsync libapr1 python psmisc curl )
+
+if(SPARK)
+    SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS "openjdk-8-jdk | openjdk-9-jdk" )
+endif(SPARK)

cmake_modules/dependencies/bionic.cmake

@@ -1,2 +1,6 @@
 # Ubuntu 18.04
 SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS g++ openssh-client openssh-server expect rsync libapr1 python psmisc curl )
+
+if(SPARK)
+    SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS "openjdk-8-jdk | openjdk-11-jdk" )
+endif(SPARK)

cmake_modules/dependencies/el6.cmake

@@ -1,2 +1,6 @@
 # Centos 6
 SET_DEPENDENCIES ( CPACK_RPM_PACKAGE_REQUIRES m4 libtool gcc-c++ openssh-server openssh-clients expect rsync zip psmisc devtoolset-2-gcc devtoolset-2-binutils devtoolset-2-gcc-c++ curl )
+
+if(SPARK)
+    SET_DEPENDENCIES ( CPACK_RPM_PACKAGE_REQUIRES java-1.8.0-openjdk-devel )
+endif(SPARK)

cmake_modules/dependencies/el7.cmake

@@ -1,2 +1,6 @@
 # Centos 7
 SET_DEPENDENCIES ( CPACK_RPM_PACKAGE_REQUIRES m4 libtool gcc-c++ openssh-server openssh-clients expect rsync zip psmisc curl )
+
+if(SPARK)
+    SET_DEPENDENCIES ( CPACK_RPM_PACKAGE_REQUIRES java-1.8.0-openjdk-devel )
+endif(SPARK)

cmake_modules/dependencies/trusty.cmake

@@ -1,2 +1,7 @@
 # Ubuntu 14.04
 SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS g++ openssh-client openssh-server expect rsync  zip python psmisc curl )
+
+# Requires third party repository
+if(SPARK)
+    SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS "openjdk-8-jdk" )
+endif(SPARK)

cmake_modules/dependencies/xenial.cmake

@@ -1,2 +1,6 @@
 # Ubuntu 16.04
 SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS g++ openssh-client openssh-server expect rsync libapr1 python psmisc curl )
+
+if(SPARK)
+    SET_DEPENDENCIES ( CPACK_DEBIAN_PACKAGE_DEPENDS "openjdk-8-jdk | openjdk-9-jdk" )
+endif(SPARK)