From 147b5280fbd7f70886eecdd051d014d2099a7760 Mon Sep 17 00:00:00 2001
From: Bryan Bende <bbende@apache.org>
Date: Thu, 17 Aug 2017 13:08:33 -0400
Subject: [PATCH] NIFI-4304 Extracting HWX Schema Registry client version to a
 property and bumping to latest 0.3.0 release

---
 .../nifi-hwx-schema-registry-service/pom.xml                  | 2 +-
 .../hortonworks/TestHortonworksSchemaRegistry.java            | 4 ++--
 pom.xml                                                       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
index df697ec79fe7..8d9ac3828db7 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
@@ -58,7 +58,7 @@ limitations under the License.
         <dependency>
             <groupId>com.hortonworks.registries</groupId>
             <artifactId>schema-registry-client</artifactId>
-			<version>0.2.1</version>
+			<version>${hwx.registry.version}</version>
 			<exclusions>
                 <exclusion>
                     <groupId>org.apache.avro</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/test/java/org/apache/nifi/schemaregistry/hortonworks/TestHortonworksSchemaRegistry.java b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/test/java/org/apache/nifi/schemaregistry/hortonworks/TestHortonworksSchemaRegistry.java
index 40f2ba7d9cbc..d34c9e8491de 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/test/java/org/apache/nifi/schemaregistry/hortonworks/TestHortonworksSchemaRegistry.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/test/java/org/apache/nifi/schemaregistry/hortonworks/TestHortonworksSchemaRegistry.java
@@ -98,7 +98,7 @@ protected synchronized SchemaRegistryClient getClient() {
     @Test
     public void testCacheUsed() throws Exception {
         final String text = new String(Files.readAllBytes(Paths.get("src/test/resources/empty-schema.avsc")));
-        final SchemaVersionInfo info = new SchemaVersionInfo(1, text, 2L, "description");
+        final SchemaVersionInfo info = new SchemaVersionInfo(1L, "unit-test", 2, text, System.currentTimeMillis(), "description");
         schemaVersionInfoMap.put("unit-test", info);
 
         final SchemaMetadata metadata = new SchemaMetadata.Builder("unit-test")
@@ -135,7 +135,7 @@ public void testCacheUsed() throws Exception {
     @Ignore("This can be useful for manual testing/debugging, but will keep ignored for now because we don't want automated builds to run this, since it depends on timing")
     public void testCacheExpires() throws Exception {
         final String text = new String(Files.readAllBytes(Paths.get("src/test/resources/empty-schema.avsc")));
-        final SchemaVersionInfo info = new SchemaVersionInfo(1, text, 2L, "description");
+        final SchemaVersionInfo info = new SchemaVersionInfo(1L, "unit-test", 2,  text, System.currentTimeMillis(), "description");
         schemaVersionInfoMap.put("unit-test", info);
 
         final SchemaMetadata metadata = new SchemaMetadata.Builder("unit-test")
diff --git a/pom.xml b/pom.xml
index 9a00d0982248..4eab25cdfd31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
         <hive.hadoop.version>2.6.2</hive.hadoop.version>
         <hbase.version>1.1.2</hbase.version>
         <storm.version>1.0.1</storm.version>
+        <hwx.registry.version>0.3.0</hwx.registry.version>
     </properties>
 
     <repositories>