Skip to content

Commit 902f998

Browse files
committed
Merge branch '7.x' into enforce-default-tier-preference-checks
2 parents ac950dc + 55185fc commit 902f998

140 files changed

Lines changed: 3928 additions & 3181 deletions

File tree

Some content is hidden

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

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ private Object[] getTargets(String projectPath) {
120120
":libs:elasticsearch-dissect",
121121
":libs:elasticsearch-geo",
122122
":libs:elasticsearch-grok",
123+
":libs:elasticsearch-lz4",
123124
":libs:elasticsearch-nio",
124125
":libs:elasticsearch-plugin-classloader",
125126
":libs:elasticsearch-secure-sm",

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersTask.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void setExcludes(List<String> excludes) {
110110
* Allowed license families for this project.
111111
*/
112112
@Input
113-
private List<String> approvedLicenses = new ArrayList<String>(Arrays.asList("SSPL+Elastic License", "Generated", "Vendored"));
113+
private List<String> approvedLicenses = new ArrayList<String>(Arrays.asList("SSPL+Elastic License", "Generated", "Vendored", "Apache LZ4-Java"));
114114
/**
115115
* Files that should be excluded from the license header check. Use with extreme care, only in situations where the license on the
116116
* source file is compatible with the codebase but we do not want to add the license to the list of approved headers (to avoid the
@@ -154,6 +154,8 @@ public void runRat() {
154154
matchers.add(subStringMatcher("BSD4 ", "Original BSD License (with advertising clause)", "All advertising materials"));
155155
// Apache
156156
matchers.add(subStringMatcher("AL ", "Apache", "Licensed to Elasticsearch B.V. under one or more contributor"));
157+
// Apache lz4-java
158+
matchers.add(subStringMatcher("ALLZ4", "Apache LZ4-Java", "Copyright 2020 Adrien Grand and the lz4-java contributors"));
157159
// Generated resources
158160
matchers.add(subStringMatcher("GEN ", "Generated", "ANTLR GENERATED CODE"));
159161
// Vendored Code

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 7.16.0
2-
lucene = 8.10.0
2+
lucene = 8.10.1
33

44
bundled_jdk_vendor = adoptium
55
bundled_jdk = 17+35

docs/Versions.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
33

4-
:lucene_version: 8.10.0
5-
:lucene_version_path: 8_10_0
4+
:lucene_version: 8.10.1
5+
:lucene_version_path: 8_10_1
66
:jdk: 1.8.0_131
77
:jdk_major: 8
88
:build_flavor: default

docs/reference/getting-started.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ include::{es-repo-dir}/tab-widgets/quick-start-cleanup-widget.asciidoc[]
510510

511511
* Use {fleet} and {agent} to collect logs and metrics directly from your data
512512
sources and send them to {es}. See the
513-
{fleet-guide}/fleet-quick-start.html[{fleet} quick start guide].
513+
{observability-guide}/ingest-logs-metrics-uptime.html[Ingest logs, metrics, and uptime data with {agent}].
514514

515515
* Use {kib} to explore, visualize, and manage your {es} data. See the
516516
{kibana-ref}/get-started.html[{kib} quick start guide].

docs/reference/ingest.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@ If you run {agent} standalone, you can apply pipelines using an
434434
<<index-default-pipeline,`index.default_pipeline`>> or
435435
<<index-final-pipeline,`index.final_pipeline`>> index setting. Alternatively,
436436
you can specify the `pipeline` policy setting in your `elastic-agent.yml`
437-
configuration. See {fleet-guide}/run-elastic-agent-standalone.html[Run {agent}
438-
standalone].
437+
configuration. See {fleet-guide}/install-standalone-elastic-agent.html[Install standalone {agent}s].
439438

440439
[discrete]
441440
[[access-source-fields]]

libs/lz4/build.gradle

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
import org.elasticsearch.gradle.internal.info.BuildParams
2+
3+
/*
4+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
5+
* or more contributor license agreements. Licensed under the Elastic License
6+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
7+
* in compliance with, at your election, the Elastic License 2.0 or the Server
8+
* Side Public License, v 1.
9+
*/
10+
apply plugin: 'elasticsearch.publish'
11+
12+
// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs
13+
if (!isEclipse) {
14+
sourceSets {
15+
java9 {
16+
java {
17+
srcDirs = ['src/main/java9']
18+
}
19+
}
20+
}
21+
22+
configurations {
23+
java9Compile.extendsFrom(compile)
24+
}
25+
26+
dependencies {
27+
java9Implementation sourceSets.main.output
28+
java9Implementation 'org.lz4:lz4-java:1.8.0'
29+
}
30+
31+
tasks.named('compileJava9Java').configure {
32+
sourceCompatibility = 9
33+
targetCompatibility = 9
34+
}
35+
36+
tasks.named('forbiddenApisJava9').configure {
37+
if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_1_9) {
38+
targetCompatibility = JavaVersion.VERSION_1_9.getMajorVersion()
39+
}
40+
replaceSignatureFiles 'jdk-signatures'
41+
}
42+
43+
tasks.named('jar').configure {
44+
metaInf {
45+
into 'versions/9'
46+
from sourceSets.java9.output
47+
}
48+
manifest.attributes('Multi-Release': 'true')
49+
}
50+
}
51+
52+
sourceSets {
53+
test {
54+
runtimeClasspath = project.objects.fileCollection().from(
55+
output,
56+
tasks.named('jar'),
57+
project.configurations.testRuntimeClasspath)
58+
}
59+
}
60+
61+
dependencies {
62+
api 'org.lz4:lz4-java:1.8.0'
63+
api project(':libs:elasticsearch-core')
64+
65+
testImplementation(project(":test:framework")) {
66+
exclude group: 'org.elasticsearch', module: 'elasticsearch-lz4'
67+
}
68+
}
69+
70+
tasks.named("forbiddenPatterns").configure {
71+
exclude '**/*.binary'
72+
}
73+
74+
tasks.named('forbiddenApisMain').configure {
75+
// lz4 does not depend on core, so only jdk signatures should be checked
76+
replaceSignatureFiles 'jdk-signatures'
77+
}
78+
79+
tasks.named("thirdPartyAudit").configure {
80+
ignoreViolations(
81+
// from java-lz4
82+
'net.jpountz.util.UnsafeUtils'
83+
)
84+
}

0 commit comments

Comments
 (0)