From 37bf7ef5e450aba9c22080d3296cf7bbfbafc8a7 Mon Sep 17 00:00:00 2001
From: Luke Cwik <lcwik@google.com>
Date: Thu, 20 Apr 2017 12:26:21 -0700
Subject: [PATCH] [BEAM-1871] Move over GcsPath to gcp-core

---
 sdks/java/core/pom.xml                                       | 5 -----
 .../src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java | 1 -
 sdks/java/extensions/gcp-core/pom.xml                        | 5 -----
 .../main/java/org/apache/beam/sdk/util/gcsfs/GcsPath.java    | 0
 .../java/org/apache/beam/sdk/util/gcsfs/package-info.java    | 0
 .../java/org/apache/beam/sdk/util/gcsfs/GcsPathTest.java     | 0
 6 files changed, 11 deletions(-)
 rename sdks/java/{core => extensions/gcp-core}/src/main/java/org/apache/beam/sdk/util/gcsfs/GcsPath.java (100%)
 rename sdks/java/{core => extensions/gcp-core}/src/main/java/org/apache/beam/sdk/util/gcsfs/package-info.java (100%)
 rename sdks/java/{core => extensions/gcp-core}/src/test/java/org/apache/beam/sdk/util/gcsfs/GcsPathTest.java (100%)

diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 2860be232f16..ef550a17fa68 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -144,11 +144,6 @@
       <artifactId>google-api-services-bigquery</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.apis</groupId>
-      <artifactId>google-api-services-storage</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
diff --git a/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java b/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java
index eed445796d2a..441f23af0815 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java
@@ -40,7 +40,6 @@ public void testSdkApiSurface() throws Exception {
             "org.apache.beam",
             "com.google.api.client",
             "com.google.api.services.bigquery",
-            "com.google.api.services.storage",
             "com.google.protobuf",
             "com.fasterxml.jackson.annotation",
             "com.fasterxml.jackson.core",
diff --git a/sdks/java/extensions/gcp-core/pom.xml b/sdks/java/extensions/gcp-core/pom.xml
index 918632a77c4e..d566f94fbea0 100644
--- a/sdks/java/extensions/gcp-core/pom.xml
+++ b/sdks/java/extensions/gcp-core/pom.xml
@@ -72,11 +72,6 @@
       <artifactId>beam-sdks-java-core</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.auth</groupId>
-      <artifactId>google-auth-library-credentials</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/gcsfs/GcsPath.java b/sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/gcsfs/GcsPath.java
similarity index 100%
rename from sdks/java/core/src/main/java/org/apache/beam/sdk/util/gcsfs/GcsPath.java
rename to sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/gcsfs/GcsPath.java
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/gcsfs/package-info.java b/sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/gcsfs/package-info.java
similarity index 100%
rename from sdks/java/core/src/main/java/org/apache/beam/sdk/util/gcsfs/package-info.java
rename to sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/gcsfs/package-info.java
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/gcsfs/GcsPathTest.java b/sdks/java/extensions/gcp-core/src/test/java/org/apache/beam/sdk/util/gcsfs/GcsPathTest.java
similarity index 100%
rename from sdks/java/core/src/test/java/org/apache/beam/sdk/util/gcsfs/GcsPathTest.java
rename to sdks/java/extensions/gcp-core/src/test/java/org/apache/beam/sdk/util/gcsfs/GcsPathTest.java