From dddb8af4db0b33bb33f1ece1920fcd8de9e1751b Mon Sep 17 00:00:00 2001 From: Jonathan Narvaez <89610430+jonakls@users.noreply.github.com> Date: Sun, 31 Dec 2023 20:32:19 -0500 Subject: [PATCH 1/4] build(relocate): relocate dependencies correctly --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8b633a6..569bf9a 100644 --- a/pom.xml +++ b/pom.xml @@ -90,8 +90,10 @@ - com.zaxxer.HikariCP + com.zaxxer.hikari pk.ajneb97.libs.hikaricp + org.slf4j + pk.ajneb97.libs.slf4j @@ -100,4 +102,4 @@ - \ No newline at end of file + From 17e0069609949f5be4953682f08a136eeddebb3b Mon Sep 17 00:00:00 2001 From: jonakls Date: Sun, 31 Dec 2023 20:45:32 -0500 Subject: [PATCH 2/4] build(relocate): test relocate and apply changes --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 569bf9a..c364fef 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ com.zaxxer HikariCP 4.0.3 + compile @@ -92,8 +93,16 @@ com.zaxxer.hikari pk.ajneb97.libs.hikaricp + + com.zaxxer.hikari.** + + + org.slf4j pk.ajneb97.libs.slf4j + + org.slf4j.** + From 5fc63d1f3c4603977a67f6853a074fbaa79bca1a Mon Sep 17 00:00:00 2001 From: jonakls Date: Sun, 31 Dec 2023 20:46:37 -0500 Subject: [PATCH 3/4] chore(version): bump up version to `1.8.4` --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 9299432..58db4a5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: pk.ajneb97.PlayerKits2 -version: 1.8.3 +version: 1.8.4 name: PlayerKits2 api-version: 1.13 softdepend: [Vault,PlaceholderAPI] From 209c759f6292855eb73ecdcf26959e1ef150a5a3 Mon Sep 17 00:00:00 2001 From: jonakls Date: Mon, 1 Jan 2024 12:28:35 -0500 Subject: [PATCH 4/4] build(relocate): remove `slf4j` dependency relocation --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index c364fef..e565b81 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,6 @@ com.zaxxer.hikari.** - - org.slf4j - pk.ajneb97.libs.slf4j - - org.slf4j.** - -