Skip to content

Commit fc802ea

Browse files
carlosdelestcarlosdelest
committed
Merge branch 'refs/heads/main' into carlosdelest/fix-synonyms-ci-tests-timeout
# Conflicts: # muted-tests.yml
2 parents 9744c20 + 78dd787 commit fc802ea

File tree

227 files changed

+8029
-4078
lines changed

Some content is hidden

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

227 files changed

+8029
-4078
lines changed

‎build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/GitInfoPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void apply(Project project) {
4444
gitInfo.disallowChanges();
4545
gitInfo.finalizeValueOnRead();
4646

47-
revision = gitInfo.map(info -> info.getRevision() == null ? info.getRevision() : "master");
47+
revision = gitInfo.map(info -> info.getRevision() == null ? info.getRevision() : "main");
4848
}
4949

5050
public Property<GitInfo> getGitInfo() {

‎build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/LicensingPlugin.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
public class LicensingPlugin implements Plugin<Project> {
2222
static final String ELASTIC_LICENSE_URL_PREFIX = "https://raw.githubusercontent.com/elastic/elasticsearch/";
2323
static final String ELASTIC_LICENSE_URL_POSTFIX = "/licenses/ELASTIC-LICENSE-2.0.txt";
24+
static final String AGPL_ELASTIC_LICENSE_URL_POSTFIX = "/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt";
2425

2526
private ProviderFactory providerFactory;
2627

@@ -36,15 +37,18 @@ public void apply(Project project) {
3637
isSnapshotVersion(project) ? revision.get() : "v" + project.getVersion()
3738
);
3839

39-
Provider<String> projectLicenseURL = licenseCommitProvider.map(licenseCommit -> ELASTIC_LICENSE_URL_PREFIX +
40+
Provider<String> elasticLicenseURL = licenseCommitProvider.map(licenseCommit -> ELASTIC_LICENSE_URL_PREFIX +
4041
licenseCommit + ELASTIC_LICENSE_URL_POSTFIX);
42+
Provider<String> agplLicenseURL = licenseCommitProvider.map(licenseCommit -> ELASTIC_LICENSE_URL_PREFIX +
43+
licenseCommit + AGPL_ELASTIC_LICENSE_URL_POSTFIX);
4144
// But stick the Elastic license url in project.ext so we can get it if we need to switch to it
42-
project.getExtensions().getExtraProperties().set("elasticLicenseUrl", projectLicenseURL);
45+
project.getExtensions().getExtraProperties().set("elasticLicenseUrl", elasticLicenseURL);
4346

4447
MapProperty<String, String> licensesProperty = project.getObjects().mapProperty(String.class, String.class).convention(
4548
providerFactory.provider(() -> Map.of(
4649
"Server Side Public License, v 1", "https://www.mongodb.com/licensing/server-side-public-license",
47-
"Elastic License 2.0", projectLicenseURL.get())
50+
"Elastic License 2.0", elasticLicenseURL.get(),
51+
"GNU Affero General Public License Version 3", agplLicenseURL.get())
4852
)
4953
);
5054

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
6969
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/ELASTIC-LICENSE-2.0.txt</url>
7070
<distribution>repo</distribution>
7171
</license>
72+
<license>
73+
<name>GNU Affero General Public License Version 3</name>
74+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
75+
<distribution>repo</distribution>
76+
</license>
7277
<license>
7378
<name>Server Side Public License, v 1</name>
7479
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
@@ -144,6 +149,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
144149
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/ELASTIC-LICENSE-2.0.txt</url>
145150
<distribution>repo</distribution>
146151
</license>
152+
<license>
153+
<name>GNU Affero General Public License Version 3</name>
154+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
155+
<distribution>repo</distribution>
156+
</license>
147157
<license>
148158
<name>Server Side Public License, v 1</name>
149159
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
@@ -228,6 +238,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
228238
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/ELASTIC-LICENSE-2.0.txt</url>
229239
<distribution>repo</distribution>
230240
</license>
241+
<license>
242+
<name>GNU Affero General Public License Version 3</name>
243+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
244+
<distribution>repo</distribution>
245+
</license>
231246
<license>
232247
<name>Server Side Public License, v 1</name>
233248
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
@@ -321,6 +336,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
321336
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/ELASTIC-LICENSE-2.0.txt</url>
322337
<distribution>repo</distribution>
323338
</license>
339+
<license>
340+
<name>GNU Affero General Public License Version 3</name>
341+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
342+
<distribution>repo</distribution>
343+
</license>
324344
<license>
325345
<name>Server Side Public License, v 1</name>
326346
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
@@ -394,6 +414,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
394414
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v2.0/licenses/ELASTIC-LICENSE-2.0.txt</url>
395415
<distribution>repo</distribution>
396416
</license>
417+
<license>
418+
<name>GNU Affero General Public License Version 3</name>
419+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v2.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
420+
<distribution>repo</distribution>
421+
</license>
397422
<license>
398423
<name>Server Side Public License, v 1</name>
399424
<url>https://www.mongodb.com/licensing/server-side-public-license</url>

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public enum DockerBase {
3131
// Chainguard based wolfi image with latest jdk
3232
// This is usually updated via renovatebot
3333
// spotless:off
34-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0",
34+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:90888b190da54062f67f3fef1372eb0ae7d81ea55f5a1f56d748b13e4853d984",
3535
"-wolfi",
3636
"apk"
3737
),

‎distribution/docker/src/docker/Dockerfile.ess‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ USER root
2525

2626
COPY plugins/*.zip /opt/plugins/archive/
2727

28-
RUN chown root.root /opt/plugins/archive/*
28+
RUN chown 1000:1000 /opt/plugins/archive/*
2929
RUN chmod 0444 /opt/plugins/archive/*
3030

3131
FROM ${base_image}

‎docs/changelog/112905.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112905
2+
summary: "[ES|QL] Named parameter for field names and field name patterns"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/114109.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114109
2+
summary: Update cluster stats for retrievers
3+
area: Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/114303.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 114303
2+
summary: Fix TDigestState.read CB leaks
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 114194

‎docs/changelog/114309.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 114309
2+
summary: Upgrade to AWS SDK v2
3+
area: Machine Learning
4+
type: enhancement
5+
issues:
6+
- 110590

‎docs/changelog/114358.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114358
2+
summary: "ESQL: Use less memory in listener"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)