Cleanup dependencies (#100)

* Get rid of dependency on scalecube-commons, scalecube-config-vault * Bump testcontainers -> 1.20.1
scalecube · Sep 28, 2024 · eb9218a · eb9218a
1 parent d4d7ba8
commit eb9218a
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 462 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,37 +39,28 @@
   </modules>
 
   <properties>
-    <scalecube-config.version>0.4.20</scalecube-config.version>
-    <scalecube-commons.version>1.0.24</scalecube-commons.version>
-
     <reactor.version>2020.0.32</reactor.version>
+    <vault-java-driver.version>5.1.0</vault-java-driver.version>
     <jackson.version>2.15.1</jackson.version>
     <slf4j.version>2.0.7</slf4j.version>
     <jjwt.version>0.11.2</jjwt.version>
 
     <mockito-junit.version>4.6.1</mockito-junit.version>
     <junit-jupiter.version>5.8.2</junit-jupiter.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <vault-java-driver.version>5.1.0</vault-java-driver.version>
-    <testcontainers.version>1.17.4</testcontainers.version>
+    <testcontainers.version>1.20.1</testcontainers.version>
 
     <distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-security
     </distributionManagement.url>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-      <!-- Scalecube Config -->
-      <dependency>
-        <groupId>io.scalecube</groupId>
-        <artifactId>scalecube-config-vault</artifactId>
-        <version>${scalecube-config.version}</version>
-      </dependency>
-      <!-- Scalecube Commons -->
+      <!-- Vault -->
       <dependency>
-        <groupId>io.scalecube</groupId>
-        <artifactId>scalecube-commons</artifactId>
-        <version>${scalecube-commons.version}</version>
+        <groupId>com.bettercloud</groupId>
+        <artifactId>vault-java-driver</artifactId>
+        <version>${vault-java-driver.version}</version>
       </dependency>
       <!-- Reactor -->
       <dependency>

diff --git a/vault/pom.xml b/vault/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -12,16 +14,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-config-vault</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-commons</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
+      <groupId>com.bettercloud</groupId>
+      <artifactId>vault-java-driver</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/vault/src/main/java/io/scalecube/security/vault/VaultClientTokenSupplier.java b/vault/src/main/java/io/scalecube/security/vault/VaultClientTokenSupplier.java