Skip to content

Commit 130d6dd

Browse files
committed
Merge remote-tracking branch 'upstream/main' into remove_by_pattern_processor
2 parents 96298c1 + cc9ee9d commit 130d6dd

File tree

209 files changed

+2055
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+2055
-302
lines changed

.github/workflows/create-documentation-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
3030
- name: Create Issue From File
3131
id: create-issue
32-
uses: peter-evans/create-issue-from-file@v4
32+
uses: peter-evans/create-issue-from-file@v5
3333
with:
3434
title: Add documentation related to new feature
3535
content-filepath: ./ci/documentation/issue.md

.github/workflows/version.yml

Lines changed: 69 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
name: Increment Version
22

33
on:
4+
workflow_dispatch:
5+
inputs:
6+
tag:
7+
description: 'the tag'
8+
required: true
9+
type: string
410
push:
511
tags:
612
- '*.*.*'
713

8-
permissions: {}
14+
permissions:
15+
contents: write
16+
issues: write
17+
pull-requests: write
18+
919
jobs:
1020
build:
1121
if: github.repository == 'opensearch-project/OpenSearch'
1222
runs-on: ubuntu-latest
1323
steps:
14-
- name: GitHub App token
15-
id: github_app_token
16-
uses: tibdex/[email protected]
17-
with:
18-
app_id: ${{ secrets.APP_ID }}
19-
private_key: ${{ secrets.APP_PRIVATE_KEY }}
20-
installation_id: 22958780
21-
22-
- uses: actions/checkout@v4
23-
- name: Fetch Tag and Version Information
24+
- name: Fetch tag and version information
2425
run: |
2526
TAG=$(echo "${GITHUB_REF#refs/*/}")
27+
if [ -n ${{ github.event.inputs.tag }} ]; then
28+
TAG=${{ github.event.inputs.tag }}
29+
fi
2630
CURRENT_VERSION_ARRAY=($(echo "$TAG" | tr . '\n'))
2731
BASE=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:2}")
2832
BASE_X=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:1}.x")
@@ -44,24 +48,22 @@ jobs:
4448
echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
4549
echo "NEXT_VERSION_UNDERSCORE=$NEXT_VERSION_UNDERSCORE" >> $GITHUB_ENV
4650
echo "NEXT_VERSION_ID=$NEXT_VERSION_ID" >> $GITHUB_ENV
51+
4752
- uses: actions/checkout@v4
4853
with:
4954
ref: ${{ env.BASE }}
50-
token: ${{ steps.github_app_token.outputs.token }}
5155

52-
- name: Increment Patch Version
53-
run: |
54-
echo Incrementing $CURRENT_VERSION to $NEXT_VERSION
55-
echo " - \"$CURRENT_VERSION\"" >> .ci/bwcVersions
56-
sed -i "s/opensearch = $CURRENT_VERSION/opensearch = $NEXT_VERSION/g" buildSrc/version.properties
57-
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
58-
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
59-
sed -i "s/CURRENT = $CURRENT_VERSION_UNDERSCORE;/CURRENT = $NEXT_VERSION_UNDERSCORE;/g" libs/core/src/main/java/org/opensearch/Version.java
56+
- name: Increment Patch Version on Major.Minor branch
57+
uses: peternied/opensearch-core-version-updater@v1
58+
with:
59+
previous-version: ${{ env.CURRENT_VERSION }}
60+
new-version: ${{ env.NEXT_VERSION }}
61+
update-current: true
6062

61-
- name: Create Pull Request
63+
- name: Create PR for BASE
64+
id: base_pr
6265
uses: peter-evans/create-pull-request@v5
6366
with:
64-
token: ${{ steps.github_app_token.outputs.token }}
6567
base: ${{ env.BASE }}
6668
branch: 'create-pull-request/patch-${{ env.BASE }}'
6769
commit-message: Increment version to ${{ env.NEXT_VERSION }}
@@ -76,19 +78,18 @@ jobs:
7678
- uses: actions/checkout@v4
7779
with:
7880
ref: ${{ env.BASE_X }}
79-
token: ${{ steps.github_app_token.outputs.token }}
8081

81-
- name: Add bwc version to .X branch
82-
run: |
83-
echo Adding bwc version $NEXT_VERSION after $CURRENT_VERSION
84-
sed -i "s/- \"$CURRENT_VERSION\"/\0\n - \"$NEXT_VERSION\"/g" .ci/bwcVersions
85-
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
86-
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
82+
- name: Add Patch Version on Major.X branch
83+
uses: peternied/opensearch-core-version-updater@v1
84+
with:
85+
previous-version: ${{ env.CURRENT_VERSION }}
86+
new-version: ${{ env.NEXT_VERSION }}
87+
update-current: false
8788

88-
- name: Create Pull Request
89+
- name: Create PR for BASE_X
90+
id: base_x_pr
8991
uses: peter-evans/create-pull-request@v5
9092
with:
91-
token: ${{ steps.github_app_token.outputs.token }}
9293
base: ${{ env.BASE_X }}
9394
branch: 'create-pull-request/patch-${{ env.BASE_X }}'
9495
commit-message: Add bwc version ${{ env.NEXT_VERSION }}
@@ -103,19 +104,18 @@ jobs:
103104
- uses: actions/checkout@v4
104105
with:
105106
ref: main
106-
token: ${{ steps.github_app_token.outputs.token }}
107107

108-
- name: Add bwc version to main branch
109-
run: |
110-
echo Adding bwc version $NEXT_VERSION after $CURRENT_VERSION
111-
sed -i "s/- \"$CURRENT_VERSION\"/\0\n - \"$NEXT_VERSION\"/g" .ci/bwcVersions
112-
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
113-
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
108+
- name: Add Patch Version on main branch
109+
uses: peternied/opensearch-core-version-updater@v1
110+
with:
111+
previous-version: ${{ env.CURRENT_VERSION }}
112+
new-version: ${{ env.NEXT_VERSION }}
113+
update-current: false
114114

115-
- name: Create Pull Request
115+
- name: Create PR for main
116+
id: main_pr
116117
uses: peter-evans/create-pull-request@v5
117118
with:
118-
token: ${{ steps.github_app_token.outputs.token }}
119119
base: main
120120
branch: 'create-pull-request/patch-main'
121121
commit-message: Add bwc version ${{ env.NEXT_VERSION }}
@@ -126,3 +126,32 @@ jobs:
126126
title: '[AUTO] [main] Add bwc version ${{ env.NEXT_VERSION }}.'
127127
body: |
128128
I've noticed that a new tag ${{ env.TAG }} was pushed, and added a bwc version ${{ env.NEXT_VERSION }}.
129+
130+
- name: Create tracking issue
131+
id: create-issue
132+
uses: actions/[email protected]
133+
with:
134+
script: |
135+
const body = `
136+
### Description
137+
A new version of OpenSearch was released, to prepare for the next release new version numbers need to be updated in all active branches of development.
138+
139+
### Exit Criteria
140+
Review and merged the following pull requests
141+
- [ ] ${{ steps.base_pr.outputs.pull-request-url }}
142+
- [ ] ${{ steps.base_x_pr.outputs.pull-request-url }}
143+
- [ ] ${{ steps.main_pr.outputs.pull-request-url }}
144+
145+
### Additional Context
146+
See project wide guidance on branching and versions [[link]](https://github.com/opensearch-project/.github/blob/main/RELEASING.md).
147+
`
148+
const { data: issue }= await github.rest.issues.create({
149+
owner: context.repo.owner,
150+
repo: context.repo.repo,
151+
labels: ["Build"],
152+
title: "Increment version for ${{ env.NEXT_VERSION }}",
153+
body: body
154+
});
155+
console.error(JSON.stringify(issue));
156+
return issue.number;
157+
result-encoding: string

CHANGELOG.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1515
- GHA to verify checklist items completion in PR descriptions ([#10800](https://github.com/opensearch-project/OpenSearch/pull/10800))
1616
- Allow to pass the list settings through environment variables (like [], ["a", "b", "c"], ...) ([#10625](https://github.com/opensearch-project/OpenSearch/pull/10625))
1717
- [Admission Control] Integrate CPU AC with ResourceUsageCollector and add CPU AC stats to nodes/stats ([#10887](https://github.com/opensearch-project/OpenSearch/pull/10887))
18+
- [S3 Repository] Add setting to control connection count for sync client ([#12028](https://github.com/opensearch-project/OpenSearch/pull/12028))
1819

1920
### Dependencies
2021
- Bump `log4j-core` from 2.18.0 to 2.19.0
@@ -103,7 +104,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
103104
- Add search query categorizer ([#10255](https://github.com/opensearch-project/OpenSearch/pull/10255))
104105
- Per request phase latency ([#10351](https://github.com/opensearch-project/OpenSearch/issues/10351))
105106
- Add cluster state stats ([#10670](https://github.com/opensearch-project/OpenSearch/pull/10670))
106-
- Remove ingest processor supports excluding fields ([#10967](https://github.com/opensearch-project/OpenSearch/pull/10967))
107+
- Remove ingest processor supports excluding fields ([#10967](https://github.com/opensearch-project/OpenSearch/pull/10967), [#11983](https://github.com/opensearch-project/OpenSearch/pull/11983))
107108
- [Tiered caching] Enabling serialization for IndicesRequestCache key object ([#10275](https://github.com/opensearch-project/OpenSearch/pull/10275))
108109
- [Tiered caching] Defining interfaces, listeners and extending IndicesRequestCache with Tiered cache support ([#10753](https://github.com/opensearch-project/OpenSearch/pull/10753))
109110
- [Remote cluster state] Restore cluster state version during remote state auto restore ([#10853](https://github.com/opensearch-project/OpenSearch/pull/10853))
@@ -134,6 +135,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
134135
- Add remove_by_pattern ingest processor ([#11920](https://github.com/opensearch-project/OpenSearch/pull/11920))
135136
- Support index level allocation filtering for searchable snapshot index ([#11563](https://github.com/opensearch-project/OpenSearch/pull/11563))
136137
- Add `org.opensearch.rest.MethodHandlers` and `RestController#getAllHandlers` ([11876](https://github.com/opensearch-project/OpenSearch/pull/11876))
138+
- New DateTime format for RFC3339 compatible date fields ([#11465](https://github.com/opensearch-project/OpenSearch/pull/11465))
137139

138140
### Dependencies
139141
- Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))
@@ -152,12 +154,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
152154
- Bump `stefanzweifel/git-auto-commit-action` from 4 to 5 ([#11171](https://github.com/opensearch-project/OpenSearch/pull/11171))
153155
- Bump `actions/github-script` from 6 to 7 ([#11271](https://github.com/opensearch-project/OpenSearch/pull/11271))
154156
- Bump `jackson` and `jackson_databind` from 2.15.2 to 2.16.0 ([#11273](https://github.com/opensearch-project/OpenSearch/pull/11273))
155-
- Bump `netty` from 4.1.100.Final to 4.1.104.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775))
157+
- Bump `netty` from 4.1.100.Final to 4.1.106.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775)), [#12034](https://github.com/opensearch-project/OpenSearch/pull/12034))
156158
- Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.16.12 to 0.17.6 ([#10163](https://github.com/opensearch-project/OpenSearch/pull/10163), [#11692](https://github.com/opensearch-project/OpenSearch/pull/11692))
157159
- Bump `com.squareup.okhttp3:okhttp` from 4.11.0 to 4.12.0 ([#10861](https://github.com/opensearch-project/OpenSearch/pull/10861))
158160
- Bump `org.apache.commons:commons-text` from 1.10.0 to 1.11.0 ([#11344](https://github.com/opensearch-project/OpenSearch/pull/11344))
159-
- Bump `reactor-netty-core` from 1.1.12 to 1.1.13 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350))
160-
- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629))
161+
- Bump `reactor-netty-core` from 1.1.12 to 1.1.15 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350)), ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
162+
- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.2 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629), [#12056](https://github.com/opensearch-project/OpenSearch/pull/12056))
161163
- Bump `actions/setup-java` from 3 to 4 ([#11447](https://github.com/opensearch-project/OpenSearch/pull/11447))
162164
- Bump `commons-net:commons-net` from 3.9.0 to 3.10.0 ([#11450](https://github.com/opensearch-project/OpenSearch/pull/11450))
163165
- Bump `org.apache.maven:maven-model` from 3.9.4 to 3.9.6 ([#11445](https://github.com/opensearch-project/OpenSearch/pull/11445))
@@ -174,9 +176,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
174176
- Bump `com.maxmind.db:maxmind-db` from 3.0.0 to 3.1.0 ([#11693](https://github.com/opensearch-project/OpenSearch/pull/11693))
175177
- Bump `net.java.dev.jna:jna` from 5.13.0 to 5.14.0 ([#11798](https://github.com/opensearch-project/OpenSearch/pull/11798))
176178
- Bump `lycheeverse/lychee-action` from 1.8.0 to 1.9.1 ([#11795](https://github.com/opensearch-project/OpenSearch/pull/11795), [#11887](https://github.com/opensearch-project/OpenSearch/pull/11887))
177-
- Bump `Lucene` from 9.8.0 to 9.9.1 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421))
178-
- Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.1.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886))
179+
- Bump `Lucene` from 9.8.0 to 9.9.2 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421)), ([#12063](https://github.com/opensearch-project/OpenSearch/pull/12063))
180+
- Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.2.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886), [#11963](https://github.com/opensearch-project/OpenSearch/pull/11963))
179181
- Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
182+
- Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
183+
- Bump `com.diffplug.spotless` from 6.23.2 to 6.25.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962), [#12055](https://github.com/opensearch-project/OpenSearch/pull/12055))
184+
- Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
185+
- Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
186+
- Bump `com.google.http-client:google-http-client-jackson2` from 1.43.3 to 1.44.1 ([#12059](https://github.com/opensearch-project/OpenSearch/pull/12059))
187+
- Bump `peter-evans/create-issue-from-file` from 4 to 5 ([#12057](https://github.com/opensearch-project/OpenSearch/pull/12057))
180188

181189
### Changed
182190
- Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
@@ -207,7 +215,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
207215
- Use slice_size == shard_size heuristic in terms aggs for concurrent segment search and properly calculate the doc_count_error ([#11732](https://github.com/opensearch-project/OpenSearch/pull/11732))
208216
- Added Support for dynamically adding SearchRequestOperationsListeners with SearchRequestOperationsCompositeListenerFactory ([#11526](https://github.com/opensearch-project/OpenSearch/pull/11526))
209217
- Ensure Jackson default maximums introduced in 2.16.0 do not conflict with OpenSearch settings ([#11890](https://github.com/opensearch-project/OpenSearch/pull/11890))
210-
- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877))
218+
- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877)), ([#12000](https://github.com/opensearch-project/OpenSearch/pull/12000))
219+
- Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2 ([#11968](https://github.com/opensearch-project/OpenSearch/pull/11968))
220+
- Updates IpField to be searchable when only `doc_values` are enabled ([#11508](https://github.com/opensearch-project/OpenSearch/pull/11508))
211221

212222
### Deprecated
213223

@@ -237,6 +247,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
237247
- Fix issue when calling Delete PIT endpoint and no PITs exist ([#11711](https://github.com/opensearch-project/OpenSearch/pull/11711))
238248
- Fix tracing context propagation for local transport instrumentation ([#11490](https://github.com/opensearch-project/OpenSearch/pull/11490))
239249
- Fix parsing of single line comments in `lang-painless` ([#11815](https://github.com/opensearch-project/OpenSearch/issues/11815))
250+
- Fix memory leak issue in ReorganizingLongHash ([#11953](https://github.com/opensearch-project/OpenSearch/issues/11953))
251+
- Prevent setting remote_snapshot store type on index creation ([#11867](https://github.com/opensearch-project/OpenSearch/pull/11867))
252+
- [BUG] Fix remote shards balancer when filtering throttled nodes ([#11724](https://github.com/opensearch-project/OpenSearch/pull/11724))
240253

241254
### Security
242255

NOTICE.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ Foundation (http://www.apache.org/).
1010

1111
This product includes software developed by
1212
Joda.org (http://www.joda.org/).
13+
14+
This product includes software developed by
15+
Morten Haraldsen (ethlo) (https://github.com/ethlo) under the Apache License, version 2.0.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ plugins {
5454
id 'lifecycle-base'
5555
id 'opensearch.docker-support'
5656
id 'opensearch.global-build-info'
57-
id "com.diffplug.spotless" version "6.23.2" apply false
57+
id "com.diffplug.spotless" version "6.25.0" apply false
5858
id "org.gradle.test-retry" version "1.5.4" apply false
5959
id "test-report-aggregation"
6060
id 'jacoco-report-aggregation'

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ dependencies {
118118
api 'com.avast.gradle:gradle-docker-compose-plugin:0.17.6'
119119
api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
120120
api 'org.apache.maven:maven-model:3.9.6'
121-
api 'com.networknt:json-schema-validator:1.1.0'
121+
api 'com.networknt:json-schema-validator:1.2.0'
122122
api 'org.jruby.jcodings:jcodings:1.0.58'
123123
api 'org.jruby.joni:joni:2.2.1'
124124
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"

buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
import java.util.stream.Stream;
7878

7979
public class DistroTestPlugin implements Plugin<Project> {
80-
private static final String SYSTEM_JDK_VERSION = "17.0.9+9";
80+
private static final String SYSTEM_JDK_VERSION = "21.0.2+13";
8181
private static final String SYSTEM_JDK_VENDOR = "adoptium";
82-
private static final String GRADLE_JDK_VERSION = "17.0.9+9";
82+
private static final String GRADLE_JDK_VERSION = "21.0.2+13";
8383
private static final String GRADLE_JDK_VENDOR = "adoptium";
8484

8585
// all distributions used by distro tests. this is temporary until tests are per distribution

buildSrc/version.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
opensearch = 3.0.0
2-
lucene = 9.9.1
2+
lucene = 9.9.2
33

44
bundled_jdk_vendor = adoptium
5-
bundled_jdk = 21.0.1+12
5+
bundled_jdk = 21.0.2+13
66

77
# optional dependencies
88
spatial4j = 0.7
@@ -26,12 +26,12 @@ jakarta_annotation = 1.3.5
2626
# when updating the JNA version, also update the version in buildSrc/build.gradle
2727
jna = 5.13.0
2828

29-
netty = 4.1.104.Final
29+
netty = 4.1.106.Final
3030
joda = 2.12.2
3131

3232
# project reactor
33-
reactor_netty = 1.1.13
34-
reactor = 3.5.11
33+
reactor_netty = 1.1.15
34+
reactor = 3.5.14
3535

3636
# client dependencies
3737
httpclient5 = 5.2.1
@@ -55,7 +55,7 @@ bouncycastle=1.76
5555
randomizedrunner = 2.7.1
5656
junit = 4.13.2
5757
hamcrest = 2.1
58-
mockito = 5.5.0
58+
mockito = 5.10.0
5959
objenesis = 3.2
6060
bytebuddy = 1.14.7
6161

libs/core/licenses/lucene-core-9.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)