diff --git a/pom.xml b/pom.xml index 1edc4ca38aa..ba6f7cdb877 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,22 @@ + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0 + + + validate + + create + + + + + + + maven-release-plugin 2.2.1 @@ -197,7 +213,11 @@ forge.Gui_NewGame + true + + ${buildNumber} + @@ -250,9 +270,9 @@ - com.google.code.maven-svn-wagon - maven-svn-wagon - 1.4 + org.apache.maven.wagon + wagon-ftp + 1.0 diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index d983f75ddcf..eea0fadecab 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -35,18 +35,19 @@ Forge <> - * {{{http://cardforge.googlecode.com/svn/site/index.html}Maven Project Site}} + * {{{http://cardforge.org/releases/site/index.html}Maven Project Site}} - * {{{http://cardforge.googlecode.com/svn/site/apidocs/index.html}JavaDocs}} + * {{{http://cardforge.org/releases/site/apidocs/index.html}JavaDocs}} - * {{{http://cardforge.googlecode.com/svn/site/xref/index.html}Browsable Source Code}} + * {{{http://cardforge.org/releases/site/xref/index.html}Browsable Source Code}} <> * {{{http://cardforge.org/}Main Website}} - * {{{https://gitorious.org/cardforge/pages/Home}Project Site}} + * {{{http://svn.slightlymagic.net/forge/trunk}Source Code Repository}} + * {{{http://svn.slightlymagic.net/websvn/listing.php?repname=forge}Web View of Source}} * {{{http://mtgrares.blogspot.com/}Original Author's Blog}} diff --git a/src/test/java/forge/gui/ListChooserTest.java b/src/test/java/forge/gui/ListChooserTest.java index 054d31c2f78..b64f7cb856a 100644 --- a/src/test/java/forge/gui/ListChooserTest.java +++ b/src/test/java/forge/gui/ListChooserTest.java @@ -6,13 +6,13 @@ import org.testng.annotations.Test; * Created by IntelliJ IDEA. * User: dhudson */ -@Test(groups = {"UnitTest"}, timeOut = 5000, enabled = false) +@Test(groups = {"UnitTest"}, timeOut = 1000, enabled = false) public class ListChooserTest { /** * * */ - @Test(timeOut = 5000) + @Test(timeOut = 1000) public void ListChooserTest1() { ListChooser c = new ListChooser("test", "choose a or b", 0, 2, "a", "b"); System.out.println(c.show());