fix: Update version checker to use new dependencies (#3061)

Use local Version class. Also changed the kafka streams state directory back to /tmp/kafka-streams in the KsqlResourceTest.shouldListDefaultKsqlProperty, since that is the new default upstream.
confluentinc · Jul 11, 2019 · 508fab9 · 508fab9
1 parent 0a4d329
commit 508fab9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/KsqlResourceTest.java b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/KsqlResourceTest.java
@@ -1337,15 +1337,15 @@ public void shouldListPropertiesWithNoOverrides() {
   public void shouldListDefaultKsqlProperty() {
     // Given:
     givenKsqlConfigWith(ImmutableMap.<String, Object>builder()
-        .put(StreamsConfig.STATE_DIR_CONFIG, "/var/lib/kafka-streams")
+        .put(StreamsConfig.STATE_DIR_CONFIG, "/tmp/kafka-streams")
         .build());
 
     // When:
     final PropertiesList props = makeSingleRequest("list properties;", PropertiesList.class);
 
     // Then:
     assertThat(props.getDefaultProperties(),
-        hasItem(KsqlConfig.KSQL_STREAMS_PREFIX + StreamsConfig.STATE_DIR_CONFIG));
+               hasItem(KsqlConfig.KSQL_STREAMS_PREFIX + StreamsConfig.STATE_DIR_CONFIG));
   }
 
   @Test

diff --git a/ksql-version-metrics-client/pom.xml b/ksql-version-metrics-client/pom.xml
@@ -44,6 +44,11 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.confluent.ksql</groupId>
+            <artifactId>ksql-engine</artifactId>
+        </dependency>
+
         <!-- Required for running tests -->
 
         <dependency>

diff --git a/...rics-client/src/main/java/io/confluent/ksql/version/metrics/collector/BasicCollector.java b/...rics-client/src/main/java/io/confluent/ksql/version/metrics/collector/BasicCollector.java
@@ -15,9 +15,9 @@
 
 package io.confluent.ksql.version.metrics.collector;
 
+import io.confluent.ksql.util.Version;
 import io.confluent.ksql.version.metrics.KsqlVersionMetrics;
 import io.confluent.support.metrics.common.Collector;
-import io.confluent.support.metrics.common.Version;
 import java.time.Clock;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

diff --git a/...-client/src/test/java/io/confluent/ksql/version/metrics/collector/BasicCollectorTest.java b/...-client/src/test/java/io/confluent/ksql/version/metrics/collector/BasicCollectorTest.java
@@ -19,11 +19,12 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 
+import io.confluent.ksql.util.Version;
 import io.confluent.ksql.version.metrics.KsqlVersionMetrics;
-import io.confluent.support.metrics.common.Version;
 import java.time.Clock;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;