Merge pull request #82 from sgdc3/master

pom style + some optimizations

pom.xml

@@ -48,10 +48,10 @@
 					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
-			<!-- <plugin>
+			<plugin>
 				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>maven-replacer-plugin</artifactId>
-				<version>1.4.1</version>
+				<artifactId>replacer</artifactId>
+				<version>1.5.3</version>
 				<executions>
 					<execution>
 						<phase>prepare-package</phase>
@@ -64,12 +64,12 @@
 					<file>target/classes/plugin.yml</file>
 					<replacements>
 						<replacement>
-							<token>${version}</token>
-							<value>${version}</value>
+							<token>maven-version</token>
+							<value>${project.version}</value>
 						</replacement>
 					</replacements>
 				</configuration>
-			</plugin> -->
+			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.6</version>
@@ -90,7 +90,7 @@
 			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
 
-		<!-- Vault Repo -->
+		<!-- Vault Repo (Already in ess repo!) -->
 		<repository>
 			<id>vault-repo</id>
 			<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
@@ -98,11 +98,11 @@
 
 		<!-- Citizens 2.X Repo -->
 		<repository>
-			<id>everything</id>
+			<id>citizens-repo</id>
 			<url>http://repo.citizensnpcs.co</url>
 		</repository>
 
-		<!-- EssentialsX Repo -->
+		<!-- Essentials Repo -->
 		<repository>
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/groups/public</url>
@@ -114,38 +114,27 @@
 			<url>http://repo.minelink.net/content/repositories/public</url>
 		</repository>
 
-		<!-- CombatTag Repo, Unofficial (needs replacement) -->
+		<!-- CombatTag Repo, Unofficial (needs replacement) UPDATE: this server is OFFLINE
 		<repository>
 			<id>techcable-repo</id>
 			<url>http://repo.techcable.net/content/repositories/snapshots/</url>
-		</repository>
+		</repository> -->
 
 		<!-- XAuth Repo -->
 		<repository>
-			<id>bukkit-plugins-releases</id>
-			<name>repo.luricos.de releases</name>
+			<id>luricos-releases</id>
 			<url>http://repo.luricos.de/content/repositories/releases/</url>
 		</repository>
 
 		<!-- SpoutCraft Repo -->
-		<repository>
-			<id>sonatype-nexus-releases</id>
-			<url>https://oss.sonatype.org/content/repositories/releases</url>
-		</repository>
 		<repository>
 			<id>sonatype-nexus-snapshots</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-			<!-- <snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots> -->
 		</repository>
-		<!-- End of Spout Repo -->
 
 		<!-- Attribute Repo -->
 		<repository>
 			<id>comphenix-snapshots</id>
-			<name>Comphenix Maven Snapshots</name>
 			<url>http://repo.comphenix.net/content/repositories/snapshots/</url>
 		</repository>
 
@@ -209,6 +198,7 @@
 			<version>${bukkitVersion}</version>
 		</dependency>
 
+        <!-- Attribute -->
 		<dependency>
 			<groupId>com.comphenix.attribute</groupId>
 			<artifactId>AttributeStorage</artifactId>
@@ -315,8 +305,8 @@
 		<!-- Anti PvPLogging plugin, http://www.spigotmc.org/resources/combat-tag.3182/ -->
 		<dependency>
 			<groupId>com.trc202</groupId>
-			<artifactId>combattag</artifactId>
-			<version>6.4.1-SNAPSHOT</version>
+			<artifactId>CombatTag</artifactId>
+			<version>6.2.1-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.bukkit</groupId>

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ author: Xephi59
 website: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/
 description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player.
 main: fr.xephi.authme.AuthMe
-version: 5.0-SNAPSHOT
+version: maven-version
 softdepend: [Vault, ChestShop, Spout, Multiverse-Core, Notifications, Citizens, CombatTag, Essentials, EssentialsSpawn]
 commands:
     register: