Restore flatten and version for now

Card-Forge · Nov 21, 2024 · 0bc4e5d · 0bc4e5d
1 parent c95afd8
commit 0bc4e5d
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 15 deletions.
diff --git a/adventure-editor/pom.xml b/adventure-editor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-ai</artifactId>

diff --git a/forge-core/pom.xml b/forge-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-core</artifactId>

diff --git a/forge-game/pom.xml b/forge-game/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-game</artifactId>

diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-android</artifactId>

diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>forge</artifactId>
 		<groupId>forge</groupId>
-		<version>2.0.01-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
     <artifactId>forge-gui-desktop</artifactId>

diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-ios</artifactId>

diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-mobile-dev</artifactId>

diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-mobile</artifactId>

diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui</artifactId>

diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.01-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-installer</artifactId>

diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>forge</artifactId>
 		<groupId>forge</groupId>
-		<version>2.0.01-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
     <artifactId>forge-lda</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>forge</artifactId>
     <packaging>pom</packaging>
     <name>Forge Parent</name>
-    <version>2.0.01-SNAPSHOT</version>
+    <version>${revision}</version>
 
     <description>
         Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules.
@@ -26,11 +26,11 @@
         <configSourceDirectory>src/main/config</configSourceDirectory>
         <maven.compiler.release>17</maven.compiler.release>
         <!-- version code - maj.min.rev ie 2.0.00 -->
-        <versionCode>2.0.00</versionCode>
+        <versionCode>2.0.01</versionCode>
         <!-- set snapshotName to blank for release -->
         <snapshotName>-SNAPSHOT</snapshotName>
         <!-- revision will be the global version string -->
-        <revision>2.0.00-SNAPSHOT</revision>
+        <revision>${versionCode}${snapshotName}</revision>
     </properties>
 
     <licenses>
@@ -332,6 +332,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.6.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>