Skip to content

Routine dependency updates #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrross merged 1 commit into from
Oct 20, 2025
Merged

Routine dependency updates #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main_and_pr_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
distribution: 'oracle'
distribution: 'temurin'
cache: gradle
- name: Assemble with Gradle
run: ./gradlew assemble
Expand All @@ -35,8 +35,8 @@ jobs:
- { opensearch-version: 2.19.2, java-version: 25 }
- { opensearch-version: 3.0.0, java-version: 21 }
- { opensearch-version: 3.0.0, java-version: 25 }
- { opensearch-version: 3.2.0, java-version: 21 }
- { opensearch-version: 3.2.0, java-version: 25 }
- { opensearch-version: 3.3.0, java-version: 21 }
- { opensearch-version: 3.3.0, java-version: 25 }
runs-on: [ubuntu-latest]
name: Check on ${{ matrix.runs-on }} with JDK ${{ matrix.entry.java-version }} against OpenSearch ${{ matrix.entry.opensearch-version }}
runs-on: ${{ matrix.runs-on }}
Expand All @@ -47,7 +47,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.entry.java-version }}
distribution: 'oracle'
distribution: 'temurin'
cache: gradle
- name: Check with Gradle
run: ./gradlew check -Psde.testcontainers.image-version=${{ matrix.entry.opensearch-version }}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAME
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

sde.testcontainers.image-version=3.2.0
sde.testcontainers.image-version=3.3.0
12 changes: 6 additions & 6 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ rootProject.name = "spring-data-opensearch-parent"
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("jupiter", "5.13.1")
version("launcher", "1.13.1")
version("jupiter", "6.0.0")
version("launcher", "6.0.0")
library("jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("jupiter")
library("jupiter-params", "org.junit.jupiter", "junit-jupiter-params").versionRef("jupiter")
library("junit-platform-launcher", "org.junit.platform", "junit-platform-launcher").versionRef("launcher")
}

create("springLibs") {
version("spring", "6.2.11")
version("spring", "6.2.12")
version("spring-boot", "3.5.5")
library("data-commons", "org.springframework.data:spring-data-commons:3.5.4")
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.4")
library("data-commons", "org.springframework.data:spring-data-commons:3.5.5")
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.5")
library("web", "org.springframework", "spring-web").versionRef("spring")
library("webflux", "org.springframework", "spring-webflux").versionRef("spring")
library("context", "org.springframework", "spring-context").versionRef("spring")
Expand All @@ -37,7 +37,7 @@ dependencyResolutionManagement {
}

create("opensearchLibs") {
version("opensearch", "3.2.0")
version("opensearch", "3.3.0")
library("java-client", "org.opensearch.client:opensearch-java:3.2.0")
library("client", "org.opensearch.client", "opensearch-rest-client").versionRef("opensearch")
library("high-level-client", "org.opensearch.client", "opensearch-rest-high-level-client").versionRef("opensearch")
Expand Down
49 changes: 48 additions & 1 deletion ...rc/test/java/org/springframework/data/elasticsearch/core/geo/GeoJsonIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,20 @@
package org.springframework.data.elasticsearch.core.geo;

import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.util.Arrays;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.opensearch.OpenSearchException;
import org.opensearch.OpenSearchStatusException;
import org.opensearch.data.client.EnabledIfOpenSearchVersion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
Expand Down Expand Up @@ -115,7 +120,7 @@ void shouldWriteAndReadAnEntityWithGeoJsonProperties() {
));
GeoJsonPolygon geoJsonPolygon = GeoJsonPolygon
.of(new Point(12, 34), new Point(56, 78), new Point(90, 12), new Point(12, 34))
.withInnerRing(new Point(21, 43), new Point(65, 87), new Point(9, 21), new Point(21, 43));
.withInnerRing(new Point(21, 43), new Point(65, 57), new Point(19, 34), new Point(21, 43));
GeoJsonMultiPolygon geoJsonMultiPolygon = GeoJsonMultiPolygon
.of(Arrays.asList(GeoJsonPolygon.of(new Point(12, 34), new Point(56, 78), new Point(90, 12), new Point(12, 34)),
GeoJsonPolygon.of(new Point(21, 43), new Point(65, 87), new Point(9, 21), new Point(21, 43))));
Expand Down Expand Up @@ -146,6 +151,48 @@ void shouldWriteAndReadAnEntityWithGeoJsonProperties() {

assertThat(result).isEqualTo(entity);
}

// region tests
@Test // DATAES-930
@DisplayName("should not write illegal GeoJson properties")
@EnabledIfOpenSearchVersion(onOrAfter = "3.3.0", reason = "https://github.com/apache/lucene/pull/14974")
void shouldNotWriteIllegalGeoJsonProperties() {

GeoJsonMultiLineString multiLineString = GeoJsonMultiLineString.of(Arrays.asList( //
GeoJsonLineString.of(new Point(12, 34), new Point(56, 78)), //
GeoJsonLineString.of(new Point(90, 12), new Point(34, 56)) //
));
GeoJsonPolygon geoJsonPolygon = GeoJsonPolygon
.of(new Point(12, 34), new Point(56, 78), new Point(90, 12), new Point(12, 34))
.withInnerRing(new Point(21, 43), new Point(65, 87), new Point(9, 21), new Point(21, 43));
GeoJsonMultiPolygon geoJsonMultiPolygon = GeoJsonMultiPolygon
.of(Arrays.asList(GeoJsonPolygon.of(new Point(12, 34), new Point(56, 78), new Point(90, 12), new Point(12, 34)),
GeoJsonPolygon.of(new Point(21, 43), new Point(65, 87), new Point(9, 21), new Point(21, 43))));
GeoJsonGeometryCollection geoJsonGeometryCollection = GeoJsonGeometryCollection
.of(Arrays.asList(GeoJsonPoint.of(12, 34), GeoJsonPolygon
.of(GeoJsonLineString.of(new Point(12, 34), new Point(56, 78), new Point(90, 12), new Point(12, 34)))));

GeoJsonEntity entity = new GeoJsonEntity();
entity.setId("42");
entity.setPoint1(GeoJsonPoint.of(12, 34));
entity.setPoint2(GeoJsonPoint.of(56, 78));
entity.setMultiPoint1(GeoJsonMultiPoint.of(new Point(12, 34), new Point(56, 78), new Point(90, 12)));
entity.setMultiPoint2(GeoJsonMultiPoint.of(new Point(90, 12), new Point(56, 78), new Point(12, 34)));
entity.setLineString1(GeoJsonLineString.of(new Point(12, 34), new Point(56, 78), new Point(90, 12)));
entity.setLineString2(GeoJsonLineString.of(new Point(90, 12), new Point(56, 78), new Point(12, 34)));
entity.setMultiLineString1(multiLineString);
entity.setMultiLineString2(multiLineString);
entity.setPolygon1(geoJsonPolygon);
entity.setPolygon2(geoJsonPolygon);
entity.setMultiPolygon1(geoJsonMultiPolygon);
entity.setMultiPolygon2(geoJsonMultiPolygon);
entity.setGeometryCollection1(geoJsonGeometryCollection);
entity.setGeometryCollection2(geoJsonGeometryCollection);

final UncategorizedElasticsearchException ex = assertThrows(UncategorizedElasticsearchException.class,
() -> operations.save(entity));
assertThat(ex.getMessage()).contains("mapper_parsing_exception");
}

@Test // DATAES-931
@DisplayName("should find intersecting objects with Criteria query")
Expand Down
Loading