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
This commit is contained in:
jedk1 2016-11-24 07:27:12 +00:00 committed by Christopher Martin
parent f4e684bb76
commit f894b62a88
3 changed files with 161 additions and 392 deletions

View file

@ -1,223 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.projectkorra</groupId>
<artifactId>projectkorra</artifactId>
<version>don't matter</version>
<build>
<sourceDirectory>${project.basedir}/src</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src</directory>
<includes>
<include>plugin.yml</include>
</includes>
</resource>
</resources>
<finalName>${project.name}</finalName>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration />
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>worldedit-worldguard-repo</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
</exclusion>
<exclusion>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</exclusion>
<exclusion>
<artifactId>ebean</artifactId>
<groupId>org.avaje</groupId>
</exclusion>
<exclusion>
<artifactId>snakeyaml</artifactId>
<groupId>org.yaml</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>6.1.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>worldedit</artifactId>
<groupId>com.sk89q</groupId>
</exclusion>
<exclusion>
<artifactId>bukkit-classloader-check</artifactId>
<groupId>com.sk89q.spigot</groupId>
</exclusion>
<exclusion>
<artifactId>bukkit</artifactId>
<groupId>org.bukkit</groupId>
</exclusion>
<exclusion>
<artifactId>commandbook</artifactId>
<groupId>com.sk89q</groupId>
</exclusion>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>6.1.4-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>dummypermscompat</artifactId>
<groupId>com.sk89q</groupId>
</exclusion>
<exclusion>
<artifactId>worldedit-core</artifactId>
<groupId>com.sk89q.worldedit</groupId>
</exclusion>
<exclusion>
<artifactId>bukkit</artifactId>
<groupId>org.bukkit</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>me.ryanhamshire</groupId>
<artifactId>GriefPrevention</artifactId>
<version>10.5.3</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/GriefPrevention 10.5.3.jar</systemPath>
</dependency>
<dependency>
<groupId>com.griefcraft</groupId>
<artifactId>lwc</artifactId>
<version>4.5.0-SNAPSHOT</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/LWC.jar</systemPath>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<artifactId>massivecore</artifactId>
<version>2.7.5</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/MassiveCore 2.7.5.jar</systemPath>
</dependency>
<dependency>
<groupId>fr.neatmonster</groupId>
<artifactId>nocheatplus</artifactId>
<version>3.11.0-RC-sMD5NET-b739</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/NoCheatPlus.jar</systemPath>
</dependency>
<dependency>
<groupId>com.palmergames.bukkit</groupId>
<artifactId>towny</artifactId>
<version>0.89.2.0</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/Towny.jar</systemPath>
</dependency>
<dependency>
<groupId>com.bekvon.bukkit</groupId>
<artifactId>residence</artifactId>
<version>4.0.0.4</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/Residence4.0.0.4.jar</systemPath>
</dependency>
<dependency>
<groupId>com.projectkorra</groupId>
<artifactId>spirits</artifactId>
<version>1.0.0 PRIVATE PREALPHA</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/ProjectKorraSpirits.jar</systemPath>
</dependency>
<dependency>
<groupId>com.projectkorra</groupId>
<artifactId>rpg</artifactId>
<version>1.0.2</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/ProjectKorraRPG.jar</systemPath>
</dependency>
<dependency>
<groupId>com.projectkorra</groupId>
<artifactId>items</artifactId>
<version>1.2.0</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/ProjectKorraItems.jar</systemPath>
</dependency>
<dependency>
<groupId>net.sacredlabyrinth.Phaed</groupId>
<artifactId>PreciousStones</artifactId>
<version>9.7.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/PreciousStones 9.7.1.jar</systemPath>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<artifactId>factions</artifactId>
<version>2.7.5</version>
<scope>system</scope>
<systemPath>C:\Users\alexj\Desktop\ProjectKorra\code\ProjectKorra/lib/Factions 2.7.5.jar</systemPath>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
</project>

326
pom.xml
View file

@ -1,170 +1,162 @@
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.projectkorra</groupId> <groupId>com.projectkorra</groupId>
<artifactId>projectkorra</artifactId> <artifactId>projectkorra</artifactId>
<version>don't matter</version> <version>1.8.1</version>
<properties> <packaging>jar</packaging>
<maven.compiler.source>1.7</maven.compiler.source> <name>ProjectKorra</name>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>worldedit-worldguard-repo</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
</repositories> <repositories>
<build> <repository>
<!--Maintain existing structure (as much as possible)--> <id>spigot-repo</id>
<sourceDirectory>${project.basedir}/src</sourceDirectory> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
<finalName>${project.name}</finalName> </repository>
<resources> </repositories>
<resource>
<!-- Use plugin.yml in src directory--> <dependencies>
<directory>${basedir}/src</directory> <!-- Spigot API -->
<filtering>true</filtering> <dependency>
<includes> <groupId>org.spigotmc</groupId>
<include>plugin.yml</include> <artifactId>spigot-api</artifactId>
</includes> <version>1.10.2-R0.1-SNAPSHOT</version>
</resource> <scope>provided</scope>
</resources> </dependency>
<plugins> <!-- Factions -->
<plugin> <dependency>
<groupId>org.apache.maven.plugins</groupId> <groupId>com.massivecraft</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>factions</artifactId>
<version>2.3</version> <version>LATEST</version>
<configuration> <scope>system</scope>
</configuration> <systemPath>${project.basedir}/lib/Factions 2.7.5.jar</systemPath>
<executions> </dependency>
<execution> <!-- GriefPrevention -->
<phase>package</phase> <dependency>
<goals> <groupId>me.ryanhamshire</groupId>
<goal>shade</goal> <artifactId>GriefPrevention</artifactId>
</goals> <version>LATEST</version>
</execution> <scope>system</scope>
</executions> <systemPath>${project.basedir}/lib/GriefPrevention 10.5.3.jar</systemPath>
</plugin> </dependency>
</plugins> <!-- LWC -->
</build> <dependency>
<dependencies> <groupId>com.griefcraft</groupId>
<!--Spigot API--> <artifactId>lwc</artifactId>
<dependency> <version>LATEST</version>
<groupId>org.spigotmc</groupId> <scope>system</scope>
<artifactId>spigot-api</artifactId> <systemPath>${project.basedir}/lib/LWC.jar</systemPath>
<version>1.10.2-R0.1-SNAPSHOT</version> </dependency>
<scope>provided</scope> <!-- MassiveCore -->
</dependency> <dependency>
<!--Worldguard dependency--> <groupId>com.massivecraft</groupId>
<dependency> <artifactId>massivecore</artifactId>
<groupId>com.sk89q</groupId> <version>LATEST</version>
<artifactId>worldguard</artifactId> <scope>system</scope>
<version>6.1.1-SNAPSHOT</version> <systemPath>${project.basedir}/lib/MassiveCore 2.7.5.jar</systemPath>
<scope>provided</scope> </dependency>
</dependency> <!-- MassiveCore -->
<!--WorldGuard depends on WorldEdit--> <dependency>
<dependency> <groupId>com.massivecraft</groupId>
<groupId>com.sk89q.worldedit</groupId> <artifactId>massivecore</artifactId>
<artifactId>worldedit-bukkit</artifactId> <version>LATEST</version>
<version>6.1.4-SNAPSHOT</version> <scope>system</scope>
<scope>provided</scope> <systemPath>${project.basedir}/lib/MassiveCore 2.7.5.jar</systemPath>
</dependency> </dependency>
<!--Google stuff--> <!-- NoCheatPlus -->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>fr.neatmonster</groupId>
<artifactId>guava</artifactId> <artifactId>nocheatplus</artifactId>
<version>19.0</version> <version>LATEST</version>
<scope>provided</scope> <scope>system</scope>
</dependency> <systemPath>${project.basedir}/lib/NoCheatPlus.jar</systemPath>
<dependency> </dependency>
<groupId>com.googlecode.json-simple</groupId> <!-- PreciousStones -->
<artifactId>json-simple</artifactId> <dependency>
<version>1.1.1</version> <groupId>net.sacredlabyrinth.Phaed</groupId>
<scope>provided</scope> <artifactId>PreciousStones</artifactId>
</dependency> <version>LATEST</version>
<dependency> <scope>system</scope>
<groupId>me.ryanhamshire</groupId> <systemPath>${project.basedir}/lib/PreciousStones 9.7.1.jar</systemPath>
<artifactId>GriefPrevention</artifactId> </dependency>
<version>10.5.3</version> <!-- PK RPG -->
<scope>system</scope> <dependency>
<systemPath>${basedir}/lib/GriefPrevention 10.5.3.jar</systemPath> <groupId>com.projectkorra</groupId>
</dependency> <artifactId>rpg</artifactId>
<dependency> <version>LATEST</version>
<groupId>com.griefcraft</groupId> <scope>system</scope>
<artifactId>lwc</artifactId> <systemPath>${project.basedir}/lib/ProjectKorraRPG.jar</systemPath>
<version>4.5.0-SNAPSHOT</version> </dependency>
<scope>system</scope> <!-- PK ITEMS -->
<systemPath>${basedir}/lib/LWC.jar</systemPath> <dependency>
</dependency> <groupId>com.projectkorra</groupId>
<dependency> <artifactId>items</artifactId>
<groupId>com.massivecraft</groupId> <version>LATEST</version>
<artifactId>massivecore</artifactId> <scope>system</scope>
<version>2.7.5</version> <systemPath>${project.basedir}/lib/ProjectKorraItems.jar</systemPath>
<scope>system</scope> </dependency>
<systemPath>${basedir}/lib/MassiveCore 2.7.5.jar</systemPath> <!-- PK Spirits -->
</dependency> <dependency>
<dependency> <groupId>com.projectkorra</groupId>
<groupId>fr.neatmonster</groupId> <artifactId>spirits</artifactId>
<artifactId>nocheatplus</artifactId> <version>LATEST</version>
<version>3.11.0-RC-sMD5NET-b739</version> <scope>system</scope>
<scope>system</scope> <systemPath>${project.basedir}/lib/ProjectKorraSpirits.jar</systemPath>
<systemPath>${basedir}/lib/NoCheatPlus.jar</systemPath> </dependency>
</dependency> <!-- Residence -->
<dependency> <dependency>
<groupId>com.palmergames.bukkit</groupId> <groupId>com.bekvon.bukkit</groupId>
<artifactId>towny</artifactId> <artifactId>residence</artifactId>
<version>0.89.2.0</version> <version>LATEST</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/lib/Towny.jar</systemPath> <systemPath>${project.basedir}/lib/Residence4.0.0.4.jar</systemPath>
</dependency> </dependency>
<dependency> <!-- Towny -->
<groupId>com.bekvon.bukkit</groupId> <dependency>
<artifactId>residence</artifactId> <groupId>com.plamergames.bukkit</groupId>
<version>4.0.0.4</version> <artifactId>Towny</artifactId>
<scope>system</scope> <version>LATEST</version>
<systemPath>${basedir}/lib/Residence4.0.0.4.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${project.basedir}/lib/Towny.jar</systemPath>
<dependency> </dependency>
<groupId>com.projectkorra</groupId> <!-- WorldGuard -->
<artifactId>spirits</artifactId> <dependency>
<version>1.0.0 PRIVATE PREALPHA</version> <groupId>com.sk89q</groupId>
<scope>system</scope> <artifactId>worldguard</artifactId>
<systemPath>${basedir}/lib/ProjectKorraSpirits.jar</systemPath> <version>LATEST</version>
</dependency> <scope>system</scope>
<dependency> <systemPath>${project.basedir}/lib/worldguard-6.1.jar</systemPath>
<groupId>com.projectkorra</groupId> </dependency>
<artifactId>rpg</artifactId> </dependencies>
<version>1.0.2</version>
<scope>system</scope> <build>
<systemPath>${basedir}/lib/ProjectKorraRPG.jar</systemPath> <defaultGoal>clean package install</defaultGoal>
</dependency> <finalName>${project.name}-${project.version}</finalName>
<dependency> <sourceDirectory>${project.basedir}/src/</sourceDirectory>
<groupId>com.projectkorra</groupId> <resources>
<artifactId>items</artifactId> <resource>
<version>1.2.0</version> <targetPath>.</targetPath>
<scope>system</scope> <filtering>true</filtering>
<systemPath>${basedir}/lib/ProjectKorraItems.jar</systemPath> <directory>${project.basedir}/src/</directory>
</dependency> <includes>
<dependency> <include>*.yml</include>
<groupId>net.sacredlabyrinth.Phaed</groupId> </includes>
<artifactId>PreciousStones</artifactId> </resource>
<version>9.7.1-SNAPSHOT</version> </resources>
<scope>system</scope> <plugins>
<systemPath>${basedir}/lib/PreciousStones 9.7.1.jar</systemPath> <plugin>
</dependency> <groupId>org.apache.maven.plugins</groupId>
<dependency> <artifactId>maven-compiler-plugin</artifactId>
<groupId>com.massivecraft</groupId> <version>3.1</version>
<artifactId>factions</artifactId> <configuration>
<version>2.7.5</version> <source>1.7</source>
<scope>system</scope> <target>1.7</target>
<systemPath>${basedir}/lib/Factions 2.7.5.jar</systemPath> </configuration>
</dependency> </plugin>
</dependencies> </plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project> </project>

View file

@ -1,6 +1,6 @@
name: ProjectKorra name: ProjectKorra
author: ProjectKorra author: ProjectKorra
version: 1.8.1 version: ${project.version}
main: com.projectkorra.projectkorra.ProjectKorra main: com.projectkorra.projectkorra.ProjectKorra
softdepend: [PreciousStones, WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention, Towny, NoCheatPlus, LWC, Residence] softdepend: [PreciousStones, WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention, Towny, NoCheatPlus, LWC, Residence]
commands: commands: