CavePVP-Stuff/cSpigot-master/spigot-server-Patches/0001-POM-changes.patch

From ce19b4078948ff898e77862beeab27cf811a5ac3 Mon Sep 17 00:00:00 2001
From: Poweruser <poweruser.rs@hotmail.com>
Date: Fri, 20 May 2016 01:42:34 +0200
Subject: [PATCH] POM changes


diff --git a/pom.xml b/pom.xml
index 0d00e79e9..703d3c852 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,16 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.spigotmc</groupId>
-  <artifactId>spigot</artifactId>
+  <groupId>net.frozenorb</groupId>
+  <artifactId>sourspigot-server</artifactId>
   <packaging>jar</packaging>
   <version>1.7.10-R0.1-SNAPSHOT</version>
-  <name>Spigot</name>
-  <url>http://www.spigotmc.org</url>
+  <name>mSpigot</name>
+  <url>https://frozenorb.net</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <api.version>unknown</api.version>
+    <api.version>${project.name}-${project.version}</api.version>
     <junit.version>4.11</junit.version>
     <minecraft.version>1.7.10</minecraft.version>
     <minecraft_version>1_7_R4</minecraft_version>
@@ -19,8 +19,8 @@
   </properties>
 
   <parent>
-    <groupId>org.spigotmc</groupId>
-    <artifactId>spigot-parent</artifactId>
+    <groupId>net.frozenorb</groupId>
+    <artifactId>sourspigot-parent</artifactId>
     <version>dev-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -41,16 +41,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
+      <groupId>net.frozenorb</groupId>
+      <artifactId>sourspigot-api</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.spigotmc</groupId>
+      <groupId>org.bukkit</groupId>
       <artifactId>minecraft-server</artifactId>
-      <version>${minecraft.version}-SNAPSHOT</version>
+      <version>${minecraft.version}</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -95,6 +95,11 @@
       <artifactId>gson</artifactId>
       <version>2.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.16.10</version>
+    </dependency>
     <!-- testing -->
     <dependency>
       <groupId>junit</groupId>
@@ -108,6 +113,11 @@
       <version>1.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-all</artifactId>
+      <version>4.0.28.Final</version>
+    </dependency>
   </dependencies>
 
   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
@@ -115,18 +125,20 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>com.lukegb.mojo</groupId>
-        <artifactId>gitdescribe-maven-plugin</artifactId>
-        <version>1.3</version>
-        <configuration>
-          <outputPrefix>git-Spigot-</outputPrefix>
-          <outputPostfix></outputPostfix>
-        </configuration>
+        <groupId>net.md-5</groupId>
+        <artifactId>scriptus</artifactId>
+        <version>0.2</version>
         <executions>
           <execution>
-            <phase>compile</phase>
+            <id>ex-mspigot</id>
+            <configuration>
+              <format>git-mSpigot-%s</format>
+              <scmDirectory>../</scmDirectory>
+              <descriptionProperty>mspigot.desc</descriptionProperty>
+            </configuration>
+            <phase>initialize</phase>
             <goals>
-              <goal>gitdescribe</goal>
+              <goal>describe</goal>
             </goals>
           </execution>
         </executions>
@@ -140,7 +152,7 @@
             <manifestEntries>
               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
               <Implementation-Title>CraftBukkit</Implementation-Title>
-              <Implementation-Version>${describe}</Implementation-Version>
+              <Implementation-Version>${mspigot.desc}</Implementation-Version>
               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
               <Specification-Title>Bukkit</Specification-Title>
               <Specification-Version>${api.version}</Specification-Version>
@@ -207,6 +219,10 @@
                   <pattern>com.google.gson</pattern>
                   <shadedPattern>org.bukkit.craftbukkit.libs.com.google.gson</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>io.netty</pattern>
+                  <shadedPattern>net.minecraft.util.io.netty</shadedPattern>
+                </relocation>
                 <!-- These contain native libraries, and cannot be properly relocated
                 <relocation>
                   <pattern>org.fusesource</pattern>
@@ -233,6 +249,14 @@
                     <shadedPattern>net.minecraft.server.v${minecraft_version}</shadedPattern>
                 </relocation>
               </relocations>
+              <filters>
+                <filter>
+                  <artifact>org.bukkit:minecraft-server</artifact>
+                  <excludes>
+                    <exclude>net/minecraft/util/io/netty/**</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>
@@ -242,8 +266,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -334,5 +358,17 @@
       </plugins>
     </pluginManagement>
   </build>
+
+  <distributionManagement>
+    <repository>
+      <id>minehq-repo</id>
+      <url>http://maven.minehq.com:8081/artifactory/minehq-medium</url>
+    </repository>
+    <snapshotRepository>
+      <id>minehq-repo</id>
+      <url>http://maven.minehq.com:8081/artifactory/minehq-medium</url>
+    </snapshotRepository>
+  </distributionManagement>
+
 </project>
 
-- 
2.13.3