From e61dd5b3250ddaad8f691813d8a3f7a97f968e02 Mon Sep 17 00:00:00 2001
From: rpoluri <38321430+rpoluri@users.noreply.github.com>
Date: Mon, 16 Mar 2020 08:32:58 -0500
Subject: [PATCH] apiary extensions 6.0.0 (#71)

Co-authored-by: Raj Poluri <rpoluri@expediagroup.com>
---
 CHANGELOG.md        | 5 +++++
 Dockerfile          | 7 +++----
 files/hive-site.xml | 2 +-
 files/startup.sh    | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a0c8f9..3c909bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.10.0] - 2020-03-16
+
+### Changed
+- Updated `apiary-metastore-listener` and `kafka-metastore-listener` versions to `6.0.0` (was `5.0.2`).
+
 ## [1.9.0] - 2020-02-10
 ### Added
 - Enable Prometheus exporter when running on Kubernetes instead of sending metrics to CloudWatch.
diff --git a/Dockerfile b/Dockerfile
index 2dac0a3..cf4a2ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,7 @@
 from amazonlinux:latest
 
 ENV RANGER_VERSION 2.0.0
-ENV APIARY_METASTORE_LISTENER_VERSION 5.0.2
-ENV KAFKA_METASTORE_LISTENER_VERSION 5.0.2
+ENV APIARY_EXTENSIONS_VERSION 6.0.0
 ENV APIARY_GLUESYNC_LISTENER_VERSION 4.2.0
 ENV APIARY_RANGER_PLUGIN_VERSION 5.0.1
 ENV APIARY_METASTORE_METRICS_VERSION 4.2.0
@@ -35,8 +34,8 @@ RUN yum -y install java-1.8.0-openjdk \
   && rm -rf /var/cache/yum
 
 RUN mkdir -p /usr/lib/apiary && cd /usr/lib/apiary && \
-wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/apiary-metastore-listener/${APIARY_METASTORE_LISTENER_VERSION}/apiary-metastore-listener-${APIARY_METASTORE_LISTENER_VERSION}-all.jar -O apiary-metastore-listener-${APIARY_METASTORE_LISTENER_VERSION}-all.jar && \
-wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/kafka-metastore-listener/${KAFKA_METASTORE_LISTENER_VERSION}/kafka-metastore-listener-${KAFKA_METASTORE_LISTENER_VERSION}-all.jar -O kafka-metastore-listener-${KAFKA_METASTORE_LISTENER_VERSION}-all.jar && \
+wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/apiary-metastore-listener/${APIARY_EXTENSIONS_VERSION}/apiary-metastore-listener-${APIARY_EXTENSIONS_VERSION}-all.jar -O apiary-metastore-listener-${APIARY_EXTENSIONS_VERSION}-all.jar && \
+wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/kafka-metastore-listener/${APIARY_EXTENSIONS_VERSION}/kafka-metastore-listener-${APIARY_EXTENSIONS_VERSION}-all.jar -O kafka-metastore-listener-${APIARY_EXTENSIONS_VERSION}-all.jar && \
 wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/apiary-gluesync-listener/${APIARY_GLUESYNC_LISTENER_VERSION}/apiary-gluesync-listener-${APIARY_GLUESYNC_LISTENER_VERSION}-all.jar -O apiary-gluesync-listener-${APIARY_GLUESYNC_LISTENER_VERSION}-all.jar && \
 wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/apiary-ranger-metastore-plugin/${APIARY_RANGER_PLUGIN_VERSION}/apiary-ranger-metastore-plugin-${APIARY_RANGER_PLUGIN_VERSION}-all.jar -O apiary-ranger-metastore-plugin-${APIARY_RANGER_PLUGIN_VERSION}-all.jar && \
 wget -q https://search.maven.org/remotecontent?filepath=com/expediagroup/apiary/apiary-metastore-metrics/${APIARY_METASTORE_METRICS_VERSION}/apiary-metastore-metrics-${APIARY_METASTORE_METRICS_VERSION}-all.jar -O apiary-metastore-metrics-${APIARY_METASTORE_METRICS_VERSION}-all.jar && \
diff --git a/files/hive-site.xml b/files/hive-site.xml
index 5fc6144..c833408 100644
--- a/files/hive-site.xml
+++ b/files/hive-site.xml
@@ -64,7 +64,7 @@
 </property>
 
 <property>
-  <name>com.expediagroup.apiary.extensions.events.metastore.kafka.messaging.topic</name>
+  <name>com.expediagroup.apiary.extensions.events.metastore.kafka.messaging.topic.name</name>
   <value>KAFKA_TOPIC_NAME</value>
 </property>
 
diff --git a/files/startup.sh b/files/startup.sh
index 1f5b3a5..37d71bd 100755
--- a/files/startup.sh
+++ b/files/startup.sh
@@ -133,8 +133,8 @@ sed "s/METASTORE_PRELISTENERS/${METASTORE_PRELISTENERS}/" -i /etc/hive/conf/hive
 #export HADOOP_OPTS="$HADOOP_OPTS -Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
 
 export AUX_CLASSPATH="/usr/share/java/mariadb-connector-java.jar"
-[[ ! -z $SNS_ARN ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/apiary-metastore-listener-${APIARY_METASTORE_LISTENER_VERSION}-all.jar"
-[[ ! -z $KAFKA_BOOTSTRAP_SERVERS ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/kafka-metastore-listener-${KAFKA_METASTORE_LISTENER_VERSION}-all.jar"
+[[ ! -z $SNS_ARN ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/apiary-metastore-listener-${APIARY_EXTENSIONS_VERSION}-all.jar"
+[[ ! -z $KAFKA_BOOTSTRAP_SERVERS ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/kafka-metastore-listener-${APIARY_EXTENSIONS_VERSION}-all.jar"
 [[ ! -z $ENABLE_GLUESYNC ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/apiary-gluesync-listener-${APIARY_GLUESYNC_LISTENER_VERSION}-all.jar"
 [[ ! -z $RANGER_POLICY_MANAGER_URL ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/apiary-ranger-metastore-plugin-${APIARY_RANGER_PLUGIN_VERSION}-all.jar:/usr/lib/apiary/commons-codec-${COMMONS_CODEC_VERSION}.jar:/usr/lib/apiary/gethostname4j-${GETHOSTNAME4J_VERSION}.jar:/usr/lib/apiary/jna-${JNA_VERSION}.jar"
 [[ ! -z $HIVE_DB_WHITELIST ]] && export AUX_CLASSPATH="$AUX_CLASSPATH:/usr/lib/apiary/apiary-metastore-auth-${APIARY_METASTORE_AUTH_VERSION}.jar"