From c4317dbfe491f1fed508b4d9cdd071d93c2b95e3 Mon Sep 17 00:00:00 2001
From: yhmo <yihua.mo@zilliz.com>
Date: Tue, 26 Nov 2024 17:40:18 +0800
Subject: [PATCH] Prepare for 2.5.0

Signed-off-by: yhmo <yihua.mo@zilliz.com>
---
 CHANGELOG.md                                  | 24 +++++++++++++++++++
 README.md                                     |  9 +++----
 docker-compose.yml                            |  4 ++--
 examples/pom.xml                              |  2 +-
 pom.xml                                       |  2 +-
 .../milvus/client/MilvusClientDockerTest.java |  2 +-
 .../v2/client/MilvusClientV2DockerTest.java   |  2 +-
 7 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c4b912d1..de7f01bc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,28 @@
 # Changelog
+
+## milvus-sdk-java 2.5.0 (2024-11-26)
+### Feature
+- BulkWriter supports JSON/CSV format
+- Add new RBAC interfaces grantPrivilegeV2/revokePrivilegeV2
+- Support doc-in-doc-out function(embedded BM25 in server-side)
+- Support varchar analyzer (tokenizer in server-side)
+- Support nullable and default value
+- Support expression template
+
+### Improvement
+- QueryIterator/SearchIterator supports mvcc
+- ClientPool throws exception if fail to create/get clients
+
+## milvus-sdk-java 2.4.8 (2024-10-31)
+
+### Improvement
+- Fix a conflict bug with Gson v2.11.0
+- Support group by for hybrid search
+
+### Bug
+- Fix a dimension check error for binary vector
+- Fix a null pointer bug for query iterator
+
 ## milvus-sdk-java 2.4.7 (2024-10-25)
 
 ### Improvement
diff --git a/README.md b/README.md
index 2c8d002e1..5589565ab 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ The following table shows compatibilities between Milvus and Java SDK.
 | 2.2.0 ~ 2.2.8  |  2.2.0 ~ 2.2.5   |
 |    >= 2.2.9    |  2.2.7 ~ 2.2.15  |
 |     2.3.x      |      2.3.11      |
-|     2.4.x      |      2.4.7       |
+|     2.4.x      |      2.4.8       |
+|     2.5.x      |      2.5.0       |
 
 ### Install Java SDK
 
@@ -32,20 +33,20 @@ You can use **Apache Maven** or **Gradle** add Milvus SDK to your project.
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>2.4.7</version>
+            <version>2.5.0</version>
         </dependency>
        ```
 
    - Gradle/Groovy
 
         ```groovy
-        implementation 'io.milvus:milvus-sdk-java:2.4.7'
+        implementation 'io.milvus:milvus-sdk-java:2.5.0'
         ```
 
    - Gradle/Kotlin
 
         ```kotlin
-        implementation("io.milvus:milvus-sdk-java:2.4.7")
+        implementation("io.milvus:milvus-sdk-java:2.5.0")
         ```
         
 ### Examples
diff --git a/docker-compose.yml b/docker-compose.yml
index dd1e2111e..633c1f76f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
 
   standalone:
     container_name: milvus-javasdk-test-standalone
-    image: milvusdb/milvus:v2.4.15
+    image: milvusdb/milvus:v2.5.0-beta
     command: ["milvus", "run", "standalone"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -77,7 +77,7 @@ services:
 
   standaloneslave:
     container_name: milvus-javasdk-test-slave-standalone
-    image: milvusdb/milvus:v2.4.15
+    image: milvusdb/milvus:v2.5.0-beta
     command: ["milvus", "run", "standalone"]
     environment:
       ETCD_ENDPOINTS: etcdslave:2379
diff --git a/examples/pom.xml b/examples/pom.xml
index 59769597b..5ed11b825 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java-examples</artifactId>
-    <version>2.4.7</version>
+    <version>2.5.0</version>
 
     <build>
         <plugins>
diff --git a/pom.xml b/pom.xml
index f8529730b..a4c2e2ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java</artifactId>
-    <version>2.4.7</version>
+    <version>2.5.0</version>
     <packaging>jar</packaging>
 
     <name>io.milvus:milvus-sdk-java</name>
diff --git a/src/test/java/io/milvus/client/MilvusClientDockerTest.java b/src/test/java/io/milvus/client/MilvusClientDockerTest.java
index 33ed138bf..2bdc54a82 100644
--- a/src/test/java/io/milvus/client/MilvusClientDockerTest.java
+++ b/src/test/java/io/milvus/client/MilvusClientDockerTest.java
@@ -83,7 +83,7 @@ class MilvusClientDockerTest {
     private static final TestUtils utils = new TestUtils(DIMENSION);
 
     @Container
-    private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:master-20241121-b983ef9f-amd64");
+    private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.5.0-beta");
 
     @BeforeAll
     public static void setUp() {
diff --git a/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java b/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java
index d6b19a62c..fb1696e79 100644
--- a/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java
+++ b/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java
@@ -72,7 +72,7 @@ class MilvusClientV2DockerTest {
     private static final TestUtils utils = new TestUtils(DIMENSION);
 
     @Container
-    private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:master-20241121-b983ef9f-amd64");
+    private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.5.0-beta");
 
     @BeforeAll
     public static void setUp() {