From 0b319e8d253b0d4204f2dc0d2dedadc01a6c6775 Mon Sep 17 00:00:00 2001
From: Kristofer Karlsson <krka@spotify.com>
Date: Mon, 8 Jun 2020 15:35:02 +0200
Subject: [PATCH] Remove dependency on protoc

---
 ffwd-client/pom.xml | 34 ++++++++++++++++++++++++++++------
 pom.xml             | 30 ------------------------------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/ffwd-client/pom.xml b/ffwd-client/pom.xml
index f78ebb9..941ebb9 100644
--- a/ffwd-client/pom.xml
+++ b/ffwd-client/pom.xml
@@ -13,16 +13,38 @@
     <name>FastForward Java Client</name>
     <description>FastForward client for Java.</description>
 
+    <properties>
+        <protobuf.version>3.11.1</protobuf.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protoc</artifactId>
-            <type>pom</type>
+            <version>${protobuf.version}</version>
         </dependency>
     </dependencies>
-    
+
+    <build>    
+        <plugins>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
+                <configuration>
+                    <protocArtifact>
+                        com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+                    </protocArtifact>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>    
 </project>
diff --git a/pom.xml b/pom.xml
index 0d6fc7e..c20a043 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <protobuf.version>3.11.1</protobuf.version>
     <maven.compiler.release>11</maven.compiler.release>
     <junit-jupiter.version>5.5.2</junit-jupiter.version>
     <opencensus.version>0.24.0</opencensus.version>
@@ -46,17 +45,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>${protobuf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protoc</artifactId>
-        <version>${protobuf.version}</version>
-        <type>pom</type>
-      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>
@@ -156,24 +144,6 @@
         <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
 
-      <plugin>
-        <groupId>org.xolstice.maven.plugins</groupId>
-        <artifactId>protobuf-maven-plugin</artifactId>
-        <version>0.6.1</version>
-        <configuration>
-          <protocArtifact>
-            com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-          </protocArtifact>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>