Merge pull request #302 from weaviate/update-java-dependencies

Update Java dependencies to latest versions
weaviate · Sep 21, 2024 · 3cf1cf8 · 3cf1cf8
2 parents 33b755b + 7fde410
commit 3cf1cf8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,23 +59,23 @@
     <lombok.version>1.18.34</lombok.version>
     <gson.version>2.11.0</gson.version>
     <httpclient.version>4.5.14</httpclient.version>
-    <lang3.version>3.14.0</lang3.version>
-    <junit.version>5.10.3</junit.version>
-    <testcontainers.version>1.19.8</testcontainers.version>
+    <lang3.version>3.17.0</lang3.version>
+    <junit.version>5.11.0</junit.version>
+    <testcontainers.version>1.20.1</testcontainers.version>
     <assertj-core.version>3.26.3</assertj-core.version>
     <jparams.version>1.0.4</jparams.version>
-    <mockito.version>5.12.0</mockito.version>
-    <slf4j.version>2.0.13</slf4j.version>
-    <logback.version>1.5.6</logback.version>
+    <mockito.version>5.13.0</mockito.version>
+    <slf4j.version>2.0.16</slf4j.version>
+    <logback.version>1.5.8</logback.version>
     <mock-server.version>5.14.0</mock-server.version>
     <jackson.version>2.17.2</jackson.version>
-    <oauth2-oidc-sdk.version>11.13</oauth2-oidc-sdk.version>
+    <oauth2-oidc-sdk.version>11.19.1</oauth2-oidc-sdk.version>
     <mock-server.version>5.15.0</mock-server.version>
     <jackson.version>2.16.1</jackson.version>
     <protobuf.java.version>3.25.5</protobuf.java.version>
-    <grpc-netty-shaded.version>1.65.1</grpc-netty-shaded.version>
-    <grpc-protobuf.version>1.65.1</grpc-protobuf.version>
-    <grpc-stub.version>1.65.1</grpc-stub.version>
+    <grpc-netty-shaded.version>1.66.0</grpc-netty-shaded.version>
+    <grpc-protobuf.version>1.66.0</grpc-protobuf.version>
+    <grpc-stub.version>1.66.0</grpc-stub.version>
     <annotations-api.version>6.0.53</annotations-api.version>
   </properties>
 

diff --git a/src/test/java/io/weaviate/integration/client/WeaviateDockerComposeCluster.java b/src/test/java/io/weaviate/integration/client/WeaviateDockerComposeCluster.java
@@ -1,5 +1,6 @@
 package io.weaviate.integration.client;
 
+import java.time.Duration;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
@@ -26,17 +27,15 @@ public Weaviate(String dockerImageName, String hostname, Boolean isJoining) {
       withEnv("DISABLE_TELEMETRY", "true");
       withEnv("PERSISTENCE_FLUSH_IDLE_MEMTABLES_AFTER", "1");
 
-      withEnv("CLUSTER_HOSTNAME", hostname);
       withEnv("CLUSTER_GOSSIP_BIND_PORT", "7110");
       withEnv("CLUSTER_DATA_BIND_PORT", "7111");
       withEnv("RAFT_PORT", "8300");
-      withEnv("RAFT_INTERNAL_RPC_PORT", "8301");
 
-      withEnv("RAFT_BOOTSTRAP_EXPECT", "2");
-      withEnv("RAFT_JOIN", "weaviate-0:8300,weaviate-1:8300");
+      withEnv("RAFT_BOOTSTRAP_EXPECT", "1");
+      withEnv("RAFT_JOIN", "weaviate-0");
       if (isJoining) {
         withEnv("CLUSTER_JOIN", "weaviate-0:7110");
-        waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080).forStatusCode(200));
+        waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080).forStatusCode(200).withStartupTimeout(Duration.ofSeconds(10)));
       }
     }
   }

diff --git a/src/test/java/io/weaviate/integration/client/WeaviateVersion.java b/src/test/java/io/weaviate/integration/client/WeaviateVersion.java
@@ -3,12 +3,12 @@
 public class WeaviateVersion {
 
   // docker image version
-  public static final String WEAVIATE_IMAGE = "1.26.1";
+  public static final String WEAVIATE_IMAGE = "1.26.4";
 
   // to be set according to weaviate docker image
-  public static final String EXPECTED_WEAVIATE_VERSION = "1.26.1";
+  public static final String EXPECTED_WEAVIATE_VERSION = "1.26.4";
   // to be set according to weaviate docker image
-  public static final String EXPECTED_WEAVIATE_GIT_HASH = "6fd2432";
+  public static final String EXPECTED_WEAVIATE_GIT_HASH = "584532a";
 
   private WeaviateVersion() {}
 }