Skip to content

Commit

Permalink
Merge branch 'main' into jackson.2.18.2
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
reta authored Dec 3, 2024
2 parents b8a2329 + 80ba41f commit 1d5b581
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `codecov/codecov-action` from 4 to 5 ([#16667](https://github.com/opensearch-project/OpenSearch/pull/16667))
- Bump `org.apache.logging.log4j:log4j-core` from 2.24.1 to 2.24.2 ([#16718](https://github.com/opensearch-project/OpenSearch/pull/16718))
- Bump `jackson` from 2.17.2 to 2.18.2 ([#16733](https://github.com/opensearch-project/OpenSearch/pull/16733))
- Bump `ch.qos.logback:logback-classic` from 1.2.13 to 1.5.12 ([#16716](https://github.com/opensearch-project/OpenSearch/pull/16716))

### Changed
- Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ teardown:
---
"update operation with predefined default or final pipeline returns warning header":
- skip:
version: " - 2.99.99"
reason: "this change is added in 3.0.0"
features: allowed_warnings
version: " - 2.18.99"
reason: "this change is added in 2.19.0"
features: [warnings, headers]
- do:
index:
index: test_1
Expand All @@ -57,7 +57,8 @@ teardown:
- match: { result: created }

- do:
allowed_warnings:
headers: { "X-Opaque-Id": "default_pipeline_request" }
warnings:
- "the index [test_1] has a default ingest pipeline or a final ingest pipeline, the support of the ingest pipelines for update operation causes unexpected result and will be removed in 3.0.0"
update:
index: test_1
Expand Down Expand Up @@ -85,7 +86,8 @@ teardown:
- match: { result: created }

- do:
allowed_warnings:
headers: { "X-Opaque-Id": "final_pipeline_request" }
warnings:
- "the index [test_2] has a default ingest pipeline or a final ingest pipeline, the support of the ingest pipelines for update operation causes unexpected result and will be removed in 3.0.0"
update:
index: test_2
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/hdfs-fixture/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ dependencies {
api "org.apache.commons:commons-text:1.12.0"
api "commons-net:commons-net:3.11.1"
api "ch.qos.logback:logback-core:1.5.12"
api "ch.qos.logback:logback-classic:1.2.13"
api "ch.qos.logback:logback-classic:1.5.12"
api "org.jboss.xnio:xnio-nio:3.8.16.Final"
api 'org.jline:jline:3.27.1'
api 'org.apache.commons:commons-configuration2:2.11.0'
Expand Down

0 comments on commit 1d5b581

Please sign in to comment.