From 6ebc34d00d28483570c4eb89957f9b0c9c84be56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@apache.org>
Date: Fri, 5 May 2017 14:40:06 +0200
Subject: [PATCH] Make NexmarkOptions depend on GcpOptions instead of
 PubsubOptions

issue #21
---
 integration/java/nexmark/pom.xml                           | 5 -----
 .../apache/beam/integration/nexmark/NexmarkOptions.java    | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/integration/java/nexmark/pom.xml b/integration/java/nexmark/pom.xml
index 8a65c0fa7446..35fe0f330fb7 100644
--- a/integration/java/nexmark/pom.xml
+++ b/integration/java/nexmark/pom.xml
@@ -218,11 +218,6 @@
       <artifactId>google-api-services-bigquery</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.cloud.bigdataoss</groupId>
-      <artifactId>gcsio</artifactId>
-    </dependency>
-
     <!-- Extra libraries -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
index e1c1af2d9a46..f162fd616453 100644
--- a/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
+++ b/integration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkOptions.java
@@ -18,14 +18,19 @@
 package org.apache.beam.integration.nexmark;
 
 import javax.annotation.Nullable;
+import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.io.gcp.pubsub.PubsubOptions;
+import org.apache.beam.sdk.options.ApplicationNameOptions;
 import org.apache.beam.sdk.options.Default;
 import org.apache.beam.sdk.options.Description;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.sdk.options.StreamingOptions;
 
 /**
  * Command line flags.
  */
-public interface NexmarkOptions extends PubsubOptions {
+public interface NexmarkOptions
+    extends ApplicationNameOptions, GcpOptions, PipelineOptions, StreamingOptions {
   @Description("Which suite to run. Default is to use command line arguments for one job.")
   @Default.Enum("DEFAULT")
   NexmarkSuite getSuite();