Refactor bootstrap for JPMS support

Signed-off-by: Prudhvi Godithi <[email protected]>

Author: prudhvigodithi

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

@@ -63,7 +63,7 @@ public JarHellTask(Project project) {
     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 renamed to 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 renamed to 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 renamed to 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 renamed to 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;