diff --git a/jts/pom.xml b/jts/pom.xml index 9080121fedf3..0b723a916539 100644 --- a/jts/pom.xml +++ b/jts/pom.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - jst + jts 1.0-SNAPSHOT jar diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index 9005c831e84d..e28459447958 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -120,7 +120,7 @@ spring-data-rest-querydsl spring-data-solr spring-data-shardingsphere - + spring-data-vector spring-hibernate-3 spring-hibernate-5 spring-hibernate-6 diff --git a/persistence-modules/spring-data-vector/pom.xml b/persistence-modules/spring-data-vector/pom.xml index 18ab7cddeb27..2867b95a6c40 100644 --- a/persistence-modules/spring-data-vector/pom.xml +++ b/persistence-modules/spring-data-vector/pom.xml @@ -3,96 +3,76 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.baeldung spring-data-vector 0.0.1-SNAPSHOT jar - org.springframework.boot - spring-boot-starter-parent - 4.0.0-M2 - + com.baeldung + parent-boot-4 + 0.0.1-SNAPSHOT + ../../parent-boot-4 - org.hibernate.orm hibernate-vector ${hibernate.version} - org.springframework.boot spring-boot-starter - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-data-mongodb - org.testcontainers mongodb - 1.21.3 + ${mongodb.version} test - org.testcontainers postgresql test - org.postgresql postgresql - org.springframework.boot spring-boot-starter-test test - org.springframework.boot spring-boot-testcontainers test - org.testcontainers junit-jupiter test - com.opencsv opencsv - 5.7.1 + ${opencsv.version} - - - 17 - 4.0.0-M4 - - @@ -102,4 +82,12 @@ + + true + 17 + 7.1.7.Final + 5.7.1 + 1.21.3 + + diff --git a/persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/DatasetupService.java b/persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/DatasetupService.java similarity index 96% rename from persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/DatasetupService.java rename to persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/DatasetupService.java index c042f242980a..3efaebd9ceaa 100644 --- a/persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/DatasetupService.java +++ b/persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/DatasetupService.java @@ -1,12 +1,7 @@ -package com.baedlung.springdata.mongodb; - -import static org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction.COSINE; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.security.SecureRandom; +package com.baeldung.springdata.mongodb; +import com.opencsv.CSVReader; +import com.opencsv.exceptions.CsvValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Vector; @@ -14,10 +9,12 @@ import org.springframework.data.mongodb.core.index.SearchIndexStatus; import org.springframework.data.mongodb.core.index.VectorIndex; -import com.baeldung.springdata.mongodb.Book; -import com.baeldung.springdata.mongodb.MongoDbBookRepository; -import com.opencsv.CSVReader; -import com.opencsv.exceptions.CsvValidationException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.security.SecureRandom; + +import static org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction.COSINE; public class DatasetupService { private final Logger logger = LoggerFactory.getLogger(DatasetupService.class); diff --git a/persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/MongoDBTestConfiguration.java b/persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/MongoDBTestConfiguration.java similarity index 91% rename from persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/MongoDBTestConfiguration.java rename to persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/MongoDBTestConfiguration.java index 13db13734e7d..f6808f3870bf 100644 --- a/persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/MongoDBTestConfiguration.java +++ b/persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/MongoDBTestConfiguration.java @@ -1,5 +1,7 @@ -package com.baedlung.springdata.mongodb; +package com.baeldung.springdata.mongodb; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,10 +12,6 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.testcontainers.mongodb.MongoDBAtlasLocalContainer; -import com.baeldung.springdata.mongodb.MongoDbBookRepository; -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; - @Configuration @Profile("mongodb") public class MongoDBTestConfiguration { @@ -49,7 +47,7 @@ public MongoOperations mongoTemplate(MongoClient mongoClient) { @Bean @DependsOn({"mongoTemplate", "mongoDbBookRepository"}) public DatasetupService datasetupService(@Autowired MongoTemplate mongoTemplate, - @Autowired MongoDbBookRepository mongoDbBookRepository) { + @Autowired MongoDbBookRepository mongoDbBookRepository) { return new DatasetupService(mongoTemplate, mongoDbBookRepository); } } diff --git a/persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/MongoDBVectorLiveTest.java b/persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/MongoDBVectorLiveTest.java similarity index 85% rename from persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/MongoDBVectorLiveTest.java rename to persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/MongoDBVectorLiveTest.java index 7166a698db63..88b45414b93e 100644 --- a/persistence-modules/spring-data-vector/src/test/java/com/baedlung/springdata/mongodb/MongoDBVectorLiveTest.java +++ b/persistence-modules/spring-data-vector/src/test/java/com/baeldung/springdata/mongodb/MongoDBVectorLiveTest.java @@ -1,10 +1,6 @@ -package com.baedlung.springdata.mongodb; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.IOException; -import java.util.List; +package com.baeldung.springdata.mongodb; +import com.opencsv.exceptions.CsvValidationException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -14,19 +10,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; -import org.springframework.data.domain.Range; -import org.springframework.data.domain.Score; -import org.springframework.data.domain.SearchResult; -import org.springframework.data.domain.SearchResults; -import org.springframework.data.domain.Similarity; -import org.springframework.data.domain.Vector; +import org.springframework.data.domain.*; import org.springframework.test.context.ActiveProfiles; import org.testcontainers.mongodb.MongoDBAtlasLocalContainer; -import com.baeldung.springdata.mongodb.Book; -import com.baeldung.springdata.mongodb.MongoDbBookRepository; -import com.baeldung.springdata.mongodb.SpringDataMongoDBVectorApplication; -import com.opencsv.exceptions.CsvValidationException; +import java.io.IOException; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(classes = { SpringDataMongoDBVectorApplication.class }) @Import(MongoDBTestConfiguration.class) diff --git a/pom.xml b/pom.xml index 89c030428d20..f89c71668310 100644 --- a/pom.xml +++ b/pom.xml @@ -1080,6 +1080,7 @@ apache-poi-4 apache-thrift apache-velocity + apollo atomix aws-modules spring-boot-azure-deployment @@ -1128,6 +1129,7 @@ jmonkeyengine json-modules jsoup + jts jws ksqldb kubernetes-modules @@ -1523,6 +1525,7 @@ quarkus-modules/consume-rest-api/consume-api maven-modules/maven-exec-plugin maven-modules/dependencygraph + maven-modules/maven-toolchains spring-boot-modules/spring-boot-groovy spring-boot-modules/spring-boot-data-3 spring-boot-modules/spring-boot-3-3 @@ -1588,6 +1591,7 @@ quarkus-modules/consume-rest-api/consume-api maven-modules/maven-exec-plugin maven-modules/dependencygraph + maven-modules/maven-toolchains spring-boot-modules/spring-boot-groovy spring-boot-modules/spring-boot-data-3 spring-boot-modules/spring-boot-3-3 diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml index 2d1d35680efb..883a83bd43f6 100644 --- a/testing-modules/pom.xml +++ b/testing-modules/pom.xml @@ -33,6 +33,7 @@ junit-4 junit-5-advanced junit-5-advanced-2 + junit-5-advanced-3 junit-5-basics junit-5-basics-2 junit-5