Skip to content

Commit 8dc339a

Browse files
authored
bugfix: Modify elasticsearch-java version to be consistent with Spring AI (#415)
* bugfix: When I started the rag-elasticsearch-example project, there was a version incompatibility issue * bugfix: When I started the rag-elasticsearch-example project, there was a version incompatibility issue
1 parent 58dbd7f commit 8dc339a

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

spring-ai-alibaba-chat-memory-example/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@
8989
<groupId>org.springframework.ai</groupId>
9090
<artifactId>spring-ai-advisors-vector-store</artifactId>
9191
</dependency>
92-
93-
<dependency>
94-
<groupId>co.elastic.clients</groupId>
95-
<artifactId>elasticsearch-java</artifactId>
96-
<version>8.15.5</version>
97-
</dependency>
9892

9993
</dependencies>
10094

spring-ai-alibaba-rag-example/module-rag/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>co.elastic.clients</groupId>
6464
<artifactId>elasticsearch-java</artifactId>
65-
<version>8.13.4</version>
65+
<version>8.18.1</version>
6666
<exclusions>
6767
<exclusion>
6868
<artifactId>elasticsearch-rest-client</artifactId>
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<artifactId>elasticsearch-rest-client</artifactId>
7575
<groupId>org.elasticsearch.client</groupId>
76-
<version>8.13.4</version>
76+
<version>8.18.1</version>
7777
</dependency>
7878

7979
<dependency>

spring-ai-alibaba-rag-example/module-rag/src/main/java/com/alibaba/cloud/ai/example/rag/init/VectorDBInit.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import co.elastic.clients.elasticsearch.ElasticsearchClient;
2626
import co.elastic.clients.elasticsearch._types.mapping.DenseVectorProperty;
27+
import co.elastic.clients.elasticsearch._types.mapping.DenseVectorSimilarity;
2728
import co.elastic.clients.elasticsearch._types.mapping.KeywordProperty;
2829
import co.elastic.clients.elasticsearch._types.mapping.ObjectProperty;
2930
import co.elastic.clients.elasticsearch._types.mapping.Property;
@@ -125,7 +126,7 @@ private void createIndexIfNotExists() {
125126
// Maybe using json directly?
126127
Map<String, Property> properties = new HashMap<>();
127128
properties.put(vectorField, Property.of(property -> property.denseVector(
128-
DenseVectorProperty.of(dense -> dense.index(true).dims(dimsLength).similarity(similarityAlgo)))));
129+
DenseVectorProperty.of(dense -> dense.index(true).dims(dimsLength).similarity(DenseVectorSimilarity.valueOf(similarityAlgo))))));
129130
properties.put(textField, Property.of(property -> property.text(TextProperty.of(t -> t))));
130131

131132
Map<String, Property> metadata = new HashMap<>();

spring-ai-alibaba-rag-example/rag-elasticsearch-autoconfigure-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>co.elastic.clients</groupId>
6262
<artifactId>elasticsearch-java</artifactId>
63-
<version>8.13.3</version>
63+
<version>8.18.1</version>
6464
</dependency>
6565
</dependencies>
6666
</dependencyManagement>

spring-ai-alibaba-rag-example/rag-elasticsearch-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>co.elastic.clients</groupId>
7474
<artifactId>elasticsearch-java</artifactId>
75-
<version>8.13.3</version>
75+
<version>8.18.1</version>
7676
</dependency>
7777
</dependencies>
7878
</dependencyManagement>

spring-ai-alibaba-rag-example/rag-elasticsearch-example/src/main/java/com/alibaba/cloud/ai/example/rag/local/LocalRagService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private void createIndexIfNotExists() {
147147
// Maybe using json directly?
148148
Map<String, Property> properties = new HashMap<>();
149149
properties.put(vectorField, Property.of(property -> property.denseVector(
150-
DenseVectorProperty.of(dense -> dense.index(true).dims(dimsLength).similarity(similarityAlgo)))));
150+
DenseVectorProperty.of(dense -> dense.index(true).dims(dimsLength).similarity(DenseVectorSimilarity.valueOf(similarityAlgo))))));
151151
properties.put(textField, Property.of(property -> property.text(TextProperty.of(t -> t))));
152152

153153
Map<String, Property> metadata = new HashMap<>();

0 commit comments

Comments
 (0)