From 010ee595cea401c34824448341c1daa3bd29c0ad Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Tue, 2 Aug 2022 09:10:20 -0500
Subject: [PATCH] Revert previous (incorrectly addded -Drevision); Add
 flatten-maven-plugin

---
 .circleci/config.yml |  2 +-
 pom.xml              | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b629f771..a42afca5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,7 @@ commands:
       - run:
           name: Run Maven Jar Deploy
           command: |
-            mvn -s -Drevision=0.3.0-SNAPSHOT .circleci/mvn-settings.xml jar:jar deploy:deploy
+            mvn -s .circleci/mvn-settings.xml jar:jar deploy:deploy
       - save_cache:
           paths:
             - ~/.m2
diff --git a/pom.xml b/pom.xml
index 0e78e1d0..6664339e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,31 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>flatten-maven-plugin</artifactId>
+            <version>1.1.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>
          <plugin>
             <groupId>com.amashchenko.maven.plugin</groupId>
             <artifactId>gitflow-maven-plugin</artifactId>