Merge remote-tracking branch 'upstream/develop' into velocity-fixes

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: RedisBungee Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ develop ]
 
 jobs:
   build:
@@ -19,7 +19,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
@@ -27,6 +27,7 @@ jobs:
       uses: actions/upload-artifact@v2.2.3
       with:
      # Artifact name
-       name: Redis_JAR
+       name: RedisBungee-Bungee
      # Destination path
-       path: target/RedisBungee*
+       path: RedisBungee-Bungee/target/*
+

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java

@@ -7,7 +7,6 @@ import com.google.common.collect.Multimap;
 import com.imaginarycode.minecraft.redisbungee.internal.RedisBungeePlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
 
 import java.net.InetAddress;
 import java.util.*;

RedisBungee-Bungee/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: RedisBungee
 main: com.imaginarycode.minecraft.redisbungee.RedisBungeeBungeePlugin
-version: ${project.version}
+version: ${project.parent.version}-${git.commit.id.abbrev}
 author: Chunkr and Govindas limework
 authors:
   - chunkr

RedisBungee-Velocity/pom.xml

@@ -30,6 +30,19 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-plugin-info</id>
+                        <goals>
+                            <goal>filter-sources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

RedisBungee-Velocity/src/main/java-templates/com/imaginarycode/minecraft/redisbungee/PomData.java

@@ -0,0 +1,5 @@
+package com.imaginarycode.minecraft.redisbungee;
+
+public class PomData {
+    public final static String VERSION = "${project.parent.version}-${git.commit.id.abbrev}";
+}

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java

@@ -11,8 +11,6 @@ import java.util.Map;
 import java.util.Optional;
 
 public class RBUtils {
-
-    public static final String VERSION = "0.8.x-idk-how";
     private static final Gson gson = new Gson();
 
     protected static void createPlayer(Player player, Pipeline pipeline, boolean fireEvent) {

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java

@@ -54,7 +54,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Plugin(id = "redisbungee", name = "RedisBungee", version = RBUtils.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = "ProxioDev")
+@Plugin(id = "redisbungee", name = "RedisBungee", version = PomData.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = "ProxioDev")
 public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player> {
     private final ProxyServer server;
     private final Logger logger;

pom.xml

@@ -18,6 +18,22 @@
                     <target>8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.9.10</version>
+                <configuration>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <modules>