Release fix

pom.xml

@@ -1,5 +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/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.expedia.www</groupId>
@@ -38,7 +38,7 @@
   </licenses>
 
   <properties>
-    <haystack-core.version>0.2.5</haystack-core.version>
+    <haystack-client.version>0.2.7</haystack-client.version>
     <io-micrometer.version>1.1.1</io-micrometer.version>
     <spring-sleuth.version>2.1.0.RELEASE</spring-sleuth.version>
     <java-version>1.8</java-version>
@@ -49,20 +49,21 @@
     <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
     <maven-release-plugin.version>2.3.2</maven-release-plugin.version>
     <junit.version>3.8.1</junit.version>
+    <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.expedia.www</groupId>
-        <artifactId>haystack-client-core</artifactId>
-        <version>${haystack-core.version}</version>
+        <artifactId>haystack-remote-clients</artifactId>
+        <version>${haystack-client.version}</version>
       </dependency>
 
       <dependency>
         <groupId>com.expedia.www</groupId>
         <artifactId>haystack-client-micrometer</artifactId>
-        <version>${haystack-core.version}</version>
+        <version>${haystack-client.version}</version>
       </dependency>
 
       <dependency>
@@ -88,7 +89,7 @@
   <dependencies>
     <dependency>
       <groupId>com.expedia.www</groupId>
-      <artifactId>haystack-client-core</artifactId>
+      <artifactId>haystack-remote-clients</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
@@ -112,6 +113,20 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>${maven-gpg-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>sign-artifacts</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>sign</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.sonatype.plugins</groupId>
           <artifactId>nexus-staging-maven-plugin</artifactId>

src/main/java/com/expedia/www/spring/cloud/sleuth/haystack/reporter/configuration/HaystackReporterAutoConfiguration.java

@@ -16,13 +16,12 @@
  */
 package com.expedia.www.spring.cloud.sleuth.haystack.reporter.configuration;
 
-import com.expedia.www.haystack.client.dispatchers.clients.Client;
-import com.expedia.www.haystack.client.dispatchers.clients.GRPCAgentProtoClient;
-import com.expedia.www.haystack.client.dispatchers.clients.HttpCollectorClient;
-import com.expedia.www.haystack.client.dispatchers.clients.HttpCollectorProtoClient;
 import com.expedia.www.haystack.client.metrics.MetricsRegistry;
 import com.expedia.www.haystack.client.metrics.NoopMetricsRegistry;
 import com.expedia.www.haystack.client.metrics.micrometer.MicrometerMetricsRegistry;
+import com.expedia.www.haystack.remote.clients.Client;
+import com.expedia.www.haystack.remote.clients.GRPCAgentProtoClient;
+import com.expedia.www.haystack.remote.clients.HttpCollectorProtoClient;
 import com.expedia.www.spring.cloud.sleuth.haystack.reporter.reporters.HaystackReporter;
 import io.micrometer.core.instrument.MeterRegistry;
 import java.util.HashMap;

src/main/java/com/expedia/www/spring/cloud/sleuth/haystack/reporter/reporters/HaystackReporter.java

@@ -19,7 +19,7 @@
 import brave.internal.HexCodec;
 import com.expedia.open.tracing.Log;
 import com.expedia.open.tracing.Tag;
-import com.expedia.www.haystack.client.dispatchers.clients.Client;
+import com.expedia.www.haystack.remote.clients.Client;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;