Skip to content

Commit 0f8628c

Browse files
elasticmachineelasticmachine
authored
Merge branch '9.0' into backport/9.0/pr-122293
2 parents fb621c4 + dc4e8f4 commit 0f8628c

File tree

25 files changed

+718
-215
lines changed

25 files changed

+718
-215
lines changed

‎build-tools-internal/src/main/groovy/elasticsearch.ide.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
163163
tasks.register('buildDependencyArtifacts') {
164164
group = 'ide'
165165
description = 'Builds artifacts needed as dependency for IDE modules'
166-
dependsOn([':plugins:repository-hdfs:hadoop-client-api:jar',
167-
':x-pack:plugin:esql:compute:ann:jar',
166+
dependsOn([':x-pack:plugin:esql:compute:ann:jar',
168167
':x-pack:plugin:esql:compute:gen:jar',
169168
':server:generateModulesList',
170169
':server:generatePluginsList',

‎docs/changelog/122247.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122247
2+
summary: Improve jwt logging on failed auth
3+
area: Authentication
4+
type: bug
5+
issues: []

‎docs/changelog/122601.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 122601
2+
summary: Implicit numeric casting for CASE/GREATEST/LEAST
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 121890

‎docs/changelog/122737.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122737
2+
summary: Bump json-smart and oauth2-oidc-sdk
3+
area: Authentication
4+
type: upgrade
5+
issues: []

‎docs/changelog/122905.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 122905
2+
summary: Updating `TransportRolloverAction.checkBlock` so that non-write-index blocks
3+
do not prevent data stream rollover
4+
area: Data streams
5+
type: bug
6+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 14 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -984,36 +984,19 @@
984984
<sha256 value="e8c1c594e2425bdbea2d860de55c69b69fc5d59454452449a0f0913c2a5b8a31" origin="Generated by Gradle"/>
985985
</artifact>
986986
</component>
987+
<component group="com.nimbusds" name="nimbus-jose-jwt" version="10.0.1">
988+
<artifact name="nimbus-jose-jwt-10.0.1.jar">
989+
<sha256 value="f28dbd9ab128324f05050d76b78469d3a9cd83e0319aabc68d1c276e3923e13a" origin="Generated by Gradle"/>
990+
</artifact>
991+
</component>
987992
<component group="com.nimbusds" name="nimbus-jose-jwt" version="4.41.1">
988993
<artifact name="nimbus-jose-jwt-4.41.1.jar">
989994
<sha256 value="fbfd0d5f2b2f86758b821daa5e79b5d7c965edd9dc1b2cc80b515df1c6ddc22d" origin="Generated by Gradle"/>
990995
</artifact>
991996
</component>
992-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="9.37.3">
993-
<artifact name="nimbus-jose-jwt-9.37.3.jar">
994-
<sha256 value="12ae4a3a260095d7aeba2adea7ae396e8b9570db8b7b409e09a824c219cc0444" origin="Generated by Gradle">
995-
<also-trust value="afc63b689d881439b95f343b1dca750391edac63b87392be4d90d19c94ccafbe"/>
996-
</sha256>
997-
</artifact>
998-
</component>
999-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="9.8.1">
1000-
<artifact name="nimbus-jose-jwt-9.8.1.jar">
1001-
<sha256 value="7664cf8c6f2adadf600287812b32878277beda54912eab9d4c2932cd50cb704a" origin="Generated by Gradle"/>
1002-
</artifact>
1003-
</component>
1004-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.10.1">
1005-
<artifact name="oauth2-oidc-sdk-11.10.1.jar">
1006-
<sha256 value="9e51b2c17503cdd3eb97f41491c712aff7783bb3c67185d789f44ccf2a603b26" origin="Generated by Gradle"/>
1007-
</artifact>
1008-
</component>
1009-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.9.1">
1010-
<artifact name="oauth2-oidc-sdk-11.9.1.jar">
1011-
<sha256 value="0820c9690966304d075347b88e81ae490213440fc4d2c84f3d370d41941b2b9c" origin="Generated by Gradle"/>
1012-
</artifact>
1013-
</component>
1014-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="9.37">
1015-
<artifact name="oauth2-oidc-sdk-9.37.jar">
1016-
<sha256 value="44a04bbed5ae3f6d198aa73ee6b545c476e528ec1a267ef3e9f7033f886dd6fe" origin="Generated by Gradle"/>
997+
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.22.2">
998+
<artifact name="oauth2-oidc-sdk-11.22.2.jar">
999+
<sha256 value="64fab42f17bf8e0efb193dd34da716ef7abb7515234036119df1776b808dc066" origin="Generated by Gradle"/>
10171000
</artifact>
10181001
</component>
10191002
<component group="com.perforce" name="p4java" version="2015.2.1365273">
@@ -1779,34 +1762,24 @@
17791762
<sha256 value="0972bbc99437c4163acd09b630e6c77eab4cfab8a9594621c95466c0c6645396" origin="Generated by Gradle"/>
17801763
</artifact>
17811764
</component>
1782-
<component group="net.minidev" name="accessors-smart" version="2.5.0">
1783-
<artifact name="accessors-smart-2.5.0.jar">
1784-
<sha256 value="12314fc6881d66a413fd66370787adba16e504fbf7e138690b0f3952e3fbd321" origin="Generated by Gradle"/>
1765+
<component group="net.minidev" name="accessors-smart" version="2.5.2">
1766+
<artifact name="accessors-smart-2.5.2.jar">
1767+
<sha256 value="9b8a7bc43861d6156c021166d941fb7dddbe4463e2fa5ee88077e4b01452a836" origin="Generated by Gradle"/>
17851768
</artifact>
17861769
</component>
17871770
<component group="net.minidev" name="json-smart" version="2.3">
17881771
<artifact name="json-smart-2.3.jar">
17891772
<sha256 value="903f48c8aa4c3f6426440b8d32de89fa1dc23b1169abde25e4e1d068aa67708b" origin="Generated by Gradle"/>
17901773
</artifact>
17911774
</component>
1792-
<component group="net.minidev" name="json-smart" version="2.4.10">
1793-
<artifact name="json-smart-2.4.10.jar">
1794-
<sha256 value="70cab5e9488630dc631b1fc6e7fa550d95cddd19ba14db39ceca7cabfbd4e5ae" origin="Generated by Gradle"/>
1795-
</artifact>
1796-
</component>
17971775
<component group="net.minidev" name="json-smart" version="2.4.2">
17981776
<artifact name="json-smart-2.4.2.jar">
17991777
<sha256 value="64072f56d9dff5040b2acec477c5d5e6bcebfc88c508f12acb26072d07942146" origin="Generated by Gradle"/>
18001778
</artifact>
18011779
</component>
1802-
<component group="net.minidev" name="json-smart" version="2.5.0">
1803-
<artifact name="json-smart-2.5.0.jar">
1804-
<sha256 value="432b9e545848c4141b80717b26e367f83bf33f19250a228ce75da6e967da2bc7" origin="Generated by Gradle"/>
1805-
</artifact>
1806-
</component>
1807-
<component group="net.minidev" name="json-smart" version="2.5.1">
1808-
<artifact name="json-smart-2.5.1.jar">
1809-
<sha256 value="86c0c189581b79b57b0719f443a724e9f628ffbb9eef645cf79194f5973a1001" origin="Generated by Gradle"/>
1780+
<component group="net.minidev" name="json-smart" version="2.5.2">
1781+
<artifact name="json-smart-2.5.2.jar">
1782+
<sha256 value="4fbdedb0105cedc7f766b95c297d2e88fb6a560da48f3bbaa0cc538ea8b7bf71" origin="Generated by Gradle"/>
18101783
</artifact>
18111784
</component>
18121785
<component group="net.nextencia" name="rrdiagram" version="0.9.4">
@@ -4408,31 +4381,6 @@
44084381
<sha256 value="ca5b8d11569e53921b0e3486469e7c674361c79845dad3d514f38ab6e0c8c10a" origin="Generated by Gradle"/>
44094382
</artifact>
44104383
</component>
4411-
<component group="org.ow2.asm" name="asm" version="9.2">
4412-
<artifact name="asm-9.2.jar">
4413-
<sha256 value="b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5" origin="Generated by Gradle"/>
4414-
</artifact>
4415-
</component>
4416-
<component group="org.ow2.asm" name="asm" version="9.3">
4417-
<artifact name="asm-9.3.jar">
4418-
<sha256 value="1263369b59e29c943918de11d6d6152e2ec6085ce63e5710516f8c67d368e4bc" origin="Generated by Gradle"/>
4419-
</artifact>
4420-
</component>
4421-
<component group="org.ow2.asm" name="asm" version="9.4">
4422-
<artifact name="asm-9.4.jar">
4423-
<sha256 value="39d0e2b3dc45af65a09b097945750a94a126e052e124f93468443a1d0e15f381" origin="Generated by Gradle"/>
4424-
</artifact>
4425-
</component>
4426-
<component group="org.ow2.asm" name="asm" version="9.5">
4427-
<artifact name="asm-9.5.jar">
4428-
<sha256 value="b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" origin="Generated by Gradle"/>
4429-
</artifact>
4430-
</component>
4431-
<component group="org.ow2.asm" name="asm" version="9.6">
4432-
<artifact name="asm-9.6.jar">
4433-
<sha256 value="3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1" origin="Generated by Gradle"/>
4434-
</artifact>
4435-
</component>
44364384
<component group="org.ow2.asm" name="asm" version="9.7.1">
44374385
<artifact name="asm-9.7.1.jar">
44384386
<sha256 value="8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" origin="Generated by Gradle"/>

‎modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
import static org.elasticsearch.index.IndexSettings.LIFECYCLE_ORIGINATION_DATE;
105105
import static org.elasticsearch.indices.ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE;
106106
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
107+
import static org.hamcrest.Matchers.contains;
107108
import static org.hamcrest.Matchers.containsInAnyOrder;
108109
import static org.hamcrest.Matchers.containsString;
109110
import static org.hamcrest.Matchers.equalTo;
@@ -785,14 +786,10 @@ public void testErrorRecordingOnRetention() throws Exception {
785786
).get();
786787
DataStreamLifecycleHealthInfo dslHealthInfoOnHealthNode = healthNodeResponse.getHealthInfo().dslHealthInfo();
787788
assertThat(dslHealthInfoOnHealthNode, is(not(DataStreamLifecycleHealthInfo.NO_DSL_ERRORS)));
788-
// perhaps surprisingly rollover and delete are error-ing due to the read_only block on the first generation
789-
// index which prevents metadata updates so rolling over the data stream is also blocked (note that both indices error at
790-
// the same time so they'll have an equal retry count - the order becomes of the results, usually ordered by retry count,
791-
// becomes non deterministic, hence the dynamic matching of index name)
792-
assertThat(dslHealthInfoOnHealthNode.dslErrorsInfo().size(), is(2));
789+
assertThat(dslHealthInfoOnHealthNode.dslErrorsInfo().size(), is(1));
793790
DslErrorInfo errorInfo = dslHealthInfoOnHealthNode.dslErrorsInfo().get(0);
794791
assertThat(errorInfo.retryCount(), greaterThanOrEqualTo(3));
795-
assertThat(List.of(firstGenerationIndex, secondGenerationIndex).contains(errorInfo.indexName()), is(true));
792+
assertThat(errorInfo.indexName(), equalTo(firstGenerationIndex));
796793
});
797794

798795
GetHealthAction.Response healthResponse = client().execute(GetHealthAction.INSTANCE, new GetHealthAction.Request(true, 1000))
@@ -808,15 +805,12 @@ public void testErrorRecordingOnRetention() throws Exception {
808805
assertThat(dslIndicator.impacts(), is(STAGNATING_INDEX_IMPACT));
809806
assertThat(
810807
dslIndicator.symptom(),
811-
is("2 backing indices have repeatedly encountered errors whilst trying to advance in its lifecycle")
808+
is("A backing index has repeatedly encountered errors whilst trying to advance in its lifecycle")
812809
);
813810

814811
Diagnosis diagnosis = dslIndicator.diagnosisList().get(0);
815812
assertThat(diagnosis.definition(), is(STAGNATING_BACKING_INDICES_DIAGNOSIS_DEF));
816-
assertThat(
817-
diagnosis.affectedResources().get(0).getValues(),
818-
containsInAnyOrder(firstGenerationIndex, secondGenerationIndex)
819-
);
813+
assertThat(diagnosis.affectedResources().get(0).getValues(), contains(firstGenerationIndex));
820814
}
821815

822816
// let's mark the index as writeable and make sure it's deleted and the error store is empty

‎modules/repository-azure/build.gradle‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ dependencies {
6363
api "com.github.stephenc.jcip:jcip-annotations:1.0-1"
6464
api "com.nimbusds:content-type:2.3"
6565
api "com.nimbusds:lang-tag:1.7"
66-
api("com.nimbusds:nimbus-jose-jwt:9.37.3"){
66+
api("com.nimbusds:nimbus-jose-jwt:10.0.1"){
6767
exclude group: 'com.google.crypto.tink', module: 'tink' // it's an optional dependency on which we don't rely
6868
}
69-
api("com.nimbusds:oauth2-oidc-sdk:11.9.1"){
69+
api("com.nimbusds:oauth2-oidc-sdk:11.22.2"){
7070
exclude group: 'com.google.crypto.tink', module: 'tink' // it's an optional dependency on which we don't rely
7171
}
7272
api "jakarta.activation:jakarta.activation-api:1.2.1"
7373
api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
7474
api "net.java.dev.jna:jna-platform:${versions.jna}" // Maven says 5.14.0 but this aligns with the Elasticsearch-wide version
7575
api "net.java.dev.jna:jna:${versions.jna}" // Maven says 5.14.0 but this aligns with the Elasticsearch-wide version
76-
api "net.minidev:accessors-smart:2.5.0"
77-
api "net.minidev:json-smart:2.5.0"
76+
api "net.minidev:accessors-smart:2.5.2"
77+
api "net.minidev:json-smart:2.5.2"
7878
api "org.codehaus.woodstox:stax2-api:4.2.2"
79-
api "org.ow2.asm:asm:9.3"
79+
api "org.ow2.asm:asm:9.7.1"
8080

8181
runtimeOnly "com.google.code.gson:gson:2.11.0"
8282
runtimeOnly "org.cryptomator:siv-mode:1.5.2"
@@ -190,11 +190,6 @@ tasks.named("thirdPartyAudit").configure {
190190
'org.bouncycastle.cert.X509CertificateHolder',
191191
'org.bouncycastle.cert.jcajce.JcaX509CertificateHolder',
192192
'org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder',
193-
'org.bouncycastle.crypto.InvalidCipherTextException',
194-
'org.bouncycastle.crypto.engines.AESEngine',
195-
'org.bouncycastle.crypto.modes.GCMBlockCipher',
196-
'org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider',
197-
'org.bouncycastle.jce.provider.BouncyCastleProvider',
198193
'org.bouncycastle.openssl.PEMKeyPair',
199194
'org.bouncycastle.openssl.PEMParser',
200195
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',

‎qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeRollingUpgradeIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class LogsIndexModeRollingUpgradeIT extends AbstractRollingUpgradeTestCas
4040
.module("x-pack-aggregate-metric")
4141
.module("x-pack-stack")
4242
.setting("xpack.security.enabled", "false")
43-
.setting("xpack.license.self_generated.type", "trial")
43+
.setting("xpack.license.self_generated.type", initTestSeed().nextBoolean() ? "trial" : "basic")
4444
// We upgrade from standard to logsdb, so we need to start with logsdb disabled,
4545
// then later cluster.logsdb.enabled gets set to true and next rollover data stream is in logsdb mode.
4646
.setting("cluster.logsdb.enabled", "false")

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.help.json‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@
1818
]
1919
}
2020
]
21-
},
22-
"params":{
23-
"help":{
24-
"type":"boolean",
25-
"description":"Return help information",
26-
"default":false
27-
},
28-
"s":{
29-
"type":"list",
30-
"description":"Comma-separated list of column names or column aliases to sort by"
31-
}
3221
}
3322
}
3423
}

0 commit comments

Comments
 (0)