Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -0,0 +1,7 @@
+language: java
+jdk: [ openjdk7 ]
+env:
+  global:
+    - secure: "WGObsHmjnqn5e0nbXLGetwpUHU0UgvNk02+f0m3jIS7hSdBy5m1JK2K6NXV13brY0C9i0DLy0e7JKabqmqTxI94dT0LrYBxcvfmtZ/7PujOn/D9CzVimGj6g20hBDYwAXL6KAIR7JL8qexQBwIkVZPdwaA+k+UHLM9XVoIQdFgU="
+    - secure: "XfBov3Z4Rk2AvS1v7o31Qr2XrO/oqQvl+Eksx9DO3XbGcLjT9wfGxGcYgP9IJO+Aa5AQo3Xud7EV4gqNpMa2PByzDdgg/nfyqSvrRvsG2aH1zm5N5bAHxCVlPimVdNtyeub6QBPCIGaWBp1R8x3Ak7F79mA5BdJuT9j5FBogC5U="
+script: .utility/do-build.sh

.utility/do-build.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+if [[ "$TRAVIS_REPO_SLUG" != "MilkBowl/Vault" ]]
+then
+        echo 'Travis can only publish docs for release builds.'
+        return 0
+fi
+if [[ "$TRAVIS_PULL_REQUEST" == "true" || "$TRAVIS_BRANCH" != "master" ]]
+then
+	mvn test
+else
+	mvn clean deploy --settings .utility/settings.xml
+fi
+
+exit $?

.utility/settings.xml

@@ -0,0 +1,9 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven/apache.org/xsd/settings-1.0.0.xsd">
+	<servers>
+		<server>
+			<id>pub-repo</id>
+			<username>${env.DEPLOY_USER}</username>
+			<password>${env.DEPLOY_PASS}</password>
+		</server>
+	</servers>
+</settings>

plugin.yml

@@ -1,5 +1,5 @@
 name: ${project.name}
-version: ${project.version}-b${BUILD_NUMBER}
+version: ${project.version}-b${env.TRAVIS_BUILD_NUMBER}
 description: ${project.description}
 authors: [cereal, Sleaker, mung3r]
 website: ${project.url}

pom.xml

@@ -12,7 +12,7 @@
 	<!-- Project information -->
 	<groupId>net.milkbowl.vault</groupId>
 	<artifactId>Vault</artifactId>
-	<version>${api.version}.1</version>
+	<version>${api.version}.2-SNAPSHOT</version>
 	<name>Vault</name>
 	<url>http://dev.bukkit.org/server-mods/vault/</url>
 	<description>Vault is a Permissions &amp; Economy API to allow plugins to more easily hook into these systems without needing to hook each individual system themselves.
@@ -44,6 +44,11 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
 			<name>Public Releases</name>
 			<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
 		</repository>
+		<snapshotRepository>
+			<id>pub-repo</id>
+			<name>Public Snapshots</name>
+			<url>http://nexus.theyeticave.net/content/repositories/pub_snapshots/</url>
+		</snapshotRepository>
 	</distributionManagement>
 
 	<repositories>
@@ -316,7 +321,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
 		<dependency>
 			<groupId>com.platymuus.bukkit.permissions.PermissionsPlugin</groupId>
 			<artifactId>PermissionsBukkit</artifactId>
-			<version>1.6</version>
+			<version>2.3</version>
 			<optional>true</optional>
 			<scope>system</scope>
 			<systemPath>${project.basedir}/lib/PermissionsBukkit.jar</systemPath>