Skip to content

Commit 656433b

Browse files
retadependabot[bot]Xtansia
authored
[Backport] [3.x] Bump com.carrotsearch.randomizedtesting:randomizedtesting-runner from 2.8.3 to 2.8.4, org.apache.httpcomponents.core5:httpcore5 from 5.4 to 5.4.1 (#1886)
* Bump org.apache.httpcomponents.core5:httpcore5 from 5.4 to 5.4.1 (#1883) * Bump org.apache.httpcomponents.core5:httpcore5 from 5.4 to 5.4.1 Bumps [org.apache.httpcomponents.core5:httpcore5](https://github.com/apache/httpcomponents-core) from 5.4 to 5.4.1. - [Changelog](https://github.com/apache/httpcomponents-core/blob/rel/v5.4.1/RELEASE_NOTES.txt) - [Commits](apache/httpcomponents-core@rel/v5.4...rel/v5.4.1) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.core5:httpcore5 dependency-version: 5.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update changelog Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 324769d) * Bump com.carrotsearch.randomizedtesting:randomizedtesting-runner from 2.8.3 to 2.8.4 in /java-client (#1882) * Bump com.carrotsearch.randomizedtesting:randomizedtesting-runner Bumps com.carrotsearch.randomizedtesting:randomizedtesting-runner from 2.8.3 to 2.8.4. --- updated-dependencies: - dependency-name: com.carrotsearch.randomizedtesting:randomizedtesting-runner dependency-version: 2.8.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update changelog Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6305d51) * Add docker logs Signed-off-by: Andriy Redko <drreta@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Farr <tsfarr@amazon.com>
1 parent dc0ff14 commit 656433b

3 files changed

Lines changed: 28 additions & 23 deletions

File tree

‎.github/workflows/test-integration.yml‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ on: [push, pull_request]
44

55
jobs:
66
test:
7-
runs-on: ubuntu-latest
7+
runs-on: ${{ matrix.entry.os }}
88
strategy:
99
fail-fast: false
1010
matrix:
1111
entry:
12-
- { opensearch_version: 1.0.1, java: 21 }
13-
- { opensearch_version: 1.1.0, java: 21 }
14-
- { opensearch_version: 1.2.4, java: 21 }
15-
- { opensearch_version: 1.3.20, java: 21 }
16-
- { opensearch_version: 2.0.1, java: 21 }
17-
- { opensearch_version: 2.2.1, java: 21 }
18-
- { opensearch_version: 2.4.1, java: 21 }
19-
- { opensearch_version: 2.6.0, java: 21 }
20-
- { opensearch_version: 2.8.0, java: 21 }
21-
- { opensearch_version: 2.10.0, java: 21 }
22-
- { opensearch_version: 2.12.0, java: 21 }
23-
- { opensearch_version: 2.14.0, java: 21 }
24-
- { opensearch_version: 2.16.0, java: 21 }
25-
- { opensearch_version: 2.18.0, java: 21 }
26-
- { opensearch_version: 2.19.2, java: 21 }
27-
- { opensearch_version: 3.0.0, java: 21 }
28-
- { opensearch_version: 3.2.0, java: 21 }
29-
- { opensearch_version: 3.2.0, java: 25 }
12+
- { opensearch_version: 1.0.1, java: 21, os: ubuntu-latest }
13+
- { opensearch_version: 1.1.0, java: 21, os: ubuntu-latest }
14+
- { opensearch_version: 1.2.4, java: 21, os: ubuntu-latest }
15+
- { opensearch_version: 1.3.20, java: 21, os: ubuntu-latest }
16+
# Fixing the Docker version due to regression on container startup for some JDKs:
17+
# Could not reconfigure JMX java.lang.NullPointerException: Cannot invoke
18+
# "jdk.internal.platform.CgroupInfo.getMountPoint()" because "anyController" is null
19+
- { opensearch_version: 2.0.1, java: 21, os: ubuntu-22.04 }
20+
- { opensearch_version: 2.2.1, java: 21, os: ubuntu-22.04 }
21+
- { opensearch_version: 2.4.1, java: 21, os: ubuntu-latest }
22+
- { opensearch_version: 2.6.0, java: 21, os: ubuntu-latest }
23+
- { opensearch_version: 2.8.0, java: 21, os: ubuntu-latest }
24+
- { opensearch_version: 2.10.0, java: 21, os: ubuntu-latest }
25+
- { opensearch_version: 2.12.0, java: 21, os: ubuntu-latest }
26+
- { opensearch_version: 2.14.0, java: 21, os: ubuntu-latest }
27+
- { opensearch_version: 2.16.0, java: 21, os: ubuntu-latest }
28+
- { opensearch_version: 2.18.0, java: 21, os: ubuntu-latest }
29+
- { opensearch_version: 2.19.2, java: 21, os: ubuntu-latest }
30+
- { opensearch_version: 3.0.0, java: 21, os: ubuntu-latest }
31+
- { opensearch_version: 3.2.0, java: 21, os: ubuntu-latest }
32+
- { opensearch_version: 3.2.0, java: 25, os: ubuntu-latest }
3033
steps:
3134
- name: Checkout Java Client
3235
uses: actions/checkout@v6
@@ -37,10 +40,10 @@ jobs:
3740
java-version: ${{ matrix.entry.java }}
3841
distribution: 'temurin'
3942
cache: 'gradle'
40-
4143
- name: Run Docker
4244
run: |
4345
echo "PASSWORD=admin" >> $GITHUB_ENV
46+
docker info
4447
docker compose --project-directory .ci/opensearch build --build-arg OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }}
4548
docker compose --project-directory .ci/opensearch up -d
4649
sleep 60

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
88

99
### Dependencies
1010
- Bump `com.github.jk1.dependency-license-report` from 3.0.1 to 3.1.1 ([#1895](https://github.com/opensearch-project/opensearch-java/pull/1895), [#1896](https://github.com/opensearch-project/opensearch-java/pull/1896))
11+
- Bump `org.apache.httpcomponents.core5:httpcore5` from 5.4 to 5.4.1 ([#1883](https://github.com/opensearch-project/opensearch-java/pull/1883))
12+
- Bump `com.carrotsearch.randomizedtesting:randomizedtesting-runner` from 2.8.3 to 2.8.4 ([#1882](https://github.com/opensearch-project/opensearch-java/pull/1882))
1113

1214
### Changed
1315

‎java-client/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,16 +186,16 @@ dependencies {
186186
api("commons-logging:commons-logging:1.3.5")
187187
compileOnly("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
188188
testImplementation("org.hamcrest:hamcrest:3.0")
189-
testImplementation("com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3") {
189+
testImplementation("com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4") {
190190
exclude(group = "junit")
191191
}
192192
testImplementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
193193

194194
api("org.apache.httpcomponents.client5:httpclient5:5.6") {
195195
exclude(group = "org.apache.httpcomponents.core5")
196196
}
197-
api("org.apache.httpcomponents.core5:httpcore5:5.4")
198-
api("org.apache.httpcomponents.core5:httpcore5-h2:5.4")
197+
api("org.apache.httpcomponents.core5:httpcore5:5.4.1")
198+
api("org.apache.httpcomponents.core5:httpcore5-h2:5.4.1")
199199

200200
// Apache 2.0
201201
// https://search.maven.org/artifact/com.google.code.findbugs/jsr305

0 commit comments

Comments
 (0)