From 8b00db662327b014204ca4a0ad8d059dcde3c498 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Thu, 25 Apr 2019 14:21:07 +0800
Subject: [PATCH] Temporarily moves tests to old proto

See https://github.com/apache/incubator-zipkin-api/pull/64
---
 benchmarks/pom.xml                            | 15 +++++++++-
 pom.xml                                       | 29 ++++---------------
 zipkin-server/pom.xml                         | 15 +++++++++-
 .../server/internal/ITZipkinGrpcCollector.kt  |  4 +--
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 0ae57bb421b..516d6d4d275 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -80,9 +80,22 @@
       <version>${wire.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.zipkin.proto3</groupId>
+      <groupId>io.zipkin.proto3</groupId>
       <artifactId>zipkin-proto3</artifactId>
     </dependency>
+    <!-- TODO: This only resolves google empty. Remove this once using org.apache.zipkin.proto3 -->
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>3.7.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 6e34b0a9418..1efcd5c86ad 100755
--- a/pom.xml
+++ b/pom.xml
@@ -154,26 +154,6 @@
     <url>https://github.com/openzipkin/zipkin/issues</url>
   </issueManagement>
 
-  <repositories>
-    <repository>
-      <id>apache.snapshots.https</id>
-      <url>https://repository.apache.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots.https</id>
-      <url>https://repository.apache.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -382,9 +362,9 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.zipkin.proto3</groupId>
+        <groupId>io.zipkin.proto3</groupId>
         <artifactId>zipkin-proto3</artifactId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.0</version>
       </dependency>
       <dependency>
         <groupId>com.squareup.wire</groupId>
@@ -546,7 +526,8 @@
                 <goal>unpack-dependencies</goal>
               </goals>
               <configuration>
-                <includeArtifactIds>zipkin-proto3</includeArtifactIds>
+                <!-- TODO: Remove protobuf-java once using org.apache.zipkin.proto3 -->
+                <includeArtifactIds>protobuf-java,zipkin-proto3</includeArtifactIds>
                 <includes>**/*.proto</includes>
                 <outputDirectory>${unpack-proto.directory}</outputDirectory>
               </configuration>
@@ -566,6 +547,8 @@
               <configuration>
                 <protoSourceDirectory>${unpack-proto.directory}</protoSourceDirectory>
                 <includes>
+                  <!-- TODO: Remove google.protobuf.Empty once using org.apache.zipkin.proto3 -->
+                  <include>google.protobuf.Empty</include>
                   <include>zipkin.proto3.*</include>
                 </includes>
               </configuration>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index d418a58181c..7f1c612cd00 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -133,10 +133,23 @@
 
     <!-- to test the experimental grpc endpoint with the square/wire library -->
     <dependency>
-      <groupId>org.apache.zipkin.proto3</groupId>
+      <groupId>io.zipkin.proto3</groupId>
       <artifactId>zipkin-proto3</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- TODO: This only resolves google empty. Remove this once using org.apache.zipkin.proto3 -->
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>3.7.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>com.squareup.wire</groupId>
       <artifactId>wire-grpc-client</artifactId>
diff --git a/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt b/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt
index c87d133ef3d..046b1818609 100644
--- a/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt
+++ b/zipkin-server/src/test/kotlin/zipkin2/server/internal/ITZipkinGrpcCollector.kt
@@ -17,6 +17,7 @@
 
 package zipkin2.server.internal
 
+import com.google.protobuf.Empty
 import com.linecorp.armeria.server.Server
 import com.squareup.wire.GrpcClient
 import com.squareup.wire.Service
@@ -37,7 +38,6 @@ import zipkin2.TestObjects
 import zipkin2.codec.SpanBytesDecoder
 import zipkin2.codec.SpanBytesEncoder
 import zipkin2.proto3.ListOfSpans
-import zipkin2.proto3.ReportResponse
 import zipkin2.storage.InMemoryStorage
 
 @SpringBootTest(classes = [ZipkinServer::class],
@@ -59,7 +59,7 @@ class ITZipkinGrpcCollector {
       requestAdapter = "zipkin2.proto3.ListOfSpans#ADAPTER",
       responseAdapter = "zipkin2.proto3.ReportResponse#ADAPTER"
     )
-    suspend fun Report(request: ListOfSpans): ReportResponse
+    suspend fun Report(request: ListOfSpans): Empty
   }
 
   @Before fun sanityCheckCodecCompatible() {