wip - 4.0.1 working with jar rename

Author: maltesander

hive/Dockerfile

@@ -235,7 +235,10 @@ USER ${STACKABLE_USER_UID}
 
 ENV HIVE_HOME=/stackable/hive-metastore
 ENV HADOOP_HOME=/stackable/hadoop
-ENV PATH="${PATH}":/stackable/hadoop/bin:/stackable/hive-metastore/bin
+ENV PATH="${PATH}:${HADOOP_HOME}/bin:${HIVE_HOME}/bin"
+#ENV CLASSPATH="${HADOOP_HOME}/lib/*:${HIVE_HOME}/lib/*:/stackable/auxlib/*:."
+#ENV CLASSPATH="${HADOOP_HOME}/lib/*:${HIVE_HOME}/lib/*:."
+#ENV HIVE_AUX_JARS_PATH="${HIVE_HOME}/auxlib/hms4-4.0.1-3.3.6-v1.0.0.jar"
 
 # The following 2 env-vars are required for common hadoop scripts even if the respective libraries are never used.
 # We set them here to a sensible default.

hive/hive-metastore-opa-authorizer/Dockerfile

@@ -49,13 +49,20 @@ mvn versions:set -DnewVersion=${AUTHORIZER_VERSION}
 
 # The if part can be removed once we do no longer support Hive 3.x.x
 # Hive 3.1.3 only works with the shaded jar
-if [[ "${HIVE_VERSION}" =~ ^3 ]]; then
+if [[ "${HIVE_VERSION}" =~ "^3" ]]; then
   mvn clean package -DskipTests -Dhive.version=${HIVE_VERSION} -Dhadoop.version=${HADOOP_VERSION} -f hms-v3/pom.xml
-  mv hms-v3/target/com.bosch.bdps.hms3-${HIVE_VERSION}-${HADOOP_VERSION}-${AUTHORIZER_VERSION}.jar /stackable/opa-authorizer-bin
+  mv hms-v3/target/com.bosch.bdps.hms3-${HIVE_VERSION}-${HADOOP_VERSION}-${AUTHORIZER_VERSION}.jar /stackable/opa-authorizer-bin/hms3-${HIVE_VERSION}-${HADOOP_VERSION}-${AUTHORIZER_VERSION}.jar
+# Hive 4.0.1 only works with the shaded jar
+elif [[ "${HIVE_VERSION}" == "4.0.1" ]]; then
+  mvn clean package -DskipTests -Dhive.version=${HIVE_VERSION} -Dhadoop.version=${HADOOP_VERSION} -f hms-v4/pom.xml
+  # The renaming from "com.bosch.bdps.hms4-..." to "zhms4-.." is required for 4.0.1 because it is a dependency mess and otherwise loaded before other hive
+  # libraries. Setting CLASSPATH or HIVE_AUX_JARS_PATH did not reorder the dependency loading up as well. 
+  # This is very very bad and depends on alhpabetically ordering...
+  mv hms-v4/target/com.bosch.bdps.hms4-${HIVE_VERSION}-${HADOOP_VERSION}-${AUTHORIZER_VERSION}.jar /stackable/opa-authorizer-bin/zhms4-${HIVE_VERSION}-${HADOOP_VERSION}-${AUTHORIZER_VERSION}.jar
 # Hive 4.1.0 only works with the non shaded jar
 else
   mvn clean package -DskipTests -Dhive.version=${HIVE_VERSION} -Dhadoop.version=${HADOOP_VERSION} -f hms-v4/pom.xml
-  mv hms-v4/target/hms4-${AUTHORIZER_VERSION}.jar /stackable/opa-authorizer-bin
+  mv hms-v4/target/hms4-${AUTHORIZER_VERSION}.jar /stackable/opa-authorizer-bin/hms4-${HIVE_VERSION}-${HADOOP_VERSION}-${AUTHORIZER_VERSION}.jar
 fi
 
 # We're removing these to make the intermediate layer smaller