[JPMS Support] Refactor :libs module bootstrap package to eliminate top level split packages

CHANGELOG-3.0.md

@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add task completion count in search backpressure stats API ([#10028](https://github.com/opensearch-project/OpenSearch/pull/10028/))
 - Deprecate CamelCase `PathHierarchy` tokenizer name in favor to lowercase `path_hierarchy` ([#10894](https://github.com/opensearch-project/OpenSearch/pull/10894))
 - Breaking change: Do not request "search_pipelines" metrics by default in NodesInfoRequest ([#12497](https://github.com/opensearch-project/OpenSearch/pull/12497))
+- Refactor `:libs` module `bootstrap` package to eliminate top level split packages [#17117](https://github.com/opensearch-project/OpenSearch/pull/17117))
 
 ### Deprecated
 

buildSrc/src/main/java/org/opensearch/gradle/precommit/JarHellTask.java

@@ -63,7 +63,7 @@
     public void runJarHellCheck() {
         LoggedExec.javaexec(project, spec -> {
             spec.environment("CLASSPATH", getClasspath().getAsPath());
-            spec.getMainClass().set("org.opensearch.bootstrap.JarHell");
+            spec.getMainClass().set("org.opensearch.common.bootstrap.JarHell");
         });
     }
 

buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditTask.java

@@ -94,7 +94,7 @@ public class ThirdPartyAuditTask extends DefaultTask {
         CliMain.EXIT_VIOLATION,
         CliMain.EXIT_UNSUPPORTED_JDK
     );
-    private static final String JDK_JAR_HELL_MAIN_CLASS = "org.opensearch.bootstrap.JdkJarHellCheck";
+    private static final String JDK_JAR_HELL_MAIN_CLASS = "org.opensearch.common.bootstrap.JdkJarHellCheck";
 
     private Set<String> missingClassExcludes = new TreeSet<>();
 

buildSrc/src/testFixtures/java/org/opensearch/gradle/test/TestClasspathUtils.java

@@ -48,7 +48,7 @@ public class TestClasspathUtils {
     public static void setupJarJdkClasspath(File projectRoot) {
         try {
             URL originLocation = TestClasspathUtils.class.getClassLoader()
-                .loadClass("org.opensearch.bootstrap.JdkJarHellCheck")
+                .loadClass("org.opensearch.common.bootstrap.JdkJarHellCheck")
                 .getProtectionDomain()
                 .getCodeSource()
                 .getLocation();

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

@@ -52,12 +52,12 @@
 import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
 import org.opensearch.Build;
 import org.opensearch.Version;
-import org.opensearch.bootstrap.JarHell;
 import org.opensearch.cli.EnvironmentAwareCommand;
 import org.opensearch.cli.ExitCodes;
 import org.opensearch.cli.Terminal;
 import org.opensearch.cli.UserException;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.hash.MessageDigests;
 import org.opensearch.common.util.io.IOUtils;

libs/common/src/main/java/org/opensearch/bootstrap/JarHell.java → libs/common/src/main/java/org/opensearch/common/bootstrap/JarHell.java

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.bootstrap;
+package org.opensearch.common.bootstrap;
 
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.io.PathUtils;

libs/common/src/main/java/org/opensearch/bootstrap/JdkJarHellCheck.java → libs/common/src/main/java/org/opensearch/common/bootstrap/JdkJarHellCheck.java

@@ -29,7 +29,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.bootstrap;
+package org.opensearch.common.bootstrap;
 
 import org.opensearch.common.SuppressForbidden;
 

libs/common/src/main/java/org/opensearch/bootstrap/package-info.java → libs/common/src/main/java/org/opensearch/common/bootstrap/package-info.java

@@ -7,4 +7,4 @@
  */
 
 /** Contains JarHell Classes */
-package org.opensearch.bootstrap;
+package org.opensearch.common.bootstrap;

libs/common/src/test/java/org/opensearch/bootstrap/JarHellTests.java → libs/common/src/test/java/org/opensearch/common/bootstrap/JarHellTests.java

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.bootstrap;
+package org.opensearch.common.bootstrap;
 
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.core.common.Strings;

plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/TikaImpl.java

@@ -41,8 +41,8 @@
 import org.apache.tika.parser.ParserDecorator;
 import org.opensearch.SpecialPermission;
 import org.opensearch.bootstrap.FilePermissionUtils;
-import org.opensearch.bootstrap.JarHell;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.io.PathUtils;
 
 import java.io.ByteArrayInputStream;

server/src/main/java/org/opensearch/bootstrap/Bootstrap.java

@@ -47,6 +47,7 @@
 import org.opensearch.cli.UserException;
 import org.opensearch.common.PidFile;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.inject.CreationException;
 import org.opensearch.common.logging.LogConfigurator;
 import org.opensearch.common.logging.Loggers;

server/src/main/java/org/opensearch/bootstrap/Security.java

@@ -34,6 +34,7 @@
 
 import org.opensearch.cli.Command;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;

server/src/main/java/org/opensearch/plugins/PluginInfo.java

@@ -36,8 +36,8 @@
 import com.fasterxml.jackson.core.json.JsonReadFeature;
 
 import org.opensearch.Version;
-import org.opensearch.bootstrap.JarHell;
 import org.opensearch.common.annotation.PublicApi;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.xcontent.json.JsonXContentParser;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;

server/src/main/java/org/opensearch/plugins/PluginsService.java

@@ -43,7 +43,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.action.admin.cluster.node.info.PluginsAndModules;
-import org.opensearch.bootstrap.JarHell;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.inject.Module;
 import org.opensearch.common.lifecycle.LifecycleComponent;

server/src/test/java/org/opensearch/plugins/PluginsServiceTests.java

@@ -38,7 +38,7 @@
 import org.apache.lucene.util.Constants;
 import org.opensearch.LegacyESVersion;
 import org.opensearch.Version;
-import org.opensearch.bootstrap.JarHell;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.settings.Settings;

test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java

@@ -39,6 +39,7 @@
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.bootstrap.JarHell;
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.network.IfConfig;
 import org.opensearch.common.network.NetworkAddress;