diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 80835f3..32d6f39 100644
--- a/.github/workflows/maven.yml
+++ b/.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/*
+
diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java
index c5f6026..4ca064e 100644
--- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java
+++ b/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.*;
diff --git a/RedisBungee-Bungee/src/main/resources/plugin.yml b/RedisBungee-Bungee/src/main/resources/plugin.yml
index 6afe83f..8da7688 100644
--- a/RedisBungee-Bungee/src/main/resources/plugin.yml
+++ b/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
diff --git a/RedisBungee-Velocity/pom.xml b/RedisBungee-Velocity/pom.xml
index 080ddc3..b96873f 100644
--- a/RedisBungee-Velocity/pom.xml
+++ b/RedisBungee-Velocity/pom.xml
@@ -30,6 +30,19 @@
+
+ org.codehaus.mojo
+ templating-maven-plugin
+ 1.0.0
+
+
+ add-plugin-info
+
+ filter-sources
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
diff --git a/RedisBungee-Velocity/src/main/java-templates/com/imaginarycode/minecraft/redisbungee/PomData.java b/RedisBungee-Velocity/src/main/java-templates/com/imaginarycode/minecraft/redisbungee/PomData.java
new file mode 100644
index 0000000..b4c6c31
--- /dev/null
+++ b/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}";
+}
diff --git a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java
index e84999e..3e315ff 100644
--- a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java
+++ b/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) {
diff --git a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java
index c5a0b09..37a5e76 100644
--- a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java
+++ b/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 {
private final ProxyServer server;
private final Logger logger;
diff --git a/pom.xml b/pom.xml
index d89d5b3..7c6a4cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,22 @@
8
+
+ pl.project13.maven
+ git-commit-id-plugin
+ 4.9.10
+
+ false
+
+
+
+ get-the-git-infos
+
+ revision
+
+
+
+