From f0c2cf857757cf8ac4d426461e104bc5eb78a8c0 Mon Sep 17 00:00:00 2001 From: KrazyTheFox Date: Sat, 29 Sep 2018 15:44:54 -0400 Subject: [PATCH] Fix up pom files --- forge-ai/pom.xml | 29 +- forge-core/pom.xml | 29 +- forge-game/pom.xml | 29 +- forge-gui-android/pom.xml | 78 +- forge-gui-desktop/pom.xml | 1551 +++++++++-------- forge-gui-ios/pom.xml | 3 +- forge-gui-mobile-dev/pom.xml | 163 +- forge-gui-mobile/pom.xml | 119 +- .../src/forge/toolbox/FFileChooser.java | 15 +- .../src/forge/toolbox/ListChooser.java | 10 +- forge-gui/pom.xml | 61 +- pom.xml | 263 +-- 12 files changed, 1117 insertions(+), 1233 deletions(-) diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml index 02f7bd48cfd..5c2e49733c3 100644 --- a/forge-ai/pom.xml +++ b/forge-ai/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -30,30 +31,4 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - - - diff --git a/forge-core/pom.xml b/forge-core/pom.xml index f1b3f15a0c3..43ca41a1bbc 100644 --- a/forge-core/pom.xml +++ b/forge-core/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -25,30 +26,4 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - - - diff --git a/forge-game/pom.xml b/forge-game/pom.xml index f599d471127..e432898b34c 100644 --- a/forge-game/pom.xml +++ b/forge-game/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -37,30 +38,4 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - - - diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 86c680a80c2..332d3a1be0a 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -36,28 +37,6 @@ 1.8 - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - @@ -236,7 +215,7 @@ true true - + ${project.build.directory}/${project.build.finalName}.apk @@ -299,22 +278,29 @@ - - - - - - - + + + + + + + - - + + - - - - + + + + @@ -360,16 +346,22 @@ package - - + + - - + + - + - + diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index 7b85530a3fa..c0d6f955b9c 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -1,5 +1,6 @@ - - 4.0.0 + + 4.0.0 forge @@ -7,789 +8,791 @@ 1.6.17-SNAPSHOT - forge-gui-desktop - jar - Forge + 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 - - - - - - - - - + + 0 + 0 + 0 + - - 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 - - - - + + - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + true + + + + + + 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 + + + + + + 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-gui - ${project.version} - - - com.miglayout - miglayout - 3.7.4 - - - com.mortennobel - java-image-scaling - 0.8.5 - - - com.google.guava - guava - 24.1-android - - - com.thoughtworks.xstream - xstream - 1.4.10 - - - 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.7 - - - org.freemarker - freemarker - 2.3.20 - - - com.googlecode.soundlibs - jlayer - 1.0.1-1 - - - com.beust - jcommander - 1.27 - jar - - + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + forge + forge-ai + ${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 + 24.1-android + + + com.thoughtworks.xstream + xstream + 1.4.10 + + + 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.7 + + + org.freemarker + freemarker + 2.3.20 + + + com.googlecode.soundlibs + jlayer + 1.0.1-1 + + + com.beust + jcommander + 1.27 + jar + + - - - windows-linux-release - - - - 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.8.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 - - - - - + + + windows-linux-release + + + + 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.8.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 - - - - - - - - - + + 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 + + + + + + + + + - - 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.8.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 - - - - - + + 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.8.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 - - - - - - - - - + + 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" - "MANUAL.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 - - - - - - + + + "LICENSE.txt" + "CHANGES.txt" + "MANUAL.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 + + + + + + - - - + + + - - - "LICENSE.txt" - "README.txt" - "MANUAL.txt" - "Forge" - "Applications" - - osx-release - - - - 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 - - - - - - + + + "LICENSE.txt" + "README.txt" + "MANUAL.txt" + "Forge" + "Applications" + + osx-release + + + + 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 + + + + + + - - - - + + + + diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index 2af358bf7f4..e5517baee77 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index ec31825b43a..4c6a43115c8 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -1,5 +1,6 @@ - - 4.0.0 + + 4.0.0 forge @@ -7,104 +8,78 @@ 1.6.17-SNAPSHOT - forge-gui-mobile-dev - jar - Forge Mobile Dev + forge-gui-mobile-dev + jar + Forge Mobile Dev - - src - - - maven-compiler-plugin - - 1.8 - 1.8 - - + + src + + + maven-compiler-plugin + + 1.8 + 1.8 + + - - maven-assembly-plugin - - false - - jar-with-dependencies - - - - forge.app.Main - true - - - ${fullversionstring} - - - - - - make-assembly - - package - - - single - - - - + + maven-assembly-plugin + + false + + jar-with-dependencies + + + + forge.app.Main + true + + + + + + make-assembly + + package + + + single + + + + + + - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - - - - - - - forge - forge-gui-mobile - ${project.version} - + + + forge + forge-gui-mobile + ${project.version} + com.badlogicgames.gdx gdx-backend-lwjgl 1.5.5 - - com.badlogicgames.gdx - gdx-platform - 1.2.0 - natives-desktop - - - com.badlogicgames.gdx - gdx-freetype-platform - 1.5.5 - natives-desktop - - - - commons-cli - commons-cli - 1.4 - - + + com.badlogicgames.gdx + gdx-platform + 1.2.0 + natives-desktop + + + com.badlogicgames.gdx + gdx-freetype-platform + 1.5.5 + natives-desktop + + + + commons-cli + commons-cli + 1.4 + + diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 3d09b0bb694..7880adfd083 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -1,65 +1,66 @@ - - 4.0.0 + + 4.0.0 - - forge - forge - 1.6.17-SNAPSHOT - + + forge + forge + 1.6.17-SNAPSHOT + - forge-gui-mobile - jar - Forge Mobile + forge-gui-mobile + jar + Forge Mobile - - src - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - + + src + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + - - - forge - forge-core - ${project.version} - - - forge - forge-game - ${project.version} - - - forge - forge-ai - ${project.version} - - - forge - forge-gui - ${project.version} - - - com.google.guava - guava - 24.1-android - - - com.thoughtworks.xstream - xstream - 1.4.7 - - - org.apache.commons - commons-lang3 - 3.7 - + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + forge + forge-ai + ${project.version} + + + forge + forge-gui + ${project.version} + + + com.google.guava + guava + 24.1-android + + + com.thoughtworks.xstream + xstream + 1.4.7 + + + org.apache.commons + commons-lang3 + 3.7 + com.badlogicgames.gdx gdx @@ -70,6 +71,6 @@ gdx-freetype 1.5.5 - + diff --git a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java index 23f36530c0b..dadb04e2d9d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java @@ -1,13 +1,7 @@ package forge.toolbox; -import java.io.File; -import java.io.FilenameFilter; - -import org.apache.commons.lang3.StringUtils; - import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; - import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; @@ -15,11 +9,14 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; -import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; import forge.util.Callback; import forge.util.FileUtil; import forge.util.Utils; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.FilenameFilter; public class FFileChooser extends FDialog { private static final float BACK_ICON_THICKNESS = Utils.scale(2); @@ -321,7 +318,7 @@ public class FFileChooser extends FDialog { //draw back icon float w = getHeight(); float h = w; - float x = w * 0.35f; + float x = w * 0.35f; float y = h / 2; float offsetX = w / 8; float offsetY = h / 6; @@ -395,7 +392,7 @@ public class FFileChooser extends FDialog { if (value.isDirectory()) { float iconSize = h; g.drawImage(FSkinImage.FOLDER, x, y + (h - iconSize) / 2, iconSize, iconSize); - x += iconSize + FList.PADDING; + x += iconSize + FList.PADDING; } g.drawText(value.getName(), font, foreColor, x, y, w, h, false, HAlignment.LEFT, true); } diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java index 070913984f8..9fd472230ed 100644 --- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/ListChooser.java @@ -6,12 +6,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,9 +34,7 @@ import forge.itemmanager.filters.ItemFilter; import forge.itemmanager.filters.ListLabelFilter; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; -import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FOptionPane; import forge.util.Callback; import forge.util.Utils; @@ -62,7 +60,7 @@ import java.util.List; *
  • If the dialog was canceled, the selection will be empty.
    • *
  • * - * + * * @param * the generic type * @author Forge @@ -228,7 +226,7 @@ public class ListChooser extends FContainer { /** * Shows the dialog and returns after the dialog was closed. - * + * * @param index0 index to select when shown * @return a boolean. */ diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 93f5e17a793..3b9d8055d54 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -36,19 +37,19 @@ forge-ai ${project.version} - - com.google.guava - guava - 24.1-android - - - com.thoughtworks.xstream - xstream - 1.4.10 - - - org.apache.commons - commons-lang3 + + com.google.guava + guava + 24.1-android + + + com.thoughtworks.xstream + xstream + 1.4.10 + + + org.apache.commons + commons-lang3 3.7 @@ -63,9 +64,9 @@ 1.2.17 - org.fourthline.cling - cling-support - 2.0.1 + org.fourthline.cling + cling-support + 2.0.1 org.slf4j @@ -74,30 +75,4 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle-validation - validate - - ../checkstyle.xml - true - UTF-8 - true - true - true - - - check - - - - - - diff --git a/pom.xml b/pom.xml index ef2e482312c..0c0da905a9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 forge @@ -8,8 +9,7 @@ 1.6.17-SNAPSHOT - Forge lets you play the card game Magic: The Gathering against a computer opponent - using all of the rules. + Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules. https://www.cardforge.org/ @@ -179,10 +179,6 @@ HEAD - - 3.1.1 - - Forge Forum @@ -224,6 +220,7 @@ + org.apache.maven.wagon @@ -236,18 +233,27 @@ org.apache.maven.plugins - maven-site-plugin - 3.3 - - 8081 - - - - org.apache.maven.wagon - wagon-ftp - 2.6 - - + maven-enforcer-plugin + 3.0.0-M2 + + + enforce-versions + validate + + enforce + + + + + [3.5.9,) + + + [1.8,) + + + + + @@ -276,93 +282,82 @@ org.apache.maven.plugins maven-surefire-plugin 2.16 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 + + + org.apache.maven.wagon + wagon-ftp + 2.6 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + + maven-assembly-plugin + 2.4 + + + + maven-install-plugin + 2.5.1 + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + maven-release-plugin + 2.5 - - - + true + + - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - - org.apache.maven.wagon - wagon-ftp - 2.6 - - - + + maven-resources-plugin + 2.6 + - - com.google.code.maven-svn-revision-number-plugin - svn-revision-number-maven-plugin - 1.13 - + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + - - maven-assembly-plugin - 2.4 - + + org.apache.maven.plugins + maven-scm-plugin + 1.9 + - - maven-install-plugin - 2.5.1 - + + org.apache.maven.wagon + wagon-ftp + 2.6 + - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - - maven-release-plugin - 2.5 - - true - - - - - maven-resources-plugin - 2.6 - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - - org.apache.maven.plugins - maven-scm-plugin - 1.9 - - - - org.apache.maven.wagon - wagon-ftp - 2.6 - - - + org.eclipse.m2e lifecycle-mapping @@ -381,7 +376,7 @@ - + @@ -395,20 +390,7 @@ - - - - - - com.google.code.maven-svn-revision-number-plugin - svn-revision-number-maven-plugin - [1.0.0,) - - revision - - - - + @@ -421,7 +403,7 @@ - + @@ -434,14 +416,49 @@ org.apache.maven.plugins - maven-deploy-plugin - - - org.apache.maven.wagon - wagon-ftp - 2.6 - - + maven-enforcer-plugin + 3.0.0-M2 + + + enforce-versions + validate + + enforce + + + + + [3.1.1,) + + + [1.8,) + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + checkstyle.xml + true + UTF-8 + true + true + true + + + check + + +