Skip to content

Commit 64054de

Browse files
authored
Rename bootstrap package in core jar (#73788)
The org.elasticsearch.bootstrap package exists in server with classes for starting up Elasticsearch. The elasticsearch-core jar has a handful of classes that were split out from there, namely java version parsing and jarhell. This commit moves those classes to a new org.elasticsearch.jdk package so as to not split the server owned bootstrap package. relates #73784
1 parent e81323e commit 64054de

File tree

47 files changed

+46
-41
lines changed

Some content is hidden

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

47 files changed

+46
-41
lines changed

build-tools-internal/src/integTest/java/org/elasticsearch/gradle/internal/test/TestClasspathUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static void setupJarJdkClasspath(File projectRoot, String errorMessage) {
3838
private static void generateJdkJarHellCheck(File projectRoot, Implementation mainImplementation) {
3939
DynamicType.Unloaded<?> dynamicType = new ByteBuddy()
4040
.subclass(Object.class)
41-
.name("org.elasticsearch.bootstrap.JdkJarHellCheck")
41+
.name("org.elasticsearch.jdk.JdkJarHellCheck")
4242
.defineMethod("main", void.class, Visibility.PUBLIC, Ownership.STATIC)
4343
.withParameters(String[].class)
4444
.intercept(mainImplementation)

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class ThirdPartyAuditTask extends DefaultTask {
6464
CliMain.EXIT_VIOLATION,
6565
CliMain.EXIT_UNSUPPORTED_JDK
6666
);
67-
private static final String JDK_JAR_HELL_MAIN_CLASS = "org.elasticsearch.bootstrap.JdkJarHellCheck";
67+
private static final String JDK_JAR_HELL_MAIN_CLASS = "org.elasticsearch.jdk.JdkJarHellCheck";
6868

6969
private Set<String> missingClassExcludes = new TreeSet<>();
7070

build-tools/src/main/java/org/elasticsearch/gradle/jarhell/JarHellTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public File getSuccessMarker() {
5454
public void runJarHellCheck() throws IOException{
5555
LoggedExec.javaexec(execOperations, spec -> {
5656
spec.environment("CLASSPATH", getJarHellRuntimeClasspath().plus(getClasspath()).getAsPath());
57-
spec.setMain("org.elasticsearch.bootstrap.JarHell");
57+
spec.setMain("org.elasticsearch.jdk.JarHell");
5858
});
5959
writeMarker();
6060
}

build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/TestClasspathUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class TestClasspathUtils {
2424
public static void setupJarJdkClasspath(File projectRoot) {
2525
try {
2626
URL originLocation = TestClasspathUtils.class.getClassLoader()
27-
.loadClass("org.elasticsearch.bootstrap.JdkJarHellCheck")
27+
.loadClass("org.elasticsearch.jdk.JdkJarHellCheck")
2828
.getProtectionDomain()
2929
.getCodeSource()
3030
.getLocation();

distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
2727
import org.elasticsearch.Build;
2828
import org.elasticsearch.Version;
29-
import org.elasticsearch.bootstrap.JarHell;
29+
import org.elasticsearch.jdk.JarHell;
3030
import org.elasticsearch.bootstrap.PluginPolicyInfo;
3131
import org.elasticsearch.bootstrap.PolicyUtil;
3232
import org.elasticsearch.cli.EnvironmentAwareCommand;

libs/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java renamed to libs/core/src/main/java/org/elasticsearch/jdk/JarHell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.bootstrap;
9+
package org.elasticsearch.jdk;
1010

1111
import org.elasticsearch.common.SuppressForbidden;
1212
import org.elasticsearch.common.io.PathUtils;

libs/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java renamed to libs/core/src/main/java/org/elasticsearch/jdk/JavaVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.bootstrap;
9+
package org.elasticsearch.jdk;
1010

1111
import java.math.BigInteger;
1212
import java.util.ArrayList;

libs/core/src/main/java/org/elasticsearch/bootstrap/JdkJarHellCheck.java renamed to libs/core/src/main/java/org/elasticsearch/jdk/JdkJarHellCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* in compliance with, at your election, the Elastic License 2.0 or the Server
66
* Side Public License, v 1.
77
*/
8-
package org.elasticsearch.bootstrap;
8+
package org.elasticsearch.jdk;
99

1010
import org.elasticsearch.common.SuppressForbidden;
1111

libs/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java renamed to libs/core/src/test/java/org/elasticsearch/jdk/JarHellTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.bootstrap;
9+
package org.elasticsearch.jdk;
1010

1111
import org.elasticsearch.common.Strings;
1212
import org.elasticsearch.common.io.PathUtils;

0 commit comments

Comments
 (0)