From b6f6599779e4304274ab4b7973870642f1af8948 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Thu, 26 Nov 2015 23:55:57 +0700 Subject: [PATCH] Cleanup maven transitive dependencies test to add jenkins build number in plugin version --- pom.xml | 288 ++++++++-------------------------- src/main/resources/plugin.yml | 13 +- 2 files changed, 79 insertions(+), 222 deletions(-) diff --git a/pom.xml b/pom.xml index 3a5a82db0..70cdf72fb 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,6 @@ AuthMe fr.xephi.authme.AuthMe - 100 [Xephi, sgdc3, DNx5, timvisee, games647, ljacqu] @@ -62,57 +61,57 @@ 1.8.8-R0.1-SNAPSHOT - - AuthMe-${project.version} - src/main/java - src/test/java - - - - . - true - src/main/resources/ - - plugin.yml - - - - . - false - src/main/resources/ - - *.yml - - - plugin.yml - - - - ./messages/ - false - src/main/resources/messages/ - - *.yml - - - - - - src/test/resources - - + + AuthMe-${project.version} + src/main/java + src/test/java + + + + . + true + src/main/resources/ + + plugin.yml + + + + . + false + src/main/resources/ + + *.yml + + + plugin.yml + + + + ./messages/ + false + src/main/resources/messages/ + + *.yml + + + + + + src/test/resources + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + ${javaVersion} + + - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.7 - ${javaVersion} - - - org.apache.maven.plugins @@ -225,19 +224,12 @@ compile - slf4j-api - org.slf4j + * + * true - - org.slf4j - slf4j-jdk14 - 1.7.12 - compile - true - @@ -284,8 +276,8 @@ compile - org.bukkit - bukkit + * + * true @@ -327,12 +319,8 @@ true - cglib-nodep - cglib - - - BukkitExecutors - com.comphenix.executors + * + * @@ -345,20 +333,8 @@ provided - org.bukkit - bukkit - - - net.gravitydevelopment.updater - updater - - - commons-dbcp - commons-dbcp - - - AccountsClient - com.mojang + * + * @@ -407,12 +383,8 @@ provided - org.bukkit - bukkit - - - org.bukkit - craftbukkit + * + * true @@ -427,44 +399,8 @@ 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 @@ -478,8 +414,8 @@ provided - org.spigotmc - spigot-api + * + * true @@ -493,68 +429,8 @@ 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 @@ -568,36 +444,8 @@ 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 9001d7e28..6caaeeb09 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,8 +3,17 @@ authors: ${pluginAuthors} website: ${project.url} description: ${project.description} main: ${mainClass} -version: ${project.version} -softdepend: [Vault, PermissionsBukkit, Permissions, PermissionsEX, EssentialsGroupManager, Multiverse-Core, Essentials, EssentialsSpawn, ProtocolLib] +version: ${project.version} b${env.BUILD_NUMBER} +softdepend: + - Vault + - PermissionsBukkit + - Permissions + - PermissionsEX + - EssentialsGroupManager + - Multiverse-Core + - Essentials + - EssentialsSpawn + - ProtocolLib commands: register: description: Register an account