Merge branch 'main' into v1.10

mindolph · Nov 6, 2024 · d02ea49 · d02ea49
2 parents 14470d9 + 8ca5190
commit d02ea49
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/code/mindolph-base/pom.xml b/code/mindolph-base/pom.xml
@@ -50,6 +50,16 @@
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-dashscope</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dashscope-sdk-java</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-ollama</artifactId>

diff --git a/code/pom.xml b/code/pom.xml
@@ -49,6 +49,7 @@
         <json.version>20240303</json.version>
         <flexmark.version>0.64.8</flexmark.version>
         <langchain4j.version>0.34.0</langchain4j.version>
+        <dashscope.version>2.16.9</dashscope.version>
     </properties>
 
     <dependencies>
@@ -71,6 +72,17 @@
                 <artifactId>langchain4j-dashscope</artifactId>
                 <version>${langchain4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dashscope-sdk-java</artifactId>
+                <version>${dashscope.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-simple</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>dev.langchain4j</groupId>
                 <artifactId>langchain4j-ollama</artifactId>
@@ -235,6 +247,12 @@
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-simple</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>