Merge pull request DockerizedCraft#13 from ZeProf2Code/master

Refreshing dependencies + changing SERVER_TYPE to TYPE

Author: Arnaud Lier

docker-compose.yml

@@ -23,7 +23,7 @@ services:
     image: itzg/minecraft-server
     environment:
       - VERSION=1.12.2
-      - SERVER_TYPE=spigot
+      - TYPE=spigot
       - SERVER_PORT=25565
       - SERVER_NAME=eu-lobby-1
       - SERVER_GROUP=eu-lobby
@@ -37,7 +37,7 @@ services:
     image: itzg/minecraft-server
     environment:
       - VERSION=1.12.2
-      - SERVER_TYPE=spigot
+      - TYPE=spigot
       - SERVER_PORT=25565
       - SERVER_NAME=eu-lobby-2
       - SERVER_GROUP=eu-lobby
@@ -51,7 +51,7 @@ services:
     image: itzg/minecraft-server
     environment:
     - VERSION=1.12.2
-    - SERVER_TYPE=spigot
+    - TYPE=spigot
     - SERVER_PORT=25565
     - SERVER_NAME=us-lobby-1
     - SERVER_GROUP=us-lobby

pom.xml

@@ -64,58 +64,58 @@
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </repository>
         <repository>
-            <id>bstats-repo</id>
-            <url>http://repo.bstats.org/content/repositories/releases/</url>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.12-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.12-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <version>4.1.1</version>
+            <version>4.8.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java</artifactId>
-            <version>3.1.0-rc-2</version>
+            <version>3.2.0-rc-5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
+            <version>2.0.0-alpha1</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.9.0</version>
+            <version>3.2.0</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>
-            <version>1.2</version>
+            <version>1.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

src/main/java/de/craftmania/dockerizedcraft/DockerizedCraft.java

@@ -32,7 +32,7 @@ public class DockerizedCraft extends Plugin {
     @Override
     public void onEnable() {
         // bStats
-        Metrics metrics = new Metrics(this);
+        //Metrics metrics = new Metrics(this);
 
         try {
             this.loadConfiguration();

src/main/resources/plugin-notifier.yml

@@ -21,10 +21,10 @@ refresh-interval: 30
 #   - default (string):              If the environment variable is not defined will fall
 #                                    back to the given default
 meta-data-mapper:
-  # make the SERVER_TYPE also accessible
+  # make the TYPE also accessible
   type:
     required: true
-    environment-variable: SERVER_TYPE
+    environment-variable: TYPE
 
   # Category for i.e create server selector menus based on categories
   category:

src/main/resources/server-updater.yml

@@ -37,9 +37,9 @@ remove-actions:
 # Type: Section
 environment-variables:
   # The events listener will only add server with the defined environment variable
-  # ie. docker run -e SERVER_TYPE=minecraft_spigot my_server
+  # ie. docker run -e TYPE=minecraft_spigot my_server
   # Type: String
-  identifier: SERVER_TYPE
+  identifier: TYPE
 
   # Be default the first exposed port is taken if the container exposes multiple ports you can
   # set it by setting the PORT environment variable in the container