Skip to content
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
eb1ce9d
WIP: Use Java 15 text blocks for multiline strings
arteam Nov 25, 2021
6c7e6e9
Migrate escaped JSON requests to text blocks
arteam Nov 20, 2021
3348c4e
Run spotless
arteam Dec 7, 2021
119287a
Fix the length of the json input
arteam Dec 7, 2021
2465c22
Update server/src/main/java/org/elasticsearch/transport/RemoteConnect…
arteam Dec 7, 2021
0df1987
Update server/src/test/java/org/elasticsearch/action/admin/indices/cr…
arteam Dec 7, 2021
d6dc264
Update server/src/main/java/org/elasticsearch/indices/SystemIndices.java
arteam Dec 7, 2021
c1dc99a
Update server/src/main/java/org/elasticsearch/index/shard/RemoveCorru…
arteam Dec 7, 2021
0183417
Update server/src/main/java/org/elasticsearch/index/mapper/KeywordFie…
arteam Dec 7, 2021
37b0abe
Update server/src/main/java/org/elasticsearch/search/aggregations/buc…
arteam Dec 7, 2021
cd74d0d
Update server/src/main/java/org/elasticsearch/index/mapper/KeywordFie…
arteam Dec 7, 2021
8ac3e43
Update server/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
arteam Dec 7, 2021
553df8a
Update server/src/internalClusterTest/java/org/elasticsearch/search/n…
arteam Dec 7, 2021
d93ebd6
Update server/src/internalClusterTest/java/org/elasticsearch/search/n…
arteam Dec 7, 2021
5a41e24
Update server/src/test/java/org/elasticsearch/action/admin/indices/cr…
arteam Dec 7, 2021
3aaeaf7
Update server/src/internalClusterTest/java/org/elasticsearch/indices/…
arteam Dec 7, 2021
4e9848c
Update server/src/internalClusterTest/java/org/elasticsearch/indices/…
arteam Dec 7, 2021
c55d255
Update qa/os/src/test/java/org/elasticsearch/packaging/test/PackagesS…
arteam Dec 7, 2021
0220cf0
Update qa/mixed-cluster/src/test/java/org/elasticsearch/backwards/Sea…
arteam Dec 7, 2021
2e3f597
Update server/src/test/java/org/elasticsearch/action/delete/DeleteRes…
arteam Dec 7, 2021
eb8238d
Update server/src/test/java/org/elasticsearch/action/explain/ExplainR…
arteam Dec 7, 2021
93a87c3
Update server/src/test/java/org/elasticsearch/cluster/metadata/Metada…
arteam Dec 7, 2021
32afd7c
Update server/src/test/java/org/elasticsearch/common/logging/JsonThro…
arteam Dec 7, 2021
3019b16
Update server/src/test/java/org/elasticsearch/index/mapper/DynamicTem…
arteam Dec 7, 2021
06d60cf
Update server/src/test/java/org/elasticsearch/cluster/metadata/Metada…
arteam Dec 7, 2021
de48493
Update server/src/test/java/org/elasticsearch/cluster/metadata/Metada…
arteam Dec 7, 2021
4750fc8
Update server/src/test/java/org/elasticsearch/index/mapper/FieldFilte…
arteam Dec 7, 2021
6037548
Update server/src/test/java/org/elasticsearch/index/mapper/Parametriz…
arteam Dec 7, 2021
c8bb650
Update server/src/test/java/org/elasticsearch/index/mapper/Parametriz…
arteam Dec 7, 2021
ffbd52e
Run spotless
arteam Dec 7, 2021
ee14c7e
Update server/src/test/java/org/elasticsearch/index/query/PrefixQuery…
arteam Dec 8, 2021
d663ba2
Update server/src/test/java/org/elasticsearch/index/query/functionsco…
arteam Dec 8, 2021
03a866c
Update server/src/test/java/org/elasticsearch/index/query/ScriptScore…
arteam Dec 8, 2021
e589a5c
Update server/src/test/java/org/elasticsearch/index/search/MultiMatch…
arteam Dec 8, 2021
ae7be23
Update server/src/test/java/org/elasticsearch/search/builder/SearchSo…
arteam Dec 8, 2021
d8d0a6d
Update server/src/test/java/org/elasticsearch/search/builder/SearchSo…
arteam Dec 8, 2021
9eb70ce
Update server/src/test/java/org/elasticsearch/search/fetch/subphase/h…
arteam Dec 8, 2021
68e7095
Update server/src/test/java/org/elasticsearch/search/fetch/subphase/h…
arteam Dec 8, 2021
6d4d846
Update build-tools-internal/src/main/java/org/elasticsearch/gradle/in…
arteam Dec 8, 2021
9aee3f5
Update build-tools-internal/src/main/java/org/elasticsearch/gradle/in…
arteam Dec 8, 2021
c90b23c
Fix tests
arteam Dec 8, 2021
53366bb
Update client/rest-high-level/src/test/java/org/elasticsearch/client/…
arteam Dec 8, 2021
fc1393d
Update modules/lang-mustache/src/test/java/org/elasticsearch/script/m…
arteam Dec 8, 2021
de31e37
Update client/rest-high-level/src/test/java/org/elasticsearch/client/…
arteam Dec 8, 2021
b7d1753
Update client/rest-high-level/src/test/java/org/elasticsearch/client/…
arteam Dec 8, 2021
aca8f7e
Update minor formatting things
arteam Dec 8, 2021
80e2a3a
Format more things
arteam Dec 8, 2021
5a6b065
Fix broken tests
arteam Dec 8, 2021
b1b3cb9
Update x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/j…
arteam Dec 9, 2021
9752d2d
Update x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/j…
arteam Dec 9, 2021
96d41c3
Update x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/j…
arteam Dec 9, 2021
3ec5955
Update x-pack/plugin/security/src/internalClusterTest/java/org/elasti…
arteam Dec 9, 2021
e527c2f
Update modules/rank-eval/src/test/java/org/elasticsearch/index/rankev…
arteam Dec 9, 2021
796e85e
Update x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xp…
arteam Dec 9, 2021
0c2d5cf
Update x-pack/plugin/text-structure/src/test/java/org/elasticsearch/x…
arteam Dec 9, 2021
a46de05
Extract \\R to a constant
arteam Dec 9, 2021
d8f0a5f
Reformat rebased changes
arteam Dec 9, 2021
a1af934
Run spotless
arteam Dec 9, 2021
1e3f599
Merge branch 'master' into use-text-blocks
elasticmachine Dec 14, 2021
b3d019f
Add missed import
arteam Dec 14, 2021
cea2276
Remove comma
arteam Dec 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -85,55 +85,46 @@ void generateDependenciesGraph() {
for (final Dependency dependency : runtimeDependencies) {
final String id = dependency.getGroup() + ":" + dependency.getName();
final String versionedId = id + "@" + dependency.getVersion();
final StringBuilder packageString = new StringBuilder();
final StringBuilder nodeString = new StringBuilder();
if (dependency instanceof ProjectDependency) {
continue;
}
packageString.append("{\"id\": \"")
.append(versionedId)
.append("\",\"info\": {\"name\": \"")
.append(id)
.append("\",\"version\": \"")
.append(dependency.getVersion())
.append("\"}}");
packages.add(packageString.toString());
nodeString.append("{\"nodeId\": \"")
.append(versionedId)
.append("\",\"pkgId\": \"")
.append(versionedId)
.append("\",\"deps\": []}");
packages.add("""
{"id": "%s","info": {"name": "%s","version": "%s"}}\
""".formatted(versionedId, id, dependency.getVersion()));
nodeString.append("""
{"nodeId": "%s","pkgId": "%s","deps": []}\
""".formatted(versionedId, versionedId));
nodes.add(nodeString.toString());
nodeIds.add("{\"nodeId\": \"" + versionedId + "\"}");
nodeIds.add("""
{"nodeId": "%s"}\
""".formatted(versionedId));
}
// We add one package and one node for each dependency, it suffices to check packages.
if (packages.size() > 0) {
final String projectName = "elastic/elasticsearch" + getProject().getPath();
final StringBuilder output = new StringBuilder();
output.append("{\"depGraph\": {\"schemaVersion\": \"1.2.0\",\"pkgManager\": {\"name\": \"gradle\"},\"pkgs\": [")
.append("{\"id\": \"")
.append(projectName)
.append("@0.0.0")
.append("\", \"info\": {\"name\": \"")
.append(projectName)
.append("\", \"version\": \"0.0.0\"}},")
.append(String.join(",", packages))
.append("],\"graph\": {\"rootNodeId\": \"")
.append(projectName)
.append("@0.0.0")
.append("\",\"nodes\": [")
.append("{\"nodeId\": \"")
.append(projectName)
.append("@0.0.0")
.append("\",\"pkgId\": \"")
.append(projectName)
.append("@0.0.0")
.append("\",\"deps\": [")
.append(String.join(",", nodeIds))
.append("]},")
.append(String.join(",", nodes))
.append("]}}}");
getLogger().debug("Dependency Graph: " + output.toString());
final String output = """
{
"depGraph": {
"schemaVersion": "1.2.0",
"pkgManager": {"name": "gradle"},
"pkgs": [
{
"id": "%[email protected]",
"info": {"name": "%1$s", "version": "0.0.0"}
},
%s
],
"graph": {
"rootNodeId": "%[email protected]",
"nodes": [
{ "nodeId": "%[email protected]","pkgId": "%[email protected]","deps": [%s] },
%s
]
}
}
}""".formatted(projectName, String.join(",", packages), String.join(",", nodeIds), String.join(",", nodes));
getLogger().debug("Dependency Graph: " + output);
try (CloseableHttpClient client = HttpClients.createDefault()) {
HttpPost postRequest = new HttpPost(url);
postRequest.addHeader("Authorization", "token " + token);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,11 @@ void failIfDockerUnavailable(List<String> tasks) {
// Some other problem, print the error
final String message = String.format(
Locale.ROOT,
"a problem occurred while using Docker from [%s]%s yet it is required to run the following task%s: \n%s\n"
+ "the problem is that Docker exited with exit code [%d] with standard error output:\n%s",
"""
a problem occurred while using Docker from [%s]%s yet it is required to run the following task%s:
%s
the problem is that Docker exited with exit code [%d] with standard error output:
%s""",
availability.path,
availability.version == null ? "" : " v" + availability.version,
tasks.size() > 1 ? "s" : "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,16 +318,11 @@ private void checkSha(File jar, String jarName, Set<File> shaFiles) throws NoSuc
String sha = getSha1(jar);

if (expectedSha.equals(sha) == false) {
final String exceptionMessage = String.format(
Locale.ROOT,
"SHA has changed! Expected %s for %s but got %s."
+ "\nThis usually indicates a corrupt dependency cache or artifacts changed upstream."
+ "\nEither wipe your cache, fix the upstream artifact, or delete %s and run updateShas",
expectedSha,
jarName,
sha,
shaFile
);
final String exceptionMessage = String.format(Locale.ROOT, """
SHA has changed! Expected %s for %s but got %s.
This usually indicates a corrupt dependency cache or artifacts changed upstream.
Either wipe your cache, fix the upstream artifact, or delete %s and run updateShas
""", expectedSha, jarName, sha, shaFile);

throw new GradleException(exceptionMessage);
}
Expand Down
Loading