Merge pull request #106 from CloudNetService/development

Merge for update to 2.1.15
CloudNetService · May 21, 2019 · 092deed · 092deed
2 parents 855e33d + a76db9e
commit 092deed
Show file tree

Hide file tree

Showing 56 changed files with 1,114 additions and 730 deletions.
diff --git a/.template/CloudNet-Master/start.sh b/.template/CloudNet-Master/start.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-screen -S CloudNet java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:CompileThreshold=100 -XX:MaxPermSize=256M -Xmx128m -jar CloudNet-Master.jar
+screen -RS CloudNet java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:CompileThreshold=100 -XX:MaxPermSize=256M -Xmx128m -jar CloudNet-Master.jar
diff --git a/.template/CloudNet-Wrapper/start.sh b/.template/CloudNet-Wrapper/start.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-screen -S Wrapper-1 java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:CompileThreshold=100 -XX:MaxPermSize=256M -Xmx64m -jar CloudNet-Wrapper.jar
+screen -RS Wrapper-1 java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:CompileThreshold=100 -XX:MaxPermSize=256M -Xmx64m -jar CloudNet-Wrapper.jar
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
     }
     stage('Version') {
       steps {
-        sh 'mvn versions:set -DnewVersion=2.1.14.3'
+        sh 'mvn versions:set -DnewVersion=2.1.15'
       }
     }
     stage('Compile') {

diff --git a/README.md b/README.md
@@ -35,9 +35,9 @@ Use of KVM virtualization or dedicated servers is recommended.
 
  ### Support
 
-  * Spigot-Support » 1.7.10 - 1.13.2
+  * Spigot-Support » 1.7.10 - 1.14
     * PaperSpigot, TacoSpigot, Hose, Torch
-  * BungeeCord-Support » 1.7.10 - 1.13.2
+  * BungeeCord-Support » 1.7.10 - 1.14
     * Flexpipe, HexaCord, Waterfall, TraverTine
 
 ### Discord
@@ -61,14 +61,14 @@ Maven:
         <dependency>
             <groupId>de.dytanic.cloudnet</groupId>
             <artifactId>cloudnet-api-bridge</artifactId>
-            <version>2.1.14</version>
+            <version>2.1.15</version>
             <scope>provided</scope>
         </dependency>
          <!-- CloudNet Core -->
         <dependency>
             <groupId>de.dytanic.cloudnet</groupId>
             <artifactId>cloudnet-core</artifactId>
-            <version>2.1.14</version>
+            <version>2.1.15</version>
             <scope>provided</scope>
         </dependency>
      </dependencies>

diff --git a/cloudnet-api/cloudnet-api-bridge/pom.xml b/cloudnet-api/cloudnet-api-bridge/pom.xml
@@ -15,8 +15,8 @@
 
     <repositories>
         <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
         </repository>
     </repositories>
 
@@ -28,10 +28,28 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.milkbowl.vault</groupId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.11.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.11.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.MilkBowl</groupId>
             <artifactId>VaultAPI</artifactId>
             <version>${dependency.vaultapi.version}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>