fix: modify default entrypoint for WAR containerization to be compati…

…ble with Jetty 12+

docs/faq.md

@@ -901,7 +901,7 @@ The `war` command currently supports containerization of standard WARs. It uses
 * Resources Layer
 * Classes Layer
 
-The default entrypoint when using a jetty base image will be `java -jar /usr/local/jetty/start.jar` unless you choose to specify a custom one.
+The default entrypoint when using a jetty base image will be `java -jar /usr/local/jetty/start.jar --module=ee10-deploy` unless you choose to specify a custom one.
 
 You can use a different Servlet engine base image with the help of the `--from` option and customize `--app-root`, `--entrypoint` and `--program-args`. If you don't set the `entrypoint` or `program-arguments`, Jib will inherit them from the base image. However, setting the `--app-root` is **required** if you use a non-jetty base image. Here is how the `war` command may look if you're using a Tomcat image:
 ```

jib-cli/README.md

@@ -190,7 +190,7 @@ This command follows the following pattern:
 
 ## Quickstart
 
-1. Have your sample WAR ready and use the `war` command to containerize your WAR. By default, the WAR command uses [`jetty`](https://hub.docker.com/_/jetty) as the base image so the entrypoint is set to `java -jar /usr/local/jetty/start.jar`:
+1. Have your sample WAR ready and use the `war` command to containerize your WAR. By default, the WAR command uses [`jetty`](https://hub.docker.com/_/jetty) as the base image so the entrypoint is set to `java -jar /usr/local/jetty/start.jar --module=ee10-deploy`:
     ```
      $ jib war --target=docker://cli-war-quickstart <your-sample>.war
     ```

jib-cli/src/main/java/com/google/cloud/tools/jib/cli/war/WarFiles.java

@@ -51,7 +51,7 @@ public static JibContainerBuilder toJibContainerBuilder(
       CommonContainerConfigCliOptions commonContainerConfigCliOptions,
       ConsoleLogger logger)
       throws IOException, InvalidImageReferenceException {
-    String baseImage = commonContainerConfigCliOptions.getFrom().orElse("jetty");
+    String baseImage = fetchBaseImage(commonContainerConfigCliOptions);
     JibContainerBuilder containerBuilder =
         ContainerBuilders.create(baseImage, Collections.emptySet(), commonCliOptions, logger);
     List<String> programArguments = commonContainerConfigCliOptions.getProgramArguments();
@@ -77,12 +77,24 @@ private static List<String> computeEntrypoint(
       CommonContainerConfigCliOptions commonContainerConfigCliOptions)
       throws InvalidImageReferenceException {
     List<String> entrypoint = commonContainerConfigCliOptions.getEntrypoint();
+    String baseImage = fetchBaseImage(commonContainerConfigCliOptions);
     if (!entrypoint.isEmpty()) {
       return entrypoint;
     }
     if (commonContainerConfigCliOptions.isJettyBaseimage()) {
+      // If using jetty 12 or later, then specify deploy module. See
+      // https://eclipse.dev/jetty/documentation/jetty-12/operations-guide/index.html
+      if (baseImage.equals("jetty")) {
+        return ImmutableList.of(
+            "java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy");
+      }
       return ImmutableList.of("java", "-jar", "/usr/local/jetty/start.jar");
     }
     return null;
   }
+
+  private static String fetchBaseImage(
+      CommonContainerConfigCliOptions commonContainerConfigCliOptions) {
+    return commonContainerConfigCliOptions.getFrom().orElse("jetty");
+  }
 }

jib-cli/src/test/java/com/google/cloud/tools/jib/cli/war/WarFilesTest.java

@@ -74,7 +74,7 @@ public void testToJibContainerBuilder_explodedStandard_basicInfo()
 
     assertThat(buildPlan.getBaseImage()).isEqualTo("jetty");
     assertThat(buildPlan.getEntrypoint())
-        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar")
+        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy")
         .inOrder();
     assertThat(buildPlan.getLayers()).hasSize(1);
     assertThat(buildPlan.getLayers().get(0).getName()).isEqualTo("classes");

jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java

@@ -566,7 +566,8 @@ static JavaContainerBuilder getJavaContainerBuilderWithBaseImage(
    *   <li>null (inheriting from the base image), if the user specified value is {@code INHERIT}
    *   <li>the user specified one, if set
    *   <li>for a WAR project, null (inheriting) if a custom base image is specified, and {@code
-   *       ["java", "-jar", "/usr/local/jetty/start.jar"]} otherwise (default Jetty base image)
+   *       ["java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy"]} otherwise
+   *       (default Jetty base image)
    *   <li>for a non-WAR project, by resolving the main class
    * </ol>
    *
@@ -619,7 +620,7 @@ static List<String> computeEntrypoint(
       }
       return rawConfiguration.getFromImage().isPresent()
           ? null // Inherit if a custom base image.
-          : Arrays.asList("java", "-jar", "/usr/local/jetty/start.jar");
+          : Arrays.asList("java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy");
     }
 
     List<String> classpath = new ArrayList<>(rawExtraClasspath);

jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java

@@ -474,7 +474,7 @@ public void testEntrypoint_defaultWarPackaging()
     ContainerBuildPlan buildPlan = processCommonConfiguration();
 
     assertThat(buildPlan.getEntrypoint())
-        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar")
+        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy")
         .inOrder();
     verifyNoInteractions(logger);
   }
@@ -704,7 +704,7 @@ public void testEntrypoint_warningOnMainclassForWar()
     ContainerBuildPlan buildPlan = processCommonConfiguration();
 
     assertThat(buildPlan.getEntrypoint())
-        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar")
+        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy")
         .inOrder();
     verify(projectProperties)
         .log(
@@ -726,7 +726,7 @@ public void testEntrypoint_warningOnExpandClasspathDependenciesForWar()
     ContainerBuildPlan buildPlan = processCommonConfiguration();
 
     assertThat(buildPlan.getEntrypoint())
-        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar")
+        .containsExactly("java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy")
         .inOrder();
     verify(projectProperties)
         .log(