Merge branch 'release/v5.2.0'

Author: Valandur

build.gradle

@@ -6,9 +6,6 @@ plugins {
 }
 
 group = "valandur.webapi"
-
-apply plugin: "java"
-
 version = "${project.version}-S${project.spongeVersion}"
 
 blossom {
@@ -19,8 +16,19 @@ blossom {
 spongestart {
     eula true
     minecraft project.minecraftVersion
-    spongeForgeVersion "1.12.2-2611-7.1.0-BETA-3002"
-    spongeVanillaVersion "1.12.2-7.1.0-BETA-33"
+    spongeForgeVersion "1.12.2-2705-7.1.0-BETA-3243"
+    spongeVanillaVersion "1.12.2-7.1.0-BETA-75"
+}
+
+configurations.all {
+    // Exclude because included by Sponge/Minecraft
+    exclude group: "org.apache.commons"
+    exclude group: "com.google.common"
+
+    resolutionStrategy {
+        force "com.google.guava:guava:23.0"
+        force "org.reflections:reflections:0.9.10"      // Fixes some logging issues in 0.9.11
+    }
 }
 
 repositories {
@@ -39,19 +47,9 @@ repositories {
     }
 }
 
-configurations.all {
-    // Exclude because included by Sponge/Minecraft
-    exclude group: "org.apache.commons"
-    exclude group: "com.google.common"
-
-    resolutionStrategy {
-        force "com.google.guava:guava:23.0"
-        force "org.reflections:reflections:0.9.10"      // Fixes some logging issues in 0.9.11
-        force "net.java.dev.jna:jna:4.5.1"
-    }
-}
-
 dependencies {
+    compile project(":webapi-lib")
+
     compile group: "co.aikar", name: "minecraft-timings", version: "1.0.4"
 
     compile group: "com.fasterxml.jackson.core", name: "jackson-core", version: project.jacksonVersion
@@ -66,6 +64,9 @@ dependencies {
     compile group: "org.eclipse.jetty", name: "jetty-server", version: project.jettyVersion
     compile group: "org.eclipse.jetty", name: "jetty-servlet", version: project.jettyVersion
     compile group: "org.eclipse.jetty", name: "jetty-rewrite", version: project.jettyVersion
+    compile group: "org.eclipse.jetty.websocket", name: "websocket-server", version: project.jettyVersion
+    compile group: "org.eclipse.jetty.websocket", name: "websocket-servlet", version: project.jettyVersion
+    compile group: "org.eclipse.jetty.websocket", name: "websocket-client", version: project.jettyVersion
 
     compile group: "io.swagger", name: "swagger-jersey2-jaxrs", version: "1.5.18"
     compile group: "io.sentry", name: "sentry", version: "1.6.4"
@@ -77,9 +78,14 @@ dependencies {
 
     compileOnly group: "org.spongepowered", name: "spongeapi", version: "${project.spongeVersion}.0-SNAPSHOT"
 
+    compile group: 'redis.clients', name: 'jedis', version: '2.9.0'
+    compile group: 'com.rabbitmq', name: 'amqp-client', version: '5.3.0'
+
     // Integrations
     compileOnly name: "ActiveTime-s7.1-v1.4.0"
     compileOnly name: "CmdScheduler-s7.1-v1.1.0"
+    compileOnly name: "GWMLibrary 1.3.2"
+    compileOnly name: "GWMCrates beta-3.1.2"
     compileOnly name: "HuskyCrates-v1.8.0PRE2-API7"
     compileOnly name: "MMCRestrict-1.4.2-API-7"
     compileOnly name: "MMCTickets-1.4.1-API-7"
@@ -106,7 +112,6 @@ shadowJar {
     relocate "com.google.thirdparty", "valandur.webapi.shadow.com.google.thirdparty"
 
     relocate "com.sun.research", "valandur.webapi.shadow.com.sun.research"
-    // relocate "com.sun.jna", "valandur.webapi.shadow.com.sun.jna"
 
     relocate "edu.umd.cs.findbugs.annotations", "valandur.webapi.shadow.edu.umd.cs.findbugs.annotations"
 

docs/API.md

@@ -38,7 +38,3 @@ of events that are sent to your server. Read the [WebHook documentation](WEBHOOK
 1. [Additional Data](DATA.md)  
 This documentation talks about additional data that is included with player, world and entity
 endpoints, as well as the implementation progress of further data which is not yet supported.
-
-1. [API](API.md)  
-This documentation talks about the Web-API API, which other plugins may use to create their 
-own endpoints and expose data easily.

docs/INDEX.md

@@ -1,4 +1,4 @@
-version=5.1.3
+version=5.2.0
 minecraftVersion=1.12.2
 spongeVersion=7.1
 jacksonVersion=2.9.4