diff --git a/build.gradle b/build.gradle index 0996c1c..dbe2eeb 100644 --- a/build.gradle +++ b/build.gradle @@ -60,6 +60,7 @@ repositories { maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url "https://repository.apache.org/snapshots" } maven { url "https://oss.jfrog.org/jfrog-dependencies" } + maven { url "https://oss.sonatype.org/content/repositories/iopravega-1089" } } } diff --git a/gradle.properties b/gradle.properties index 7db41e5..a036f8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ slf4jApiVersion=1.7.25 # Version and base tags can be overridden at build time. connectorVersion=0.8.0-SNAPSHOT -pravegaVersion=0.8.0-2540.5314cfd-SNAPSHOT +pravegaVersion=0.8.0 # flag to indicate if Pravega sub-module should be used instead of the version defined in 'pravegaVersion' usePravegaVersionSubModule=false diff --git a/pravega b/pravega index 5314cfd..c8ddb93 160000 --- a/pravega +++ b/pravega @@ -1 +1 @@ -Subproject commit 5314cfda6a257bc7fa03c2834e702b45a65b563e +Subproject commit c8ddb937e3257ff6916c91d4c03a86f05b8067ea diff --git a/src/test/java/io/pravega/connectors/hadoop/PravegaInputFormatITCase.java b/src/test/java/io/pravega/connectors/hadoop/PravegaInputFormatITCase.java index 115faca..27b69f7 100644 --- a/src/test/java/io/pravega/connectors/hadoop/PravegaInputFormatITCase.java +++ b/src/test/java/io/pravega/connectors/hadoop/PravegaInputFormatITCase.java @@ -10,10 +10,11 @@ package io.pravega.connectors.hadoop; +import io.pravega.client.control.impl.Controller; +import io.pravega.client.control.impl.ControllerImpl; +import io.pravega.client.control.impl.ControllerImplConfig; import io.pravega.client.stream.EventStreamWriter; import io.pravega.client.stream.Stream; -import io.pravega.client.stream.impl.ControllerImpl; -import io.pravega.client.stream.impl.ControllerImplConfig; import io.pravega.client.stream.impl.StreamImpl; import io.pravega.connectors.hadoop.utils.IntegerSerializer; import io.pravega.connectors.hadoop.utils.SetupUtils; @@ -46,7 +47,7 @@ public class PravegaInputFormatITCase extends ConnectorBaseITCase { private static final SetupUtils SETUP_UTILS = new SetupUtils(); private ScheduledExecutorService executor; - private ControllerImpl controller = null; + private Controller controller = null; private EventStreamWriter writer; @Before diff --git a/src/test/java/io/pravega/connectors/hadoop/utils/SetupUtils.java b/src/test/java/io/pravega/connectors/hadoop/utils/SetupUtils.java index a4b3ca6..ba09e9a 100644 --- a/src/test/java/io/pravega/connectors/hadoop/utils/SetupUtils.java +++ b/src/test/java/io/pravega/connectors/hadoop/utils/SetupUtils.java @@ -18,9 +18,6 @@ import io.pravega.client.segment.impl.Segment; import io.pravega.client.stream.Stream; import io.pravega.client.stream.StreamCut; -import io.pravega.client.stream.impl.Controller; -import io.pravega.client.stream.impl.ControllerImpl; -import io.pravega.client.stream.impl.ControllerImplConfig; import io.pravega.client.stream.impl.DefaultCredentials; import io.pravega.client.stream.impl.JavaSerializer; import io.pravega.client.stream.impl.StreamCutImpl; @@ -206,17 +203,6 @@ public PravegaClientConfig getPravegaConfig() { .withTrustStore(trustStoreCertFile); } - /** - * Create a controller facade for this cluster. - * @return The controller facade, which must be closed by the caller. - */ - public Controller newController() { - ControllerImplConfig config = ControllerImplConfig.builder() - .clientConfig(getClientConfig()) - .build(); - return new ControllerImpl(config, DEFAULT_SCHEDULED_EXECUTOR_SERVICE); - } - /** * Create a {@link EventStreamClientFactory} for this cluster and scope. */