Merge remote-tracking branch 'upstream/helidon-2.x' into helidon-2.x

archetypes/bare-mp/src/main/resources/pom.xml.mustache

@@ -14,6 +14,10 @@
     <version>{{version}}</version>
     <name>{{name}}</name>
 
+    <properties>
+        <mainClass>{{package}}</mainClass>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>

archetypes/bare-mp/src/main/resources/src/main/java/__pkg__/Main.java.mustache

@@ -0,0 +1,29 @@
+
+package {{package}};
+
+/**
+ * Main entry point of the application.
+ * <p>
+ * Note that this class is required when using modules as the module main class must be in a package that is either exported
+ * or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
+ * <p>
+ * This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
+ */
+public class Main {
+
+    /**
+    * Cannot be instantiated.
+    */
+    private Main() {
+    }
+
+    /**
+     * Main method. Starts CDI (and the application).
+     *
+     * @param args ignored
+     */
+    public static void main(String[] args) {
+        io.helidon.microprofile.cdi.Main.main(args);
+    }
+
+}

archetypes/database-mp/src/main/resources/pom.xml.mustache

@@ -15,6 +15,10 @@
     <version>{{version}}</version>
     <name>{{name}}</name>
 
+        <properties>
+            <mainClass>{{package}}</mainClass>
+        </properties>
+
     <dependencies>
         <dependency>
             <groupId>jakarta.annotation</groupId>

archetypes/database-mp/src/main/resources/src/main/java/__pkg__/Main.java.mustache

@@ -0,0 +1,29 @@
+
+package {{package}};
+
+/**
+ * Main entry point of the application.
+ * <p>
+ * Note that this class is required when using modules as the module main class must be in a package that is either exported
+ * or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
+ * <p>
+ * This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
+ */
+public class Main {
+
+    /**
+    * Cannot be instantiated.
+    */
+    private Main() {
+    }
+
+    /**
+     * Main method. Starts CDI (and the application).
+     *
+     * @param args ignored
+     */
+    public static void main(String[] args) {
+        io.helidon.microprofile.cdi.Main.main(args);
+    }
+
+}

archetypes/quickstart-mp/src/main/resources/pom.xml.mustache

@@ -14,6 +14,10 @@
     <version>{{version}}</version>
     <name>{{name}}</name>
 
+        <properties>
+            <mainClass>{{package}}</mainClass>
+        </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>

archetypes/quickstart-mp/src/main/resources/src/main/java/__pkg__/Main.java.mustache

@@ -0,0 +1,29 @@
+
+package {{package}};
+
+/**
+ * Main entry point of the application.
+ * <p>
+ * Note that this class is required when using modules as the module main class must be in a package that is either exported
+ * or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
+ * <p>
+ * This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
+ */
+public class Main {
+
+    /**
+    * Cannot be instantiated.
+    */
+    private Main() {
+    }
+
+    /**
+     * Main method. Starts CDI (and the application).
+     *
+     * @param args ignored
+     */
+    public static void main(String[] args) {
+        io.helidon.microprofile.cdi.Main.main(args);
+    }
+
+}

dependencies/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@
         <!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
         <version.lib.jaxb-runtime>2.3.3</version.lib.jaxb-runtime>
         <version.lib.jedis>3.6.3</version.lib.jedis>
-        <version.lib.jersey>2.40</version.lib.jersey>
+        <version.lib.jersey>2.41</version.lib.jersey>
         <version.lib.jgit>6.7.0.202309050840-r</version.lib.jgit>
         <version.lib.jms-api>2.0</version.lib.jms-api>
         <version.lib.jsonb-api>1.0.2</version.lib.jsonb-api>