modularize launchers and java_version_checker

Author: ChrisHegarty

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

@@ -63,8 +63,8 @@ public void execute(Task task) {
     }
 
     private static final String ES_JAR_PREFIX = "elasticsearch-";
-    // ES jars in the lib directory that are not modularized. For now, launchers and es-log4j are the only ones
-    private static final List<String> ES_JAR_EXCLUDES = List.of("elasticsearch-launchers", "elasticsearch-log4j");
+    // ES jars in the lib directory that are not modularized. For now, es-log4j is the only one
+    private static final List<String> ES_JAR_EXCLUDES = List.of("elasticsearch-log4j");
 
     private static Predicate<Path> isESJar = path -> path.getFileName().toString().startsWith(ES_JAR_PREFIX);
     private static Predicate<Path> isNotExcluded = path -> ES_JAR_EXCLUDES.stream()
@@ -98,6 +98,8 @@ private static void assertAllESJarsAreModular(Path libsPath) {
         "org.elasticsearch.cli",
         "org.elasticsearch.core",
         "org.elasticsearch.geo",
+        "org.elasticsearch.java_version_checker",
+        "org.elasticsearch.launchers",
         "org.elasticsearch.lz4",
         "org.elasticsearch.plugin.classloader",
         "org.elasticsearch.secure_sm",

distribution/src/bin/elasticsearch

@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ -z "$ES_TMPDIR" ]; then
-  ES_TMPDIR=`"$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
+  ES_TMPDIR=`"$JAVA" "$XSHARE" --module-path "$ES_MODULEPATH" -m org.elasticsearch.launchers/org.elasticsearch.tools.launchers.TempDirectory`
 fi
 
 if [ -z "$LIBFFI_TMPDIR" ]; then
@@ -106,7 +106,7 @@ fi
 #   - second, JVM options are read from jvm.options and jvm.options.d/*.options
 #   - third, JVM options from ES_JAVA_OPTS are applied
 #   - fourth, ergonomic JVM options are applied
-ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF" "$ES_HOME/plugins"`
+ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" "$XSHARE" --module-path "$ES_MODULEPATH" -m org.elasticsearch.launchers/org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF" "$ES_HOME/plugins"`
 
 # Remove enrollment related parameters before passing the arg list to Elasticsearch
 for i in "${!ARG_LIST[@]}"; do

distribution/tools/java-version-checker/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'elasticsearch.build'
 
-targetCompatibility = JavaVersion.VERSION_1_7
-
 // java_version_checker do not depend on core so only JDK signatures should be checked
 tasks.named('forbiddenApisMain').configure {
   replaceSignatureFiles 'jdk-signatures'

distribution/tools/java-version-checker/src/main/java/module-info.java

@@ -0,0 +1,11 @@
+/*
+ * 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.
+ */
+
+module org.elasticsearch.java_version_checker {
+    exports org.elasticsearch.tools.java_version_checker;
+}

distribution/tools/java-version-checker/src/main/java/org/elasticsearch/tools/java_version_checker/JavaVersion.java

@@ -17,6 +17,8 @@ public class JavaVersion {
     public static final List<Integer> CURRENT = parse(System.getProperty("java.specification.version"));
     public static final List<Integer> JAVA_17 = parse("17");
 
+    private JavaVersion() {}
+
     static List<Integer> parse(final String value) {
         if (value.matches("^0*[0-9]+(\\.[0-9]+)*$") == false) {
             throw new IllegalArgumentException(value);

distribution/tools/launchers/build.gradle

@@ -10,8 +10,8 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 apply plugin: 'elasticsearch.build'
 
 dependencies {
-  compileOnly project(':distribution:tools:java-version-checker')
-  implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
+  moduleCompileOnly project(':distribution:tools:java-version-checker')
+  moduleImplementation "org.yaml:snakeyaml:${versions.snakeyaml}"
   testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
   testImplementation "junit:junit:${versions.junit}"
   testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
@@ -35,3 +35,7 @@ tasks.named("testingConventions").configure {
 ["javadoc", "loggerUsageCheck", "jarHell"].each { tsk ->
   tasks.named(tsk).configure { enabled = false }
 }
+
+tasks.named("compileJava").configure {
+  options.compilerArgs.add("-Xlint:-requires-automatic")
+}

distribution/tools/launchers/src/main/java/module-info.java

@@ -0,0 +1,15 @@
+/*
+ * 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.
+ */
+
+module org.elasticsearch.launchers {
+    requires jdk.management;
+    requires org.elasticsearch.java_version_checker;
+    requires org.yaml.snakeyaml;
+
+    exports org.elasticsearch.tools.launchers;
+}

distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/BootstrapJvmOptions.java

@@ -25,6 +25,9 @@
  * additional JVM options, in order to configure the bootstrap plugins.
  */
 public class BootstrapJvmOptions {
+
+    private BootstrapJvmOptions() {}
+
     public static List<String> bootstrapJvmOptions(Path plugins) throws IOException {
         if (Files.isDirectory(plugins) == false) {
             throw new IllegalArgumentException("Plugins path " + plugins + " must be a directory");