diff --git a/Mage.Client/install_3d_party_libs.bat b/Mage.Client/install_3d_party_libs.bat deleted file mode 100644 index 9145c3c5c8..0000000000 --- a/Mage.Client/install_3d_party_libs.bat +++ /dev/null @@ -1,2 +0,0 @@ -rem installs 3d party libs to local repository -mvn install:install-file -Dfile=plugins/core/jspf.core-0.9.0.jar -DgroupId=org.plugins.jspf -DartifactId=jspf-core -Dversion=0.9.1 -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true \ No newline at end of file diff --git a/Mage.Client/install_3d_party_libs.sh b/Mage.Client/install_3d_party_libs.sh deleted file mode 100644 index 5e0af555c2..0000000000 --- a/Mage.Client/install_3d_party_libs.sh +++ /dev/null @@ -1,2 +0,0 @@ -# installs 3d party libs to local repository -mvn install:install-file -Dfile=plugins/core/jspf.core-0.9.0.jar -DgroupId=org.plugins.jspf -DartifactId=jspf-core -Dversion=0.9.1 -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true \ No newline at end of file diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 0b243a2e2b..a5a43a5df0 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -6,13 +6,13 @@ org.mage mage-root - 0.3 + ${mage-version} org.mage Mage-Client jar - 0.3 + ${mage-version} Mage Client http://maven.apache.org @@ -36,6 +36,8 @@ org.plugins.jspf jspf-core ${jspf-version} + system + ${basedir}/plugins/core/jspf.core-0.9.0.jar @@ -86,7 +88,6 @@ - 0.3 0.9.1 diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index 35f5d037a1..8d2ab34865 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -6,13 +6,13 @@ org.mage mage-root - 0.3 + ${mage-version} org.mage Mage-Common jar - 0.3 + ${mage-version} Mage Common Classes http://maven.apache.org @@ -26,6 +26,8 @@ org.plugins.jspf jspf-core ${jspf-version} + system + ${basedir}/../Mage.Client/plugins/core/jspf.core-0.9.0.jar @@ -54,7 +56,6 @@ - 0.3 0.9.1 diff --git a/Mage.Plugins/Mage.Card.Plugin/pom.xml b/Mage.Plugins/Mage.Card.Plugin/pom.xml index cc8b0a9cbf..16c7d3d521 100644 --- a/Mage.Plugins/Mage.Card.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Card.Plugin/pom.xml @@ -21,6 +21,8 @@ org.plugins.jspf jspf-core ${jspf-version} + system + ${basedir}/../../Mage.Client/plugins/core/jspf.core-0.9.0.jar diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml index cbd1f07928..f76fd6a2bd 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml @@ -26,6 +26,8 @@ org.plugins.jspf jspf-core ${jspf-version} + system + ${basedir}/../../Mage.Client/plugins/core/jspf.core-0.9.0.jar log4j diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index 2a8d52f915..e89deb61ea 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -37,6 +37,14 @@ jaxb-impl 2.1.12 + + + log4j + log4j + 1.2.14 + jar + +