From e74faec4a63d3078ac5eff68ee55869d3fdadf9b Mon Sep 17 00:00:00 2001
From: Michael Barry <msbarry@users.noreply.github.com>
Date: Thu, 22 Sep 2022 21:43:33 -0400
Subject: [PATCH] Fix build (#344)

---
 .gitignore               |  1 +
 planetiler-openmaptiles  |  2 +-
 pom.xml                  | 33 +++++++++++++++++++++++++++++++++
 scripts/build-release.sh |  2 +-
 scripts/push-release.sh  |  2 +-
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e140a38..dd1311b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 
 target/
+.flattened-pom.xml
 *.jar
 !.mvn/wrapper/*.jar
 *.log
diff --git a/planetiler-openmaptiles b/planetiler-openmaptiles
index 64d8e0bf..b3347b80 160000
--- a/planetiler-openmaptiles
+++ b/planetiler-openmaptiles
@@ -1 +1 @@
-Subproject commit 64d8e0bf8307ea348e0926dac786956646250a09
+Subproject commit b3347b808326a666229287aa3ef735d4c1cc4ba9
diff --git a/pom.xml b/pom.xml
index 37445c1f..b4a89132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,5 +390,38 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>flatten</id>
+      <build>
+        <plugins>
+          <!-- flatten anywhere we do <version>${revision}</version>, see https://maven.apache.org/maven-ci-friendly.html -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>flatten-maven-plugin</artifactId>
+            <version>1.3.0</version>
+            <configuration>
+              <updatePomFile>true</updatePomFile>
+              <flattenMode>resolveCiFriendliesOnly</flattenMode>
+            </configuration>
+            <executions>
+              <execution>
+                <id>flatten</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>flatten</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>flatten.clean</id>
+                <phase>clean</phase>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/scripts/build-release.sh b/scripts/build-release.sh
index 73fd8932..7182cc78 100755
--- a/scripts/build-release.sh
+++ b/scripts/build-release.sh
@@ -2,4 +2,4 @@
 
 set -eu
 
-./mvnw -B -ntp install jib:dockerBuild
+./mvnw -B -ntp install jib:dockerBuild -Pflatten
diff --git a/scripts/push-release.sh b/scripts/push-release.sh
index fe42cfa1..61deae6c 100755
--- a/scripts/push-release.sh
+++ b/scripts/push-release.sh
@@ -14,4 +14,4 @@ fi
   -Djib.to.auth.password="${GITHUB_TOKEN}" \
   package jib:build --file pom.xml
 
-./mvnw -B -Dgpg.passphrase="${OSSRH_GPG_SECRET_KEY_PASSWORD}" -DskipTests -Prelease deploy
+./mvnw -B -Dgpg.passphrase="${OSSRH_GPG_SECRET_KEY_PASSWORD}" -DskipTests -Prelease -Pflatten deploy