Jelajahi Sumber

Prepare for v2.3.6 (#865)

Signed-off-by: yhmo <yihua.mo@zilliz.com>
groot 1 tahun lalu
induk
melakukan
a41ebe4626

+ 10 - 0
CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## milvus-sdk-java 2.3.6 (TBD)
+
+### Feature
+
+- Support SearchIterator/QueryIterator
+
+### Improvement
+
+- Upgrade dependencies to fix some CVEs
+
 ## milvus-sdk-java 2.3.5 (2024-03-29)
 
 ### Feature

+ 4 - 4
README.md

@@ -19,7 +19,7 @@ The following table shows compatibilities between Milvus and Java SDK.
 |     2.1      |   2.1.0-beta4    |
 |     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.5       |
+|     2.3.x      |      2.3.6       |
 
 ### Install Java SDK
 
@@ -31,20 +31,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.3.5</version>
+            <version>2.3.6</version>
         </dependency>
        ```
 
    - Gradle/Groovy
 
         ```groovy
-        implementation 'io.milvus:milvus-sdk-java:2.3.5'
+        implementation 'io.milvus:milvus-sdk-java:2.3.6'
         ```
 
    - Gradle/Kotlin
 
         ```kotlin
-        implementation("io.milvus:milvus-sdk-java:2.3.5")
+        implementation("io.milvus:milvus-sdk-java:2.3.6")
         ```
         
 ### Examples

+ 2 - 2
docker-compose.yml

@@ -32,7 +32,7 @@ services:
 
   standalone:
     container_name: milvus-javasdk-test-standalone
-    image: milvusdb/milvus:v2.3.10
+    image: milvusdb/milvus:v2.3.13
     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.3.10
+    image: milvusdb/milvus:v2.3.13
     command: ["milvus", "run", "standalone"]
     environment:
       ETCD_ENDPOINTS: etcdslave:2379

+ 0 - 1
examples/main/java/io/milvus/BulkWriterExample.java

@@ -165,7 +165,6 @@ public class BulkWriterExample {
                 .withHost(HOST)
                 .withPort(PORT)
                 .withAuthorization(USER_NAME, MilvusConsts.PASSWORD)
-                .withSecure(true)
                 .build();
         milvusClient = new MilvusServiceClient(connectParam);
         System.out.println("\nConnected");

+ 0 - 2
examples/main/java/io/milvus/IteratorExample.java

@@ -54,8 +54,6 @@ public class IteratorExample {
         ConnectParam connectParam = ConnectParam.newBuilder()
                 .withHost("localhost")
                 .withPort(19530)
-                .withSecure(true)
-                .withAuthorization("root","Milvus")
                 .build();
         RetryParam retryParam = RetryParam.newBuilder()
                 .withMaxRetryTimes(3)

+ 2 - 2
examples/pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java-examples</artifactId>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
 
     <build>
         <plugins>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>2.3.5</version>
+            <version>2.3.6</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

+ 1 - 1
pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java</artifactId>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
     <packaging>jar</packaging>
 
     <name>io.milvus:milvus-sdk-java</name>

+ 9 - 3
src/main/java/io/milvus/param/ConnectParam.java

@@ -226,10 +226,12 @@ public class ConnectParam {
         /**
          * Enables the secure for client channel.
          *
+         * Deprecated from v2.3.6, this flag is auto-detected, no need to specify
+         *
          * @param enable true keep-alive
          * @return <code>Builder</code>
          */
-        @java.lang.Deprecated
+        @Deprecated
         public Builder secure(boolean enable) {
             secure = enable;
             return this;
@@ -275,17 +277,21 @@ public class ConnectParam {
 
         /**
          * Sets secure the authorization for this connection, set to True to enable TLS
+         *
+         * Deprecated from v2.3.6, this flag is auto-detected, no need to specify
+         *
          * @param secure boolean
          * @return <code>Builder</code>
          */
+        @Deprecated
         public Builder withSecure(boolean secure) {
             this.secure = secure;
             return this;
         }
 
         /**
-         * Sets the secure for this connection
-         * @param authorization the authorization info that has included the encoded username and password info
+         * Sets the authorization for this connection
+         * @param authorization the encoded authorization info that has included the encoded username and password info
          * @return <code>Builder</code>
          */
         public Builder withAuthorization(@NonNull String authorization) {

+ 1 - 1
src/test/java/io/milvus/client/MilvusClientDockerTest.java

@@ -69,7 +69,7 @@ class MilvusClientDockerTest {
     private static final int dimension = 128;
 
     @Container
-    private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.3.12");
+    private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.3.13");
 
     @BeforeAll
     public static void setUp() {