Merge branch 'master' into development

This commit is contained in:
Eric Stokes 2011-09-21 17:50:16 -06:00
commit f009ad6dd6

345
pom.xml
View File

@ -1,108 +1,139 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.onarandombox.multiversecore</groupId> <groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId> <artifactId>Multiverse-Core</artifactId>
<version>2.0</version> <version>2.0</version>
<name>Multiverse-Core</name> <name>Multiverse-Core</name>
<description>World Management Plugin</description> <description>World Management Plugin</description>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.number>UNKNOWN</project.build.number> <project.build.number>UNKNOWN</project.build.number>
</properties> <doxygen.configuration>doxygen</doxygen.configuration>
</properties>
<repositories> <repositories>
<repository> <repository>
<id>OnARandomBox</id> <id>OnARandomBox</id>
<url>http://repo.onarandombox.com/artifactory/repo</url> <url>http://repo.onarandombox.com/artifactory/repo</url>
</repository> </repository>
<repository> <repository>
<id>GetSpout</id> <id>GetSpout</id>
<url>http://repo.getspout.org/</url> <url>http://repo.getspout.org/</url>
</repository> </repository>
</repositories> </repositories>
<build> <pluginRepositories>
<defaultGoal>clean package</defaultGoal> <pluginRepository>
<plugins> <id>doodleproject-repo</id>
<!-- Compiler --> <name>DoodleProject Maven 2 Repository</name>
<plugin> <url>http://doodleproject.sourceforge.net/maven2/release</url>
<groupId>org.apache.maven.plugins</groupId> <releases>
<artifactId>maven-compiler-plugin</artifactId> <enabled>true</enabled>
<version>2.3.2</version> </releases>
<configuration> </pluginRepository>
<source>1.6</source> </pluginRepositories>
<target>1.6</target>
</configuration> <ciManagement>
</plugin> <system>jenkins</system>
<!-- Build Helper - Additional Source Folders --> <url>http://ci.onarandombox.com</url>
<plugin> </ciManagement>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <build>
<version>1.7</version> <defaultGoal>clean package</defaultGoal>
<executions> <plugins>
<execution> <!-- Compiler -->
<id>add-wsdl-source</id> <plugin>
<phase>generate-sources</phase> <groupId>org.apache.maven.plugins</groupId>
<goals> <artifactId>maven-compiler-plugin</artifactId>
<goal>add-source</goal> <version>2.3.2</version>
</goals> <configuration>
<configuration> <source>1.6</source>
<sources> <target>1.6</target>
<source>${project.basedir}/lib/allpay/src</source> </configuration>
<source>${project.basedir}/lib/commandhandler/src</source> </plugin>
<source>${project.basedir}/lib/commandhandler/lib/ShellParser/src</source> <!-- Build Helper - Additional Source Folders -->
</sources> <plugin>
</configuration> <groupId>org.codehaus.mojo</groupId>
</execution> <artifactId>build-helper-maven-plugin</artifactId>
</executions> <version>1.7</version>
</plugin> <executions>
<plugin> <execution>
<groupId>com.google.code.maven-replacer-plugin</groupId> <id>add-wsdl-source</id>
<artifactId>maven-replacer-plugin</artifactId> <phase>generate-sources</phase>
<version>1.3.8</version> <goals>
<executions> <goal>add-source</goal>
<execution> </goals>
<phase>prepare-package</phase> <configuration>
<goals> <sources>
<goal>replace</goal> <source>${project.basedir}/lib/allpay/src</source>
</goals> <source>${project.basedir}/lib/commandhandler/src</source>
</execution> <source>${project.basedir}/lib/commandhandler/lib/ShellParser/src</source>
</executions> </sources>
<configuration> </configuration>
<file>target/classes/plugin.yml</file> </execution>
<replacements> </executions>
<replacement> </plugin>
<token>maven-version-number</token> <plugin>
<value>${project.version}-${project.build.number}</value> <groupId>com.google.code.maven-replacer-plugin</groupId>
</replacement> <artifactId>maven-replacer-plugin</artifactId>
</replacements> <version>1.3.8</version>
</configuration> <executions>
</plugin> <execution>
<!-- Jar Plugin --> <phase>prepare-package</phase>
<plugin> <goals>
<groupId>org.apache.maven.plugins</groupId> <goal>replace</goal>
<artifactId>maven-jar-plugin</artifactId> </goals>
<version>2.3.1</version> </execution>
<configuration> </executions>
<archive> <configuration>
<manifestEntries> <file>target/classes/plugin.yml</file>
</manifestEntries> <replacements>
</archive> <replacement>
</configuration> <token>maven-version-number</token>
</plugin> <value>${project.version}-${project.build.number}</value>
</plugins> </replacement>
</build> </replacements>
<dependencies> </configuration>
<!-- Bukkit Dependency --> </plugin>
<dependency> <!-- Jar Plugin -->
<groupId>org.bukkit</groupId> <plugin>
<artifactId>bukkit</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>0.0.1-SNAPSHOT</version> <artifactId>maven-jar-plugin</artifactId>
<type>jar</type> <version>2.3.1</version>
<scope>compile</scope> <configuration>
</dependency> <archive>
<!-- Bukkit Dependency --> <manifestEntries>
</manifestEntries>
</archive>
</configuration>
</plugin>
<!-- Doxygen JavaDoc Plugin -->
<plugin>
<groupId>net.sf.doodleproject</groupId>
<artifactId>doxygen-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<executable>/usr/local/bin/doxygen</executable>
<configurationFile>${doxygen.configuration}</configurationFile>
<projectName>${project.name}</projectName>
<destDir>target/doxygen</destDir>
<inputDirectory>src/main/java</inputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<!-- Bukkit Dependency -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>0.0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<!-- Bukkit Dependency -->
<!-- Start of Spout --> <!-- Start of Spout -->
<dependency> <dependency>
<groupId>org.getspout</groupId> <groupId>org.getspout</groupId>
@ -110,76 +141,76 @@
<version>dev-SNAPSHOT</version> <version>dev-SNAPSHOT</version>
</dependency> </dependency>
<!-- End of Spout --> <!-- End of Spout -->
<!-- Start of Economy Dependencies --> <!-- Start of Economy Dependencies -->
<dependency>
<groupId>cosine.boseconomy</groupId>
<artifactId>BOSEconomy</artifactId>
<version>0.6.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>fr.crafter.tickleman.RealShop</groupId>
<artifactId>RealShop</artifactId>
<version>0.63</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.iCo6</groupId> <groupId>cosine.boseconomy</groupId>
<artifactId>BOSEconomy</artifactId>
<version>0.6.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>fr.crafter.tickleman.RealShop</groupId>
<artifactId>RealShop</artifactId>
<version>0.63</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.iCo6</groupId>
<artifactId>iConomy</artifactId> <artifactId>iConomy</artifactId>
<version>6.0</version> <version>6.0</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.iConomy</groupId>
<artifactId>iConomy</artifactId>
<version>5.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.nijiko.coelho.iConomy</groupId> <groupId>com.iConomy</groupId>
<artifactId>iConomy</artifactId> <artifactId>iConomy</artifactId>
<version>4.65</version> <version>5.0</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.earth2me.essentials</groupId> <groupId>com.nijiko.coelho.iConomy</groupId>
<artifactId>Essentials</artifactId> <artifactId>iConomy</artifactId>
<version>2.4.2</version> <version>4.65</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<dependency>
<groupId>com.earth2me.essentials</groupId>
<artifactId>Essentials</artifactId>
<version>2.4.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>me.ashtheking.currency</groupId> <groupId>me.ashtheking.currency</groupId>
<artifactId>MultiCurrency</artifactId> <artifactId>MultiCurrency</artifactId>
<version>0.09</version> <version>0.09</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- End of Economy Dependencies --> <!-- End of Economy Dependencies -->
<!-- Start of Permissions Dependencies --> <!-- Start of Permissions Dependencies -->
<dependency> <dependency>
<groupId>com.nijikokun.bukkit</groupId> <groupId>com.nijikokun.bukkit</groupId>
<artifactId>Permissions</artifactId> <artifactId>Permissions</artifactId>
<version>3.2</version> <version>3.2</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit</groupId> <groupId>org.junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.8.2</version>
</dependency> </dependency>
<!-- End of Permissions Dependencies --> <!-- End of Permissions Dependencies -->
</dependencies> </dependencies>
</project> </project>