Merge 67f6e06 into 120758e

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [3.9.2] - 2021-03-12
+### Fixed
+* Changed spring-boot-maven-plugin layout to ZIP (was JAR). This fixes classloading issues with external jars (which can be loaded by adding `-Dloader.path=my.jar`).
+
 ## [3.9.1] - 2021-03-04
 ### Fixed
 * Null pointer exception when creating a metastore tunnel by adding a check for null `configuration-properties`.

README.md

@@ -138,11 +138,11 @@ Example:
       - dev_group_1.*
       mapped-tables:
       - database: prod_db1
-        mapped-tables: 
+        mapped-tables:
         - tbl1
         - tbl_.*
       - database: prod_db2
-        mapped-tables: 
+        mapped-tables:
         - tbl2
     - ...
 
@@ -505,7 +505,7 @@ In addition to these Spring endpoints Waggle Dance exposes some custom endpoints
 
 ## Logging
 Waggle Dance uses [Log4j 2](https://logging.apache.org/log4j/2.x/) for logging. In order to use a custom Log4j 2 XML file, the path to the logging configuration file has to be added to the server configuration YAML file:
-    
+
     logging:
         config: file:/home/foo/waggle-dance/conf/log4j2.xml
 
@@ -536,7 +536,10 @@ Hive UDFs are registered with a database. There are currently two limitations in
 Due to the distributed nature of Waggle Dance using UDFs is not that simple. If you would like a UDF to be used from a federated metastore we'd recommend registering the code implementing it in a distributed file or object store that is accessible from any client (for example you could store the UDF's jar file on S3). See creating permanent functions in the [Hive documentation](https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DDL#LanguageManualDDL-Create/Drop/ReloadFunction).
 
 ### Hive metastore filter hook
-The database calls `getDatabases` and `getAllDatabases`, as well as `getTableMeta` do not support having the provided filter applied at the moment, so their result will not be modified by the filter.
+You can configure a Hive filter hook via: `hive-metastore-filter-hook: filter.hook.class`
+This class needs to be on the classpath and can be an external jar. If so the command to run needs to be updated to ensure correct class loading. This can be done by adding: `-Dloader.path=<path_to_jar>`
+Note: The database calls `getDatabases` and `getAllDatabases`, as well as `getTableMeta` do not support having the provided filter applied at the moment, so their result will not be modified by the filter.
+
 
 ## Building
 

waggle-dance-boot/pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -34,7 +35,8 @@
         <artifactId>spring-boot-maven-plugin</artifactId>
         <version>${spring-boot-maven-plugin.version}</version>
         <configuration>
-		  <mainClass>com.hotels.bdp.waggledance.WaggleDance</mainClass>
+          <layout>ZIP</layout>
+          <mainClass>com.hotels.bdp.waggledance.WaggleDance</mainClass>
           <requiresUnpack>
             <!-- We are hitting an issue introduced in hive-common-2.1.1 and fixed in https://issues.apache.org/jira/browse/HIVE-17155
               The HiveConf class tries loading conf (e.g. hive-site.xml) from the uberjar and fails. Unpacking it with this