From f894b62a88ec8665bd7c91a5bbe33f4f5ea2b71e Mon Sep 17 00:00:00 2001 From: jedk1 Date: Thu, 24 Nov 2016 07:27:12 +0000 Subject: [PATCH] Update pom.xml (#652) * Change AirFlight to use setFlying. Change remove command. * Tidy up pom.xml * Update plugin.yml to use pom.xml version * Remove non needed file * Remove craftbukkit from pom.xml --- dependency-reduced-pom.xml | 223 ------------------------- pom.xml | 328 ++++++++++++++++++------------------- src/plugin.yml | 2 +- 3 files changed, 161 insertions(+), 392 deletions(-) delete mode 100644 dependency-reduced-pom.xml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index 01cd3227..00000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - 4.0.0 - com.projectkorra - projectkorra - don't matter - - ${project.basedir}/src - - - true - ${basedir}/src - - plugin.yml - - - - ${project.name} - - - maven-shade-plugin - 2.3 - - - package - - shade - - - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - worldedit-worldguard-repo - http://maven.sk89q.com/repo/ - - - - - org.spigotmc - spigot-api - 1.10.2-R0.1-SNAPSHOT - provided - - - commons-lang - commons-lang - - - gson - com.google.code.gson - - - ebean - org.avaje - - - snakeyaml - org.yaml - - - bungeecord-chat - net.md-5 - - - - - com.sk89q - worldguard - 6.1.1-SNAPSHOT - provided - - - worldedit - com.sk89q - - - bukkit-classloader-check - com.sk89q.spigot - - - bukkit - org.bukkit - - - commandbook - com.sk89q - - - jsr305 - com.google.code.findbugs - - - - - com.sk89q.worldedit - worldedit-bukkit - 6.1.4-SNAPSHOT - provided - - - dummypermscompat - com.sk89q - - - worldedit-core - com.sk89q.worldedit - - - bukkit - org.bukkit - - - - - com.google.guava - guava - 19.0 - provided - - - com.googlecode.json-simple - json-simple - 1.1.1 - provided - - - junit - junit - - - - - me.ryanhamshire - GriefPrevention - 10.5.3 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/GriefPrevention 10.5.3.jar - - - com.griefcraft - lwc - 4.5.0-SNAPSHOT - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/LWC.jar - - - com.massivecraft - massivecore - 2.7.5 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/MassiveCore 2.7.5.jar - - - fr.neatmonster - nocheatplus - 3.11.0-RC-sMD5NET-b739 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/NoCheatPlus.jar - - - com.palmergames.bukkit - towny - 0.89.2.0 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/Towny.jar - - - com.bekvon.bukkit - residence - 4.0.0.4 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/Residence4.0.0.4.jar - - - com.projectkorra - spirits - 1.0.0 PRIVATE PREALPHA - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/ProjectKorraSpirits.jar - - - com.projectkorra - rpg - 1.0.2 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/ProjectKorraRPG.jar - - - com.projectkorra - items - 1.2.0 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/ProjectKorraItems.jar - - - net.sacredlabyrinth.Phaed - PreciousStones - 9.7.1-SNAPSHOT - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/PreciousStones 9.7.1.jar - - - com.massivecraft - factions - 2.7.5 - system - C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/Factions 2.7.5.jar - - - - 1.7 - 1.7 - - - diff --git a/pom.xml b/pom.xml index ebe8485b..e3d0f201 100644 --- a/pom.xml +++ b/pom.xml @@ -1,170 +1,162 @@ - - - 4.0.0 + + 4.0.0 - com.projectkorra - projectkorra - don't matter - - 1.7 - 1.7 - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - worldedit-worldguard-repo - http://maven.sk89q.com/repo/ - + com.projectkorra + projectkorra + 1.8.1 + jar + ProjectKorra - - - - ${project.basedir}/src - ${project.name} - - - - ${basedir}/src - true - - plugin.yml - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - - - package - - shade - - - - - - - - - - org.spigotmc - spigot-api - 1.10.2-R0.1-SNAPSHOT - provided - - - - com.sk89q - worldguard - 6.1.1-SNAPSHOT - provided - - - - com.sk89q.worldedit - worldedit-bukkit - 6.1.4-SNAPSHOT - provided - - - - com.google.guava - guava - 19.0 - provided - - - com.googlecode.json-simple - json-simple - 1.1.1 - provided - - - me.ryanhamshire - GriefPrevention - 10.5.3 - system - ${basedir}/lib/GriefPrevention 10.5.3.jar - - - com.griefcraft - lwc - 4.5.0-SNAPSHOT - system - ${basedir}/lib/LWC.jar - - - com.massivecraft - massivecore - 2.7.5 - system - ${basedir}/lib/MassiveCore 2.7.5.jar - - - fr.neatmonster - nocheatplus - 3.11.0-RC-sMD5NET-b739 - system - ${basedir}/lib/NoCheatPlus.jar - - - com.palmergames.bukkit - towny - 0.89.2.0 - system - ${basedir}/lib/Towny.jar - - - com.bekvon.bukkit - residence - 4.0.0.4 - system - ${basedir}/lib/Residence4.0.0.4.jar - - - com.projectkorra - spirits - 1.0.0 PRIVATE PREALPHA - system - ${basedir}/lib/ProjectKorraSpirits.jar - - - com.projectkorra - rpg - 1.0.2 - system - ${basedir}/lib/ProjectKorraRPG.jar - - - com.projectkorra - items - 1.2.0 - system - ${basedir}/lib/ProjectKorraItems.jar - - - net.sacredlabyrinth.Phaed - PreciousStones - 9.7.1-SNAPSHOT - system - ${basedir}/lib/PreciousStones 9.7.1.jar - - - com.massivecraft - factions - 2.7.5 - system - ${basedir}/lib/Factions 2.7.5.jar - - - + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + + + org.spigotmc + spigot-api + 1.10.2-R0.1-SNAPSHOT + provided + + + + com.massivecraft + factions + LATEST + system + ${project.basedir}/lib/Factions 2.7.5.jar + + + + me.ryanhamshire + GriefPrevention + LATEST + system + ${project.basedir}/lib/GriefPrevention 10.5.3.jar + + + + com.griefcraft + lwc + LATEST + system + ${project.basedir}/lib/LWC.jar + + + + com.massivecraft + massivecore + LATEST + system + ${project.basedir}/lib/MassiveCore 2.7.5.jar + + + + com.massivecraft + massivecore + LATEST + system + ${project.basedir}/lib/MassiveCore 2.7.5.jar + + + + fr.neatmonster + nocheatplus + LATEST + system + ${project.basedir}/lib/NoCheatPlus.jar + + + + net.sacredlabyrinth.Phaed + PreciousStones + LATEST + system + ${project.basedir}/lib/PreciousStones 9.7.1.jar + + + + com.projectkorra + rpg + LATEST + system + ${project.basedir}/lib/ProjectKorraRPG.jar + + + + com.projectkorra + items + LATEST + system + ${project.basedir}/lib/ProjectKorraItems.jar + + + + com.projectkorra + spirits + LATEST + system + ${project.basedir}/lib/ProjectKorraSpirits.jar + + + + com.bekvon.bukkit + residence + LATEST + system + ${project.basedir}/lib/Residence4.0.0.4.jar + + + + com.plamergames.bukkit + Towny + LATEST + system + ${project.basedir}/lib/Towny.jar + + + + com.sk89q + worldguard + LATEST + system + ${project.basedir}/lib/worldguard-6.1.jar + + + + + clean package install + ${project.name}-${project.version} + ${project.basedir}/src/ + + + . + true + ${project.basedir}/src/ + + *.yml + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + + UTF-8 + + \ No newline at end of file diff --git a/src/plugin.yml b/src/plugin.yml index dc0ef446..42563450 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: ProjectKorra author: ProjectKorra -version: 1.8.1 +version: ${project.version} main: com.projectkorra.projectkorra.ProjectKorra softdepend: [PreciousStones, WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention, Towny, NoCheatPlus, LWC, Residence] commands: