diff --git a/.gitattributes b/.gitattributes index 7a099fc5160..310ded2c255 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,6 +13,7 @@ forge-ai/.settings/org.eclipse.core.resources.prefs -text forge-ai/.settings/org.eclipse.jdt.core.prefs -text forge-ai/.settings/org.eclipse.m2e.core.prefs -text forge-ai/pom.xml -text +forge-ai/pom.xml.releaseBackup -text forge-ai/src/main/java/forge/ai/AiAttackController.java svneol=native#text/plain forge-ai/src/main/java/forge/ai/AiBlockController.java svneol=native#text/plain forge-ai/src/main/java/forge/ai/AiCardMemory.java -text @@ -158,6 +159,7 @@ forge-core/.settings/org.eclipse.core.resources.prefs -text forge-core/.settings/org.eclipse.jdt.core.prefs -text forge-core/.settings/org.eclipse.m2e.core.prefs -text forge-core/pom.xml -text +forge-core/pom.xml.releaseBackup -text forge-core/src/main/java/forge/CardStorageReader.java -text forge-core/src/main/java/forge/FTrace.java -text forge-core/src/main/java/forge/ImageKeys.java -text @@ -280,6 +282,7 @@ forge-game/.settings/org.eclipse.core.resources.prefs -text forge-game/.settings/org.eclipse.jdt.core.prefs -text forge-game/.settings/org.eclipse.m2e.core.prefs -text forge-game/pom.xml -text +forge-game/pom.xml.releaseBackup -text forge-game/src/main/java/forge/GameCommand.java svneol=native#text/plain forge-game/src/main/java/forge/game/CardTraitBase.java -text forge-game/src/main/java/forge/game/Direction.java -text @@ -758,6 +761,7 @@ forge-gui-desktop/.settings/org.eclipse.core.resources.prefs -text forge-gui-desktop/.settings/org.eclipse.jdt.core.prefs -text forge-gui-desktop/.settings/org.eclipse.m2e.core.prefs -text forge-gui-desktop/pom.xml -text +forge-gui-desktop/pom.xml.releaseBackup -text forge-gui-desktop/src/main/config/Forge.icns -text forge-gui-desktop/src/main/config/appbundler-1.0-custom.jar -text forge-gui-desktop/src/main/config/backgroundImage.jpg -text @@ -1384,6 +1388,7 @@ forge-gui/LICENSE.txt -text forge-gui/README.txt -text forge-gui/forge.profile.properties.example -text forge-gui/pom.xml -text +forge-gui/pom.xml.releaseBackup -text forge-gui/res/ai/Default.ai -text forge-gui/res/ai/Reckless.ai -text forge-gui/res/blockdata/blocks.txt svneol=native#text/plain @@ -17562,6 +17567,7 @@ forge-net/.settings/org.eclipse.core.resources.prefs -text forge-net/.settings/org.eclipse.jdt.core.prefs -text forge-net/.settings/org.eclipse.m2e.core.prefs -text forge-net/pom.xml -text +forge-net/pom.xml.releaseBackup -text forge-net/src/main/java/forge/net/FServer.java -text forge-net/src/main/java/forge/net/IClientSocket.java -text forge-net/src/main/java/forge/net/IConnectionObserver.java -text diff --git a/forge-ai/pom.xml.releaseBackup b/forge-ai/pom.xml.releaseBackup new file mode 100644 index 00000000000..3b3641e86d0 --- /dev/null +++ b/forge-ai/pom.xml.releaseBackup @@ -0,0 +1,28 @@ + + + + 4.0.0 + + + forge + forge + 1.5.34-SNAPSHOT + + + forge-ai + Forge AI + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + + diff --git a/forge-core/pom.xml.releaseBackup b/forge-core/pom.xml.releaseBackup new file mode 100644 index 00000000000..29bbdaaf047 --- /dev/null +++ b/forge-core/pom.xml.releaseBackup @@ -0,0 +1,27 @@ + + + + 4.0.0 + + + forge + forge + 1.5.34-SNAPSHOT + + + forge-core + Forge Core + + + + com.google.guava + guava + 16.0.1 + + + org.apache.commons + commons-lang3 + 3.3 + + + diff --git a/forge-game/pom.xml.releaseBackup b/forge-game/pom.xml.releaseBackup new file mode 100644 index 00000000000..9d6ed0e4e76 --- /dev/null +++ b/forge-game/pom.xml.releaseBackup @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + forge + forge + 1.5.34-SNAPSHOT + + + forge-game + Forge Game + + + + forge + forge-core + ${project.version} + + + com.googlecode + minlog + 1.2 + + + junit + junit + 4.10 + test + jar + + + diff --git a/forge-gui-desktop/pom.xml.releaseBackup b/forge-gui-desktop/pom.xml.releaseBackup new file mode 100644 index 00000000000..f0cee5605f5 --- /dev/null +++ b/forge-gui-desktop/pom.xml.releaseBackup @@ -0,0 +1,528 @@ + + + + 4.0.0 + + + forge + forge + 1.5.34-SNAPSHOT + + + forge-gui-desktop + jar + Forge + + + + + com.google.code.maven-svn-revision-number-plugin + svn-revision-number-maven-plugin + + + + revision + + + + + false + + + forge + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + org.apache.ant + ant-nodeps + 1.8.1 + + + + + build-version-string + process-resources + + run + + + true + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + true + + + ${fullversionstring} + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + package + + replace + + + + + ${basedir}/${configSourceDirectory} + forge.sh, forge.command + ${project.build.directory} + . + false + + + $project.build.finalName$ + ${project.build.finalName}-jar-with-dependencies.jar + + + + + + maven-assembly-plugin + + false + + jar-with-dependencies + + + + forge.view.Main + true + + + ${fullversionstring} + + + + + + make-assembly + + package + + + single + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + released-version + validate + + released-version + + + + parse-version + + parse-version + + + + + + + + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + forge + forge-ai + ${project.version} + + + forge + forge-net + ${project.version} + + + forge + forge-gui + ${project.version} + + + com.miglayout + miglayout + 3.7.4 + + + com.mortennobel + java-image-scaling + 0.8.5 + + + com.google.guava + guava + 16.0.1 + + + com.thoughtworks.xstream + xstream + 1.4.7 + + + org.testng + testng + 6.8.7 + test + + + org.powermock + powermock-module-testng + 1.5.4 + test + + + org.powermock + powermock-api-mockito + 1.5.4 + test + + + log4j + log4j + 1.2.17 + + + com.googlecode + minlog + 1.2 + + + org.apache.commons + commons-lang3 + 3.3 + + + org.freemarker + freemarker + 2.3.20 + + + com.googlecode.soundlibs + jlayer + 1.0.1-1 + + + com.beust + jcommander + 1.27 + jar + + + + + + windows-linux + + + + com.akathist.maven.plugins.launch4j + launch4j-maven-plugin + 1.5.2 + + + l4j-gui + package + + launch4j + + + gui + ${project.build.directory}/forge.exe + ${project.build.finalName}-jar-with-dependencies.jar + true + forge + src/main/config/forge.ico + + forge.view.Main + false + anything + + + 1.7.0 + 1024 + + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 + Forge + Forge + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 + Forge + forge + forge.exe + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.ant + ant-nodeps + 1.8.1 + + + + + win-linux-app-bundle + pre-integration-test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + released-version + validate + + released-version + + + + parse-version + + parse-version + + + + attach-distribution + post-integration-test + + attach-artifact + + + + + ${project.build.directory}/${project.build.finalName}.tar.bz2 + tar.bz2 + + + + + + + + + + + + + "LICENSE.txt" + "CHANGES.txt" + "README.txt" + "Forge" + "Applications" + + osx + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.ant + ant-nodeps + 1.8.1 + + + + + osx-appbundle + pre-integration-test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + released-version + validate + + released-version + + + + parse-version + + parse-version + + + + attach-distribution-osx + post-integration-test + + attach-artifact + + + + + ${project.build.directory}/${project.build.finalName}-osx.tar.bz2 + + tar.bz2 + osx + + + + + + + + + + + + + test-deploy + + + cardforge-repo-local + ftp://localhost/Users/dhudson/releases + + + cardforge-snapshot-repo-local + ftp://localhost/Users/dhudson/snapshots + + + + + \ No newline at end of file diff --git a/forge-gui/pom.xml.releaseBackup b/forge-gui/pom.xml.releaseBackup new file mode 100644 index 00000000000..05ac9050204 --- /dev/null +++ b/forge-gui/pom.xml.releaseBackup @@ -0,0 +1,50 @@ + + 4.0.0 + + + forge + forge + 1.5.34-SNAPSHOT + + + forge-gui + Forge Gui + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + forge + forge-ai + ${project.version} + + + forge + forge-net + ${project.version} + + + com.google.guava + guava + 16.0.1 + + + com.thoughtworks.xstream + xstream + 1.4.7 + + + org.apache.commons + commons-lang3 + 3.3 + + + diff --git a/forge-net/pom.xml.releaseBackup b/forge-net/pom.xml.releaseBackup new file mode 100644 index 00000000000..cc116d9c94c --- /dev/null +++ b/forge-net/pom.xml.releaseBackup @@ -0,0 +1,47 @@ + + + + 4.0.0 + + + forge + forge + 1.5.34-SNAPSHOT + + + forge-net + Forge Net + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + com.google.code.gson + gson + 2.2.4 + + + org.eclipse.jetty + jetty-websocket + ${jettyVersion} + + + org.eclipse.jetty + jetty-server + ${jettyVersion} + + + org.eclipse.jetty + jetty-servlet + ${jettyVersion} + + +