cleaning pom.xml, version bump to 0.5

This commit is contained in:
Loki 2010-12-02 09:14:18 +00:00
parent 3384d27ea8
commit 592ba955f0
24 changed files with 726 additions and 746 deletions

View file

@ -6,31 +6,29 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Client</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Client</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage-Common</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage-Sets</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.jspf</groupId>
@ -109,6 +107,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>

View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files\Java\jre6"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
start javaw -jar .\MageClient.jar
start javaw -jar .\MageClient-${project.version}.jar

View file

@ -20,11 +20,15 @@
</dependencySets>
<fileSets>
<fileSet>
<filtered>true</filtered>
<directory>release/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
<directory>plugins/*.jar</directory>
<directory>plugins/</directory>
<includes>
<include>*.jar</include>
</includes>
<outputDirectory>plugins/</outputDirectory>
</fileSet>
</fileSets>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Common</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Common Classes</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.jspf</groupId>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Deck-Constructed</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Deck Constructed</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Game-FreeForAll</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Game Free For All</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Game-TwoPlayerDuel</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Game Two Player</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Player-AI</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Player AI</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,26 +7,23 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Player-AIMinimax</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Player AI Minimax</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Player-AI</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Player-Human</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Player Human</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,10 +7,9 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Card-Plugin</artifactId>
<packaging>jar</packaging>
<version>${plugin-version}</version>
@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Common</artifactId>
<version>${mage-version}</version>
</dependency>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,21 +7,19 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Counter-Plugin</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Counter Plugin</name>
<description>Implements game counter to display amount of games played</description>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Common</artifactId>
<version>${mage-version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.jspf</groupId>

View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>

View file

@ -6,19 +6,17 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Theme-Plugin</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Theme Plugin</name>
<description>Contains resources for drawing background</description>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Common</artifactId>
<version>${mage-version}</version>
</dependency>

View file

@ -7,12 +7,10 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.3</version>
<packaging>pom</packaging>
<name>Mage Plugins</name>
<description>Mage Plugins POM</description>

View file

@ -6,10 +6,5 @@
# nickname - Player's name you connect to the game with
#
#
hand:player:Fireball:2
battlefield:player:Forest:2
battlefield:player:Plains:3
battlefield:player:Brindle Boar:1
battlefield:player:Jace, the Mind Sculptor:1
battlefield:computer:Bloodbraid Elf:1
hand:player:Holy Strength:2
hand:player:Nest Invader:1

View file

@ -6,29 +6,26 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Server</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Server</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Common</artifactId>
<version>${mage-version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Sets</artifactId>
<version>${mage-version}</version>
</dependency>
@ -121,6 +118,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>

View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files\Java\jre6"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
start java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -jar ./MageServer.jar
start java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -jar ./MageServer-${project.version}.jar

View file

@ -31,6 +31,7 @@
</dependencySets>
<fileSets>
<fileSet>
<filtered>true</filtered>
<directory>release/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,19 +7,18 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Sets</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Sets</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.mage</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>Mage</artifactId>
<version>${mage-version}</version>
</dependency>

View file

@ -1,3 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@ -6,15 +7,12 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
</parent>
<groupId>org.mage</groupId>
<artifactId>Mage</artifactId>
<packaging>jar</packaging>
<version>0.3</version>
<name>Mage Framework</name>
<url>http://maven.apache.org</url>
<dependencies />

View file

@ -2,6 +2,7 @@
use WWW::Mechanize;
use HTML::TreeBuilder;
use Parse::RecDescent;
use Text::Template;
use strict;
@ -232,6 +233,9 @@ $mana{'Black or Green'} = 'B\\\\G';
$mana{'Black or Red'} = 'B\\\\R';
$mana{'Red or Green'} = 'R\\\\G';
my $parser = new Parse::RecDescent(q{
});
my %normalid;
print "Enter a card name: ";

View file

@ -6,7 +6,7 @@
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.3</version>
<version>0.5</version>
<packaging>pom</packaging>
<name>Mage Root</name>
<description>Mage Root POM</description>
@ -44,6 +44,6 @@
</repositories>
<properties>
<mage-version>0.3</mage-version>
<mage-version>0.5</mage-version>
</properties>
</project>