From b8ad8de588cca145ad510e3c224073f4e7d00979 Mon Sep 17 00:00:00 2001
From: Igor Gatis <igor.gatis@quintoandar.com.br>
Date: Tue, 11 Oct 2022 09:33:45 -0300
Subject: [PATCH] Shadowed protobuf dependency.

---
 .github/workflows/continuous-integration.yml |  2 +-
 gradle.properties                            |  2 +-
 spark-osmpbf/build.gradle                    | 21 +++++++++-----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 6f2fef1..54ac1d4 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -12,4 +12,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: fatjars
-          path: spark-osmpbf/build/fatjars
+          path: spark-osmpbf/build/libs
diff --git a/gradle.properties b/gradle.properties
index 8c4bd97..4c96624 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ dependencyVersionGuava=26.0-jre
 dependencyVersionJunit=4.12
 dependencyVersionJmh=1.35
 dependencyVersionOsmosis=0.48.3
-dependencyVersionProtobuf=3.12.2
+dependencyVersionProtobuf=3.20.1
 dependencyVersionSpark=3.2.1
 
 # Builds are signed if the settingsSigningEnabled property is set to true.
diff --git a/spark-osmpbf/build.gradle b/spark-osmpbf/build.gradle
index 9e9c6ad..953ecab 100644
--- a/spark-osmpbf/build.gradle
+++ b/spark-osmpbf/build.gradle
@@ -1,4 +1,5 @@
 plugins {
+  id 'com.github.johnrengelman.shadow' version '7.1.2'
   id 'java'
   id 'me.champeau.jmh' version '0.6.8'
 }
@@ -26,20 +27,16 @@ dependencies {
     configurations.implementation.extendsFrom(configurations.includeInJar)
 }
 
-task fatjar(type: Jar) {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    archiveAppendix = 'fatjar'
-    destinationDirectory.set(file("$buildDir/fatjars"))
-    from {
-        configurations.includeInJar.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    with jar
-}
-
 jmh {
   jmhVersion = dependencyVersionJmh
 }
 
+shadowJar {
+  archiveAppendix = 'fatjar'
+  relocate('com.google.protobuf', 'io.github.igorgatis.spark.osmpbf.com.google.protobuf')
+  configurations = [project.configurations.includeInJar]
+}
+
 artifacts {
-  archives fatjar
-}
\ No newline at end of file
+  archives shadowJar
+}