From 594d4f7b3067b0ff6e591a37baa9798624c7c39a Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 26 Nov 2015 22:14:31 +0100 Subject: [PATCH] revert broken maven features --- pom.xml | 235 ++++++++++++++++++++++++---------- src/main/resources/plugin.yml | 2 +- 2 files changed, 170 insertions(+), 67 deletions(-) diff --git a/pom.xml b/pom.xml index 70695a5b9..42a9edc9c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,6 @@ AuthMe fr.xephi.authme.AuthMe - -1 Xephi, sgdc3, DNx5, timvisee, games647, ljacqu @@ -62,20 +61,6 @@ 1.8.8-R0.1-SNAPSHOT - - - jenkins - - - env.BUILD_NUMBER - - - - ${env.BUILD_NUMBER} - - - - AuthMe-${project.version} src/main/java @@ -127,39 +112,6 @@ - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - generate-sources - - replace - - - - - - target/classes/**/AuthMe.java - - - - ${project.version} - ${project.version} - - - ${buildNumber} - ${buildNumber} - - - ${pluginAuthors} - ${pluginAuthors} - - - - - org.apache.maven.plugins @@ -272,12 +224,19 @@ compile - * - * + slf4j-api + org.slf4j true + + org.slf4j + slf4j-jdk14 + 1.7.12 + compile + true + @@ -324,8 +283,8 @@ compile - * - * + org.bukkit + bukkit true @@ -367,8 +326,12 @@ true - * - * + cglib-nodep + cglib + + + BukkitExecutors + com.comphenix.executors @@ -381,8 +344,20 @@ provided - * - * + org.bukkit + bukkit + + + net.gravitydevelopment.updater + updater + + + commons-dbcp + commons-dbcp + + + AccountsClient + com.mojang @@ -431,8 +406,12 @@ provided - * - * + org.bukkit + bukkit + + + org.bukkit + craftbukkit true @@ -447,8 +426,44 @@ provided - * - * + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + AllPay + com.fernferret.allpay + + + VaultAPI + net.milkbowl.vault + + + CommandHandler + com.pneumaticraft.commandhandler + + + SerializationConfig + me.main__.util + + + Logging + com.dumptruckman.minecraft + + + metrics + org.mcstats.bukkit + + + buscript + com.dumptruckman.minecraft + + + junit + junit true @@ -462,8 +477,8 @@ provided - * - * + org.spigotmc + spigot-api true @@ -477,8 +492,68 @@ provided - * - * + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + CombatTagPlusHook + net.minelink + + + CombatTagPlusFactions-v1_6 + net.minelink + + + CombatTagPlusCompat-v1_7_R3 + net.minelink + + + CombatTagPlusFactions-v1_8 + net.minelink + + + CombatTagPlusCompat-v1_7_R4 + net.minelink + + + CombatTagPlusWG-v5 + net.minelink + + + CombatTagPlusWG-v6 + net.minelink + + + CombatTagPlusCompat-API + net.minelink + + + CombatTagPlusFactions-v2_6 + net.minelink + + + CombatTagPlusCompat-v1_8_R3 + net.minelink + + + CombatTagPlusFactions-v2_7 + net.minelink + + + CombatTagPlusCompat-v1_8_R2 + net.minelink + + + CombatTagPlusCompat-v1_8_R1 + net.minelink + + + metrics-lite + org.mcstats.bukkit true @@ -492,8 +567,36 @@ provided - * - * + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + updater + net.gravitydevelopment.updater + + + lombok + org.projectlombok + + + EssentialsGroupManager + net.ess3 + + + PermissionsEx + ru.tehkode + + + AccountsClient + com.mojang + + + log4j-core + org.apache.logging.log4j true diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 4061ca60a..50d9ff38c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ authors: [${pluginAuthors}] website: ${project.url} description: ${project.description} main: ${mainClass} -version: ${project.version} b${env.BUILD_NUMBER} +version: ${project.version}-b${env.BUILD_NUMBER} softdepend: - Vault - PermissionsBukkit