From 3a655c17ec442deb40a82871c06a2e846c563316 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 19 Mar 2015 00:05:46 +0000 Subject: [PATCH] Push the newest pom.xml.releaseBackup files. --- forge-ai/pom.xml.releaseBackup | 56 +- forge-core/pom.xml.releaseBackup | 54 +- forge-game/pom.xml.releaseBackup | 68 +- forge-gui-desktop/pom.xml.releaseBackup | 1054 +++++++++++------------ forge-gui/pom.xml.releaseBackup | 106 +-- forge-net/pom.xml.releaseBackup | 100 ++- 6 files changed, 725 insertions(+), 713 deletions(-) diff --git a/forge-ai/pom.xml.releaseBackup b/forge-ai/pom.xml.releaseBackup index 3b3641e86d0..976b43d1dd3 100644 --- a/forge-ai/pom.xml.releaseBackup +++ b/forge-ai/pom.xml.releaseBackup @@ -1,28 +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} - - - - + + + + 4.0.0 + + + forge + forge + 1.5.37-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 index 29bbdaaf047..01589f06f5d 100644 --- a/forge-core/pom.xml.releaseBackup +++ b/forge-core/pom.xml.releaseBackup @@ -1,27 +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 - - - + + + + 4.0.0 + + + forge + forge + 1.5.37-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 index 9d6ed0e4e76..708351e1a62 100644 --- a/forge-game/pom.xml.releaseBackup +++ b/forge-game/pom.xml.releaseBackup @@ -1,34 +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 - - - + + + + 4.0.0 + + + forge + forge + 1.5.37-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 index f0cee5605f5..a16332cd6ae 100644 --- a/forge-gui-desktop/pom.xml.releaseBackup +++ b/forge-gui-desktop/pom.xml.releaseBackup @@ -1,528 +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 - - - - + + + + 4.0.0 + + + forge + forge + 1.5.37-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 index 05ac9050204..5f603e61329 100644 --- a/forge-gui/pom.xml.releaseBackup +++ b/forge-gui/pom.xml.releaseBackup @@ -1,50 +1,56 @@ - - 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 - - - + + 4.0.0 + + + forge + forge + 1.5.37-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 + + + io.netty + netty-all + 4.0.25.Final + compile + + + diff --git a/forge-net/pom.xml.releaseBackup b/forge-net/pom.xml.releaseBackup index cc116d9c94c..971b68472d2 100644 --- a/forge-net/pom.xml.releaseBackup +++ b/forge-net/pom.xml.releaseBackup @@ -1,47 +1,53 @@ - - - - 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} - - - + + + + 4.0.0 + + + forge + forge + 1.5.37-SNAPSHOT + + + forge-net + Forge Net + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + com.google.code.gson + gson + 2.2.4 + + + io.netty + netty-all + 4.0.25.Final + compile + + + org.eclipse.jetty + jetty-websocket + ${jettyVersion} + + + org.eclipse.jetty + jetty-server + ${jettyVersion} + + + org.eclipse.jetty + jetty-servlet + ${jettyVersion} + + +