diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml index eaa6a6ff728..ca961a6312a 100644 --- a/forge-adventure/pom.xml +++ b/forge-adventure/pom.xml @@ -3,7 +3,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} 4.0.0 @@ -50,86 +50,6 @@ 17 - - - com.akathist.maven.plugins.launch4j - launch4j-maven-plugin - 2.5.1 - - - - l4j-adv-editor - package - - launch4j - - - gui - ${project.build.directory}/forge-adventure-editor.exe - ${project.build.finalName}-jar-with-dependencies.jar - true - forge - https://bell-sw.com/pages/downloads/#jdk-17-lts - src/main/config/forge-adventure-editor.ico - - forge.adventure.Main - false - anything - - - 17 - true - 4096 - - -Dfile.encoding=UTF-8 - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens java.base/jdk.internal.misc=ALL-UNNAMED - --add-opens java.base/java.nio=ALL-UNNAMED - --add-opens java.base/sun.nio.ch=ALL-UNNAMED - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.lang.reflect=ALL-UNNAMED - --add-opens java.base/java.text=ALL-UNNAMED - --add-opens java.desktop/java.awt=ALL-UNNAMED - --add-opens java.desktop/java.awt.font=ALL-UNNAMED - --add-opens java.desktop/java.awt.image=ALL-UNNAMED - --add-opens java.desktop/java.awt.color=ALL-UNNAMED - --add-opens java.desktop/sun.awt.image=ALL-UNNAMED - --add-opens java.desktop/javax.swing=ALL-UNNAMED - --add-opens java.desktop/javax.swing.border=ALL-UNNAMED - --add-opens java.desktop/javax.swing.event=ALL-UNNAMED - --add-opens java.desktop/sun.swing=ALL-UNNAMED - --add-opens java.desktop/java.beans=ALL-UNNAMED - --add-opens java.base/java.util.concurrent=ALL-UNNAMED - --add-opens java.base/java.net=ALL-UNNAMED - -Dio.netty.tryReflectionSetAccessible=true - - - - - 1.0.0.0 - - - 1.0.0.0 - - Forge - Forge - - 1.0.0.0 - - - 1.0.0.0 - - forge-adventure-editor - forge-adventure-editor - forge-adventure-editor.exe - - - - - - - com.google.code.maven-replacer-plugin replacer diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml index 9cae8944433..b51460f8ce7 100644 --- a/forge-ai/pom.xml +++ b/forge-ai/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-ai diff --git a/forge-core/pom.xml b/forge-core/pom.xml index 661b6191069..d96a8c7ead6 100644 --- a/forge-core/pom.xml +++ b/forge-core/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-core diff --git a/forge-game/pom.xml b/forge-game/pom.xml index bab97bc2a36..bd2d424e701 100644 --- a/forge-game/pom.xml +++ b/forge-game/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-game diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml index 9d98d16133f..1ee5b955443 100644 --- a/forge-gui-android/AndroidManifest.xml +++ b/forge-gui-android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="1" + android:versionName="1" > jar -Xms1024m -Xmx1536m - 1.6.65-SNAPSHOT + ${revision} + 2 keystore alias storepass @@ -20,7 +21,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-gui-android @@ -257,6 +258,19 @@ --min-sdk-version=26 + + + update-manifest + + manifest-merger + + + ${project.basedir}/AndroidManifest.xml + ${alpha-version} + ${alpha-versionCode} + + + @@ -365,6 +379,19 @@ --min-sdk-version=26 + + + update-manifest + + manifest-merger + + + ${project.basedir}/AndroidManifest.xml + ${alpha-version} + ${alpha-versionCode} + + + org.apache.maven.plugins diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index a8ff1b45e89..8b190290b99 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-gui-desktop diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index 5464a4c8f29..f119e85b88b 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -6,13 +6,13 @@ jar -Xms128m -Xmx2048m - 1.6.58.001 + ${revision} forge forge - 1.6.65-SNAPSHOT + ${revision} forge-gui-ios diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index 4c4f7f8804c..be57368d8cf 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-gui-mobile-dev @@ -39,33 +39,6 @@ 17 - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - package - - replace - - - - - ${basedir}/${configSourceDirectory} - forge-adventure.sh, forge-adventure-mac.sh, forge-adventure.command, forge-adventure.cmd - ${project.build.directory} - . - false - - - $project.build.finalName$ - ${project.build.finalName}-jar-with-dependencies.jar - - - - com.akathist.maven.plugins.launch4j launch4j-maven-plugin @@ -138,6 +111,32 @@ + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + package + + replace + + + + + ${basedir}/${configSourceDirectory} + forge-adventure.sh, forge-adventure-mac.sh, forge-adventure.command, forge-adventure.cmd + ${project.build.directory} + . + false + + + $project.build.finalName$ + ${project.build.finalName}-jar-with-dependencies.jar + + + + maven-assembly-plugin diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index eb026bee8d1..db2596a4819 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-gui-mobile diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 07fb9e43528..16d7eacdeb2 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-gui diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml index 422e9bb2c21..56a86c8c1fc 100644 --- a/forge-lda/pom.xml +++ b/forge-lda/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.65-SNAPSHOT + ${revision} forge-lda @@ -12,7 +12,7 @@ Forge LDA - 1.6.39.001 + ${revision} diff --git a/pom.xml b/pom.xml index 4e9a1bbd01f..6eaa533f730 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ forge pom Forge Parent - 1.6.65-SNAPSHOT + ${revision} Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules. @@ -25,6 +25,12 @@ ./forge-gui src/main/config 17 + + 2.0.00 + + -SNAPSHOT + + ${versionCode}${snapshotName} @@ -94,6 +100,32 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.6.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + org.apache.maven.plugins maven-enforcer-plugin