diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index ad1dbf76f..420d53a6b 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -4,29 +4,32 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.entry.os }} strategy: fail-fast: false matrix: entry: - - { opensearch_version: 1.0.1, java: 21 } - - { opensearch_version: 1.1.0, java: 21 } - - { opensearch_version: 1.2.4, java: 21 } - - { opensearch_version: 1.3.20, java: 21 } - - { opensearch_version: 2.0.1, java: 21 } - - { opensearch_version: 2.2.1, java: 21 } - - { opensearch_version: 2.4.1, java: 21 } - - { opensearch_version: 2.6.0, java: 21 } - - { opensearch_version: 2.8.0, java: 21 } - - { opensearch_version: 2.10.0, java: 21 } - - { opensearch_version: 2.12.0, java: 21 } - - { opensearch_version: 2.14.0, java: 21 } - - { opensearch_version: 2.16.0, java: 21 } - - { opensearch_version: 2.18.0, java: 21 } - - { opensearch_version: 2.19.2, java: 21 } - - { opensearch_version: 3.0.0, java: 21 } - - { opensearch_version: 3.2.0, java: 21 } - - { opensearch_version: 3.2.0, java: 25 } + - { opensearch_version: 1.0.1, java: 21, os: ubuntu-latest } + - { opensearch_version: 1.1.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 1.2.4, java: 21, os: ubuntu-latest } + - { opensearch_version: 1.3.20, java: 21, os: ubuntu-latest } + # Fixing the Docker version due to regression on container startup for some JDKs: + # Could not reconfigure JMX java.lang.NullPointerException: Cannot invoke + # "jdk.internal.platform.CgroupInfo.getMountPoint()" because "anyController" is null + - { opensearch_version: 2.0.1, java: 21, os: ubuntu-22.04 } + - { opensearch_version: 2.2.1, java: 21, os: ubuntu-22.04 } + - { opensearch_version: 2.4.1, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.6.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.8.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.10.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.12.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.14.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.16.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.18.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 2.19.2, java: 21, os: ubuntu-latest } + - { opensearch_version: 3.0.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 3.2.0, java: 21, os: ubuntu-latest } + - { opensearch_version: 3.2.0, java: 25, os: ubuntu-latest } steps: - name: Checkout Java Client uses: actions/checkout@v6 @@ -37,10 +40,10 @@ jobs: java-version: ${{ matrix.entry.java }} distribution: 'temurin' cache: 'gradle' - - name: Run Docker run: | echo "PASSWORD=admin" >> $GITHUB_ENV + docker info docker compose --project-directory .ci/opensearch build --build-arg OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }} docker compose --project-directory .ci/opensearch up -d sleep 60 diff --git a/CHANGELOG.md b/CHANGELOG.md index cf1600677..6adb3b3ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,12 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## [Unreleased 4.x] ### Dependencies - Bump `io.github.classgraph:classgraph` from 4.8.180 to 4.8.184 ([#1703](https://github.com/opensearch-project/opensearch-java/pull/1703), [#1759](https://github.com/opensearch-project/opensearch-java/pull/1759)) -- Bump `org.junit:junit-bom` from 5.13.3 to 6.0.2 ([#1704](https://github.com/opensearch-project/opensearch-java/pull/1704), [#1746](https://github.com/opensearch-project/opensearch-java/pull/1746), [#1780](https://github.com/opensearch-project/opensearch-java/pull/1780), [#1856](https://github.com/opensearch-project/opensearch-java/pull/1856)) +- Bump `org.junit:junit-bom` from 5.13.3 to 6.0.3 ([#1704](https://github.com/opensearch-project/opensearch-java/pull/1704), [#1746](https://github.com/opensearch-project/opensearch-java/pull/1746), [#1780](https://github.com/opensearch-project/opensearch-java/pull/1780), [#1856](https://github.com/opensearch-project/opensearch-java/pull/1856), [#1885](https://github.com/opensearch-project/opensearch-java/pull/1885)) - Bump `org.opensearch.gradle:build-tools` from 3.2.0-SNAPSHOT to 3.6.0-SNAPSHOT ([#1714](https://github.com/opensearch-project/opensearch-java/pull/1714), [#1756](https://github.com/opensearch-project/opensearch-java/pull/1756), [#1841](https://github.com/opensearch-project/opensearch-java/pull/1841), [#1868](https://github.com/opensearch-project/opensearch-java/pull/1868), [#1869](https://github.com/opensearch-project/opensearch-java/pull/1869)) - Bump `org.ajoberstar.grgit:grgit-gradle` from 5.3.2 to 5.3.3 ([#1723](https://github.com/opensearch-project/opensearch-java/pull/1723)) -- Bump `org.apache.httpcomponents.core5:httpcore5` from 5.3.4 to 5.4 ([#1726](https://github.com/opensearch-project/opensearch-java/pull/1726), [#1733](https://github.com/opensearch-project/opensearch-java/pull/1733), [#1815](https://github.com/opensearch-project/opensearch-java/pull/1815)) +- Bump `org.apache.httpcomponents.core5:httpcore5` from 5.3.4 to 5.4.1 ([#1726](https://github.com/opensearch-project/opensearch-java/pull/1726), [#1733](https://github.com/opensearch-project/opensearch-java/pull/1733), [#1815](https://github.com/opensearch-project/opensearch-java/pull/1815), [#1883](https://github.com/opensearch-project/opensearch-java/pull/1883)) - Bump `org.owasp.dependencycheck` from 12.1.3 to 12.2.0 ([#1735](https://github.com/opensearch-project/opensearch-java/pull/1735), [#1742](https://github.com/opensearch-project/opensearch-java/pull/1742), [#1754](https://github.com/opensearch-project/opensearch-java/pull/1754), [#1765](https://github.com/opensearch-project/opensearch-java/pull/1765), [#1796](https://github.com/opensearch-project/opensearch-java/pull/1796), [#1854](https://github.com/opensearch-project/opensearch-java/pull/1854)) +- Bump `com.carrotsearch.randomizedtesting:randomizedtesting-runner` from 2.8.3 to 2.8.4 ([#1882](https://github.com/opensearch-project/opensearch-java/pull/1882)) ### Added diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index 59568ff7a..e059d3462 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -186,7 +186,7 @@ dependencies { api("commons-logging:commons-logging:1.3.5") compileOnly("org.opensearch.client", "opensearch-rest-client", opensearchVersion) testImplementation("org.hamcrest:hamcrest:3.0") - testImplementation("com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3") { + testImplementation("com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4") { exclude(group = "junit") } testImplementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion) @@ -194,8 +194,8 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.6") { exclude(group = "org.apache.httpcomponents.core5") } - api("org.apache.httpcomponents.core5:httpcore5:5.4") - api("org.apache.httpcomponents.core5:httpcore5-h2:5.4") + api("org.apache.httpcomponents.core5:httpcore5:5.4.1") + api("org.apache.httpcomponents.core5:httpcore5-h2:5.4.1") // Apache 2.0 // https://search.maven.org/artifact/com.google.code.findbugs/jsr305 diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts index 01ba04a54..d97039ed1 100644 --- a/java-codegen/build.gradle.kts +++ b/java-codegen/build.gradle.kts @@ -175,7 +175,7 @@ dependencies { implementation("org.commonmark", "commonmark", "0.24.0") // EPL-2.0 - testImplementation(platform("org.junit:junit-bom:6.0.2")) + testImplementation(platform("org.junit:junit-bom:6.0.3")) testImplementation("org.junit.jupiter", "junit-jupiter") testRuntimeOnly("org.junit.platform", "junit-platform-launcher") }