forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into async-search-status-permission
- Loading branch information
Showing
735 changed files
with
16,117 additions
and
7,193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| BWC_VERSION: | ||
| - "7.17.19" | ||
| - "8.12.3" | ||
| - "8.13.0" | ||
| - "7.17.20" | ||
| - "8.13.1" | ||
| - "8.14.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,9 +7,6 @@ | |
| { | ||
| "branch": "8.13" | ||
| }, | ||
| { | ||
| "branch": "8.12" | ||
| }, | ||
| { | ||
| "branch": "7.17" | ||
| } | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
build-tools-internal/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 142 additions & 0 deletions
142
...src/main/java/org/elasticsearch/gradle/internal/shadow/XmlClassRelocationTransformer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.gradle.internal.shadow; | ||
|
|
||
| import com.github.jengelman.gradle.plugins.shadow.ShadowStats; | ||
| import com.github.jengelman.gradle.plugins.shadow.relocation.RelocateClassContext; | ||
| import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator; | ||
| import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer; | ||
| import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext; | ||
|
|
||
| import org.apache.commons.io.IOUtils; | ||
| import org.apache.tools.zip.ZipEntry; | ||
| import org.apache.tools.zip.ZipOutputStream; | ||
| import org.gradle.api.file.FileTreeElement; | ||
| import org.w3c.dom.Document; | ||
| import org.w3c.dom.Node; | ||
| import org.w3c.dom.NodeList; | ||
|
|
||
| import java.io.BufferedInputStream; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| import javax.xml.parsers.DocumentBuilder; | ||
| import javax.xml.parsers.DocumentBuilderFactory; | ||
| import javax.xml.transform.TransformerException; | ||
| import javax.xml.transform.TransformerFactory; | ||
| import javax.xml.transform.dom.DOMSource; | ||
| import javax.xml.transform.stream.StreamResult; | ||
|
|
||
| public class XmlClassRelocationTransformer implements Transformer { | ||
|
|
||
| boolean hasTransformedResource = false; | ||
|
|
||
| private Document doc; | ||
|
|
||
| private String resource; | ||
|
|
||
| @Override | ||
| public boolean canTransformResource(FileTreeElement element) { | ||
| String path = element.getRelativePath().getPathString(); | ||
| if (resource != null && resource.equals(path)) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public void transform(TransformerContext context) { | ||
| try { | ||
| BufferedInputStream bis = new BufferedInputStream(context.getIs()); | ||
| DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); | ||
| DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); | ||
| doc = dBuilder.parse(bis); | ||
| doc.getDocumentElement().normalize(); | ||
| Node root = doc.getDocumentElement(); | ||
| walkThroughNodes(root, context); | ||
| if (hasTransformedResource == false) { | ||
| this.doc = null; | ||
| } | ||
| } catch (Exception e) { | ||
| throw new RuntimeException("Error parsing xml file in " + context.getIs(), e); | ||
| } | ||
| } | ||
|
|
||
| private static String getRelocatedClass(String className, TransformerContext context) { | ||
| List<Relocator> relocators = context.getRelocators(); | ||
| ShadowStats stats = context.getStats(); | ||
| if (className != null && className.length() > 0 && relocators != null) { | ||
| for (Relocator relocator : relocators) { | ||
| if (relocator.canRelocateClass(className)) { | ||
| RelocateClassContext relocateClassContext = new RelocateClassContext(className, stats); | ||
| return relocator.relocateClass(relocateClassContext); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return className; | ||
| } | ||
|
|
||
| private void walkThroughNodes(Node node, TransformerContext context) { | ||
| if (node.getNodeType() == Node.TEXT_NODE) { | ||
| String nodeValue = node.getNodeValue(); | ||
| if (nodeValue.isBlank() == false) { | ||
| String relocatedClass = getRelocatedClass(nodeValue, context); | ||
| if (relocatedClass.equals(nodeValue) == false) { | ||
| node.setNodeValue(relocatedClass); | ||
| hasTransformedResource = true; | ||
| } | ||
| } | ||
| } | ||
| NodeList nodeList = node.getChildNodes(); | ||
| for (int i = 0; i < nodeList.getLength(); i++) { | ||
| Node currentNode = nodeList.item(i); | ||
| walkThroughNodes(currentNode, context); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasTransformedResource() { | ||
| return hasTransformedResource; | ||
| } | ||
|
|
||
| @Override | ||
| public void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) { | ||
| ZipEntry entry = new ZipEntry(resource); | ||
| entry.setTime(TransformerContext.getEntryTimestamp(preserveFileTimestamps, entry.getTime())); | ||
|
|
||
| try { | ||
| // Write the content back to the XML file | ||
| TransformerFactory transformerFactory = TransformerFactory.newInstance(); | ||
| DOMSource source = new DOMSource(doc); | ||
|
|
||
| // Result stream will be a ByteArrayOutputStream | ||
| ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| StreamResult result = new StreamResult(baos); | ||
| // Do the transformation and serialization | ||
| transformerFactory.newTransformer().transform(source, result); | ||
| os.putNextEntry(entry); | ||
| IOUtils.write(baos.toByteArray(), os); | ||
| os.closeEntry(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } catch (TransformerException e) { | ||
| throw new RuntimeException(e); | ||
| } finally { | ||
| hasTransformedResource = false; | ||
| doc = null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return getClass().getSimpleName(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 8.6 | ||
| 8.7 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.