Skip to content

Commit 6a73b0e

Browse files
Merge remote-tracking branch 'upstream/main' into desc-debug
2 parents ed01775 + 15d27a1 commit 6a73b0e

File tree

116 files changed

+5006
-4169
lines changed

Some content is hidden

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

116 files changed

+5006
-4169
lines changed

.github/workflows/links.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- name: lychee Link Checker
1515
id: lychee
16-
uses: lycheeverse/lychee-action@v2.3.0
16+
uses: lycheeverse/lychee-action@v2.4.0
1717
with:
1818
args: --accept=200,403,429 --exclude-mail **/*.html **/*.md **/*.txt **/*.json --exclude-file .lychee.excludes
1919
fail: true

CHANGELOG.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Introduce a new search node role to hold search only shards ([#17620](https://github.com/opensearch-project/OpenSearch/pull/17620))
1212
- Fix systemd integTest on deb regarding path ownership check ([#17641](https://github.com/opensearch-project/OpenSearch/pull/17641))
1313
- Add dfs transformation function in XContentMapValues ([#17612](https://github.com/opensearch-project/OpenSearch/pull/17612))
14-
- [Security Manager Replacement] Add support of Java policies ([#17663](https://github.com/opensearch-project/OpenSearch/pull/17663))
15-
- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615)
14+
- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615))
15+
- [Security Manager Replacement] Create initial Java Agent to intercept Socket::connect calls ([#17724](https://github.com/opensearch-project/OpenSearch/pull/17724))
16+
- Add ingestion management APIs for pause, resume and get ingestion state ([#17631](https://github.com/opensearch-project/OpenSearch/pull/17631))
17+
- [Security Manager Replacement] Enhance Java Agent to intercept System::exit ([#17746](https://github.com/opensearch-project/OpenSearch/pull/17746))
1618

1719
### Changed
1820
- Migrate BC libs to their FIPS counterparts ([#14912](https://github.com/opensearch-project/OpenSearch/pull/14912))
@@ -22,12 +24,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2224
- Bump `com.nimbusds:nimbus-jose-jwt` from 9.41.1 to 10.0.2 ([#17607](https://github.com/opensearch-project/OpenSearch/pull/17607), [#17669](https://github.com/opensearch-project/OpenSearch/pull/17669))
2325
- Bump `com.google.api:api-common` from 1.8.1 to 2.46.1 ([#17604](https://github.com/opensearch-project/OpenSearch/pull/17604))
2426
- Bump `ch.qos.logback:logback-core` from 1.5.16 to 1.5.17 ([#17609](https://github.com/opensearch-project/OpenSearch/pull/17609))
25-
- Bump `org.jruby.joni:joni` from 2.2.3 to 2.2.5 ([#17608](https://github.com/opensearch-project/OpenSearch/pull/17608))
27+
- Bump `org.jruby.joni:joni` from 2.2.3 to 2.2.6 ([#17608](https://github.com/opensearch-project/OpenSearch/pull/17608), [#17732](https://github.com/opensearch-project/OpenSearch/pull/17732))
2628
- Bump `dangoslen/dependabot-changelog-helper` from 3 to 4 ([#17498](https://github.com/opensearch-project/OpenSearch/pull/17498))
2729
- Bump `com.google.api:gax` from 2.35.0 to 2.63.1 ([#17465](https://github.com/opensearch-project/OpenSearch/pull/17465))
2830
- Bump `com.azure:azure-storage-blob` from 12.29.1 to 12.30.0 ([#17667](https://github.com/opensearch-project/OpenSearch/pull/17667))
2931
- Bump `tj-actions/changed-files` from 46.0.1 to 46.0.3 ([#17666](https://github.com/opensearch-project/OpenSearch/pull/17666))
3032
- Bump `com.google.code.gson:gson` from 2.11.0 to 2.12.1 ([#17668](https://github.com/opensearch-project/OpenSearch/pull/17668))
33+
- Bump `com.github.luben:zstd-jni` from 1.5.5-1 to 1.5.6-1 ([#17674](https://github.com/opensearch-project/OpenSearch/pull/17674))
34+
- Bump `lycheeverse/lychee-action` from 2.3.0 to 2.4.0 ([#17731](https://github.com/opensearch-project/OpenSearch/pull/17731))
35+
- Bump `com.netflix.nebula.ospackage-base` from 11.11.1 to 11.11.2 ([#17734](https://github.com/opensearch-project/OpenSearch/pull/17734))
3136

3237
### Changed
3338

distribution/packages/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import java.util.regex.Pattern
6363
*/
6464

6565
plugins {
66-
id "com.netflix.nebula.ospackage-base" version "11.11.1"
66+
id "com.netflix.nebula.ospackage-base" version "11.11.2"
6767
}
6868

6969
void addProcessFilesTask(String type, boolean jdk) {

doc-tools/missing-doclet/src/main/java/org/opensearch/missingdoclet/MissingDoclet.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ private void check(Element element) {
235235
case INTERFACE:
236236
case ENUM:
237237
case ANNOTATION_TYPE:
238+
case RECORD:
238239
if (level(element) >= CLASS) {
239240
checkComment(element);
240241
for (var subElement : element.getEnclosedElements()) {
@@ -343,7 +344,7 @@ private boolean isGenerated(Element element) {
343344
if (!isGenerated && element.getEnclosingElement() != null) {
344345
// check if enclosing element is generated
345346
return isGenerated(element.getEnclosingElement());
346-
}
347+
}
347348

348349
return isGenerated;
349350
}

gradle/libs.versions.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ grpc = "1.68.2"
3131
json_smart = "2.5.2"
3232

3333
# when updating the JNA version, also update the version in buildSrc/build.gradle
34-
jna = "5.13.0"
34+
jna = "5.16.0"
3535

3636
netty = "4.1.118.Final"
3737
joda = "2.12.7"
@@ -70,15 +70,15 @@ password4j = "1.8.2"
7070
randomizedrunner = "2.7.1"
7171
junit = "4.13.2"
7272
hamcrest = "2.1"
73-
mockito = "5.14.2"
73+
mockito = "5.16.1"
7474
objenesis = "3.3"
75-
bytebuddy = "1.15.10"
75+
bytebuddy = "1.17.5"
7676

7777
# benchmark dependencies
7878
jmh = "1.35"
7979

8080
# compression
81-
zstd = "1.5.5-5"
81+
zstd = "1.5.6-1"
8282

8383
jzlib = "1.1.3"
8484

gradle/missing-javadoc.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ configure([
106106
project(":libs:opensearch-secure-sm"),
107107
project(":libs:opensearch-ssl-config"),
108108
project(":libs:opensearch-x-content"),
109-
project(":libs:agent-sm:agent-policy"),
110109
project(":modules:aggs-matrix-stats"),
111110
project(":modules:analysis-common"),
112111
project(":modules:geo"),

libs/agent-sm/agent-policy/build.gradle

-27
This file was deleted.

0 commit comments

Comments
 (0)