Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.x' into 2.x
Browse files Browse the repository at this point in the history
Signed-off-by: Oliver Lockwood <[email protected]>
  • Loading branch information
oliverlockwood committed May 28, 2024
2 parents fd3c686 + 17e8935 commit 3d233fb
Show file tree
Hide file tree
Showing 221 changed files with 1,768 additions and 515 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/gradle-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@ jobs:
echo "pr_number=$(jq --raw-output .pull_request.number $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
echo "pr_owner=$(jq --raw-output .pull_request.user.login $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
echo "pr_or_commit_description=$(jq --ascii-output .pull_request.body $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
echo "post_merge_action=false" >> $GITHUB_ENV
# to get the PR data that can be used for post merge actions
- uses: actions/github-script@v7
if: github.event_name == 'push'
id: get_pr_data
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
return (
await github.rest.repos.listPullRequestsAssociatedWithCommit({
commit_sha: context.sha,
owner: context.repo.owner,
repo: context.repo.repo,
})
).data[0];
- name: Setup environment variables (Push)
if: github.event_name == 'push'
Expand All @@ -53,8 +69,9 @@ jobs:
echo "pr_to_clone_url=$repo_url" >> $GITHUB_ENV
echo "pr_title=Push trigger $branch_name $ref_id $repo_url" >> $GITHUB_ENV
echo "pr_owner=$(jq --raw-output '.commits[0].author.username' $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
echo "pr_number=Null" >> $GITHUB_ENV
echo 'pr_number=${{ fromJson(steps.get_pr_data.outputs.result).number }}' >> $GITHUB_ENV
echo "pr_or_commit_description=$(jq --ascii-output .head_commit.message $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
echo "post_merge_action=true" >> $GITHUB_ENV
- name: Checkout opensearch-build repo
uses: actions/checkout@v4
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add support for Azure Managed Identity in repository-azure ([#12423](https://github.com/opensearch-project/OpenSearch/issues/12423))
- Add useCompoundFile index setting ([#13478](https://github.com/opensearch-project/OpenSearch/pull/13478))
- Make outbound side of transport protocol dependent ([#13293](https://github.com/opensearch-project/OpenSearch/pull/13293))
- [Remote Store] Upload translog checkpoint as object metadata to translog.tlog([#13637](https://github.com/opensearch-project/OpenSearch/pull/13637))
- [Remote Store] Add dynamic cluster settings to set timeout for segments upload to Remote Store ([#13679](https://github.com/opensearch-project/OpenSearch/pull/13679))
- Allow setting query parameters on requests ([#13776](https://github.com/opensearch-project/OpenSearch/issues/13776))

### Dependencies
Expand All @@ -19,6 +21,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `mockito` from 5.11.0 to 5.12.0 ([#13665](https://github.com/opensearch-project/OpenSearch/pull/13665))
- Bump `com.google.code.gson:gson` from 2.10.1 to 2.11.0 ([#13752](https://github.com/opensearch-project/OpenSearch/pull/13752))
- Bump `ch.qos.logback:logback-core` from 1.5.3 to 1.5.6 ([#13756](https://github.com/opensearch-project/OpenSearch/pull/13756))
- Bump `netty` from 4.1.109.Final to 4.1.110.Final ([#13802](https://github.com/opensearch-project/OpenSearch/pull/13802))
- Bump `jackson` from 2.17.0 to 2.17.1 ([#13817](https://github.com/opensearch-project/OpenSearch/pull/13817))
- Bump `reactor` from 3.5.15 to 3.5.17 ([#13825](https://github.com/opensearch-project/OpenSearch/pull/13825))
- Bump `reactor-netty` from 1.1.17 to 1.1.19 ([#13825](https://github.com/opensearch-project/OpenSearch/pull/13825))
- Bump `commons-cli:commons-cli` from 1.7.0 to 1.8.0 ([#13840](https://github.com/opensearch-project/OpenSearch/pull/13840))
- Bump `org.apache.xmlbeans:xmlbeans` from 5.2.0 to 5.2.1 ([#13839](https://github.com/opensearch-project/OpenSearch/pull/13839))

### Changed
- Add ability for Boolean and date field queries to run when only doc_values are enabled ([#11650](https://github.com/opensearch-project/OpenSearch/pull/11650))
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ bundled_jdk = 21.0.3+9
# optional dependencies
spatial4j = 0.7
jts = 1.15.0
jackson = 2.17.0
jackson_databind = 2.17.0
jackson = 2.17.1
jackson_databind = 2.17.1
snakeyaml = 2.1
icu4j = 70.1
supercsv = 2.4.0
Expand All @@ -27,12 +27,12 @@ google_http_client = 1.44.1
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.13.0

netty = 4.1.109.Final
netty = 4.1.110.Final
joda = 2.12.7

# project reactor
reactor_netty = 1.1.17
reactor = 3.5.15
reactor_netty = 1.1.19
reactor = 3.5.17

# client dependencies
httpclient = 4.5.14
Expand Down
1 change: 0 additions & 1 deletion client/sniffer/licenses/jackson-core-2.17.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions client/sniffer/licenses/jackson-core-2.17.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a11644cd59a28ef79f02bddc2cc3bab45edb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079
1 change: 0 additions & 1 deletion libs/core/licenses/jackson-core-2.17.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/jackson-core-2.17.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a11644cd59a28ef79f02bddc2cc3bab45edb
1 change: 0 additions & 1 deletion libs/x-content/licenses/jackson-core-2.17.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/x-content/licenses/jackson-core-2.17.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a11644cd59a28ef79f02bddc2cc3bab45edb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ba5d8e6ecc62aa0e49c0ce935b8696352dbebc71

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
89683ac4f0a0c2c4f69ea56b90480ed40266dac8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4c7b8a9ea3f398116a75c146b982b22afebc4ee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079
3 changes: 3 additions & 0 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,14 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d918a9ee057d995c362902b54634fc307132aac

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1fa43b03e93ab88e805b6a4e3e83780c80b47d2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9d05cd927209ea25bbf342962c00b8e5a828c2a4

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec361e7e025c029be50c55c8480080cabcbc01e7

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
168db749c22652ee7fed1ebf7ec46ce856d75e51

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
66c15921104cda0159b34e316541bc765dfaf3c0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b91f04c39ac14d6a29d07184ef305953ee6e0348

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a7096e7c0a25a983647909d7513f5d4943d589c0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079
2 changes: 1 addition & 1 deletion plugins/ingest-attachment/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ dependencies {
api "org.apache.poi:poi:${versions.poi}"
api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'org.apache.xmlbeans:xmlbeans:5.2.0'
api 'org.apache.xmlbeans:xmlbeans:5.2.1'
api 'org.apache.commons:commons-collections4:4.4'
// MS Office
api "org.apache.poi:poi-scratchpad:${versions.poi}"
Expand Down
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/xmlbeans-5.2.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/xmlbeans-5.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e16ddf17fe181c202b097e0dcc0ee2fed91cb7da

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e6a168dba62aa63743b9e2b83f4e0f0dfdc143d3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0969b0c3cb8c75d759e9a6c585c44c9b9f3a4f75

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f77e7bf0e64dfcf53bfdcf2764ad7ab92b78a4da

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
381c5bf8b7570c163fa7893a26d02b7ac36ff6eb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e0849843eb5b1c036b12551baca98a9f7ff847a0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d54c8d5b95b14756043efb59b8c3e62ec67aa43

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b7fb401dd47c79e6b99f2319ac3b561c50c31c30

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e687cdc4ecdbbad07508a11b715bdf95fa20939

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a7096e7c0a25a983647909d7513f5d4943d589c0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
639e2c63ade6f2a49d7e501ca2264b74d240b448

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4bbb1aeb64ecb2b3949c38983032a7f0b0ebd07
2 changes: 1 addition & 1 deletion plugins/repository-hdfs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
api 'com.google.code.gson:gson:2.11.0'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api 'commons-cli:commons-cli:1.7.0'
api 'commons-cli:commons-cli:1.8.0'
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'commons-collections:commons-collections:3.2.2'
api "org.apache.commons:commons-compress:${versions.commonscompress}"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
41a4bff12057eecb6daaf9c7f36c237815be3da1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db3f4d3ad3d16e26991a64d50b749ae09e0e0c8e
3 changes: 3 additions & 0 deletions plugins/repository-s3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -577,11 +577,14 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
)
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d918a9ee057d995c362902b54634fc307132aac

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1fa43b03e93ab88e805b6a4e3e83780c80b47d2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9d05cd927209ea25bbf342962c00b8e5a828c2a4

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e0849843eb5b1c036b12551baca98a9f7ff847a0

This file was deleted.

Loading

0 comments on commit 3d233fb

Please sign in to comment.