Merge branch 'helidon-3.x' into issue7206

Signed-off-by: Jorge Bescos Gascon <[email protected]>
helidon-io · Feb 23, 2024 · 6576429 · 6576429
2 parents ba9c9a5 + 1277e61
commit 6576429
Show file tree

Hide file tree

Showing 610 changed files with 2,158 additions and 1,351 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,24 @@ For Helidon 2.x releases please see [Helidon 2.x CHANGELOG.md](https://github.co
 
 For Helidon 1.x releases please see [Helidon 1.x CHANGELOG.md](https://github.com/oracle/helidon/blob/helidon-1.x/CHANGELOG.md)
 
+## [3.2.6]
+
+This is a bugfix release of Helidon and is recommended for all users of Helidon 3.  Helidon 3 requires Java 17 or newer.
+
+### CHANGES
+
+- Common: Manually count number of offered tasks instead of relying on pool active count [8264](https://github.com/helidon-io/helidon/pull/8264)
+- JAX-RS Client: TLS replace in HelidonConnector fix [7902](https://github.com/helidon-io/helidon/pull/7902)
+- Tracing: Backport of scope/baggage fix [8244](https://github.com/helidon-io/helidon/pull/8244)
+- Tracing: Guard against NPE during early invocation of Span.current() [8256](https://github.com/helidon-io/helidon/pull/8256)
+- WebClient: Calls clearData() on all data propagation providers. [8328](https://github.com/helidon-io/helidon/pull/8328)
+- Dependencies: Upgrade OCI SDK to 3.34.0 [8351](https://github.com/helidon-io/helidon/pull/8351)
+- Dependencies: Upgrade to Jersey 3.0.12 [8346](https://github.com/helidon-io/helidon/pull/8346)
+- Dependencies: Upgrading to latest Tyrus 2.1.5 [8277](https://github.com/helidon-io/helidon/pull/8277)
+- Dependencies: upgrade jsonp-api to 2.0.2 [8203](https://github.com/helidon-io/helidon/pull/8203)
+- Examples: Archetype - Add jpms option with false as default [8310](https://github.com/helidon-io/helidon/pull/8310)
+- Tests: Make OciMetricsDataTest.beforeEach non private [7328](https://github.com/helidon-io/helidon/pull/7328)
+
 ## [3.2.5]
 
 This is a bugfix release of Helidon and is recommended for all users of Helidon 3.  Helidon 3 requires Java 17 or newer.
@@ -845,6 +863,7 @@ Notable changes:
 - Examples: Update bare-mp archetype to use microprofile-core [3795](https://github.com/oracle/helidon/pull/3795)
 
 
+[3.2.6]: https://github.com/helidon-io/helidon/compare/3.2.5...3.2.6
 [3.2.5]: https://github.com/helidon-io/helidon/compare/3.2.4...3.2.5
 [3.2.4]: https://github.com/helidon-io/helidon/compare/3.2.3...3.2.4
 [3.2.3]: https://github.com/helidon-io/helidon/compare/3.2.2...3.2.3

diff --git a/applications/mp/pom.xml b/applications/mp/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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-applications</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.7-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>helidon-mp</artifactId>

diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-applications-project</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>helidon-applications</artifactId>

diff --git a/applications/pom.xml b/applications/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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon</groupId>
         <artifactId>helidon-dependencies</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.7-SNAPSHOT</version>
         <relativePath>../dependencies/pom.xml</relativePath>
     </parent>
     <groupId>io.helidon.applications</groupId>

diff --git a/applications/se/pom.xml b/applications/se/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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-applications</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.7-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>helidon-se</artifactId>

diff --git a/archetypes/helidon/pom.xml b/archetypes/helidon/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.archetypes</groupId>
         <artifactId>helidon-archetypes-project</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.7-SNAPSHOT</version>
     </parent>
     <packaging>helidon-archetype</packaging>
     <artifactId>helidon</artifactId>

diff --git a/archetypes/helidon/src/main/archetype/common/common.xml b/archetypes/helidon/src/main/archetype/common/common.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2021, 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.
@@ -42,7 +42,6 @@
             <includes>
                 <include>.helidon.mustache</include>
                 <include>README.md.mustache</include>
-                <include>src/main/java/module-info.java.mustache</include>
             </includes>
         </templates>
         <model>

diff --git a/archetypes/helidon/src/main/archetype/common/extra.xml b/archetypes/helidon/src/main/archetype/common/extra.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 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.
@@ -72,12 +72,12 @@
                                 <value if="${flavor} == 'mp'">io.helidon.common.reactive</value>
                                 <value if="${flavor} == 'se'">io.helidon.faulttolerance</value>
                             </list>
-                            <list key="Main-helidon-imports">
+                            <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                 <value>io.helidon.common.http.Http</value>
                                 <value>io.helidon.faulttolerance.BulkheadException</value>
                                 <value>io.helidon.faulttolerance.CircuitBreakerOpenException</value>
                             </list>
-                            <list key="Main-other-imports">
+                            <list key="Main-other-imports" if="${flavor} == 'se'">
                                 <value>java.util.concurrent.TimeoutException</value>
                             </list>
                             <list key="Main-routingBuilder">

diff --git a/archetypes/helidon/src/main/archetype/common/files/src/main/java/__pkg__/Main.java.mustache b/archetypes/helidon/src/main/archetype/common/files/src/main/java/__pkg__/Main.java.mustache
@@ -0,0 +1,35 @@
+package {{package}};
+
+{{#Main-java-imports}}
+import {{.}};
+{{/Main-java-imports}}
+
+{{#Main-helidon-imports}}
+import {{.}};
+{{/Main-helidon-imports}}
+
+{{#Main-other-imports}}
+import {{.}};
+{{/Main-other-imports}}
+
+{{#Main-static-imports}}
+import {{.}};
+{{/Main-static-imports}}
+
+{{Main-class-javadoc}}
+public class Main {
+{{#Main-class-fields}}
+{{.}}
+{{/Main-class-fields}}
+
+    {{Main-method-javadoc}}
+    public static void main(String[] args) {
+        {{#Main-method-content}}
+        {{.}}
+        {{/Main-method-content}}
+    }
+
+{{#Main-class-content}}
+{{.}}
+{{/Main-class-content}}
+}
diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 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.
@@ -66,12 +66,6 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                             <value key="artifactId">helidon-microprofile-metrics</value>
                                         </map>
                                     </list>
-                                    <list key="Main-helidon-imports">
-                                        <value>io.helidon.metrics.MetricsSupport</value>
-                                    </list>
-                                    <list key="Main-routingBuilder">
-                                        <value><![CDATA[                .register(MetricsSupport.create()) // Metrics at "/metrics"]]></value>
-                                    </list>
                                     <list key="SimpleGreetService-imports">
                                         <value>org.eclipse.microprofile.metrics.MetricUnits</value>
                                         <value>org.eclipse.microprofile.metrics.annotation.Counted</value>
@@ -355,7 +349,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                     <value>io.helidon.health</value>
                                     <value if="${flavor} == 'se'">io.helidon.health.checks</value>
                                 </list>
-                                <list key="Main-helidon-imports">
+                                <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                     <value>io.helidon.health.HealthSupport</value>
                                     <value>io.helidon.health.checks.HealthChecks</value>
                                 </list>

diff --git a/archetypes/helidon/src/main/archetype/common/packaging.xml b/archetypes/helidon/src/main/archetype/common/packaging.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 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.
@@ -93,6 +93,57 @@ kubectl delete -f app.yaml
                     </templates>
                 </output>
             </boolean>
+            <boolean id="jpms"
+                     name="Module support (JPMS)"
+                     description="Add a module-info to your project"
+                     default="false"
+                     optional="true">
+                <output>
+                    <templates engine="mustache" transformations="mustache,packaged">
+                        <directory>files</directory>
+                        <includes>
+                            <include>src/main/java/module-info.java.mustache</include>
+                            <include if="${flavor} == 'mp'">src/**/Main.java.mustache</include>
+                        </includes>
+                    </templates>
+                    <model if="${flavor} == 'mp'">
+                        <value key="mainClass">${package}.Main</value>
+                        <value key="Main-class-javadoc"><![CDATA[
+/**
+ * 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}.
+ */]]>
+                        </value>
+                        <value key="Main-method-javadoc"><![CDATA[
+    /**
+     * Main method. Starts CDI (and the application).
+     *
+     * @param args ignored
+     */]]>
+                        </value>
+                        <list key="Main-class-fields">
+                            <value><![CDATA[
+    /**
+    * Cannot be instantiated.
+    */
+    private Main() {
+    }
+]]>
+                            </value>
+                        </list>
+                        <list key="Main-method-content">
+                            <value><![CDATA[io.helidon.microprofile.cdi.Main.main(args);]]></value>
+                        </list>
+                        <list key="modules">
+                            <value>io.helidon.microprofile.cdi</value>
+                        </list>
+                    </model>
+                </output>
+            </boolean>
         </inputs>
     </step>
 </archetype-script>
diff --git a/archetypes/helidon/src/main/archetype/common/presets.xml b/archetypes/helidon/src/main/archetype/common/presets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+    Copyright (c) 2022, 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.
@@ -37,5 +37,6 @@
         <boolean path="docker.jlink-image">true</boolean>
         <boolean path="k8s">true</boolean>
         <boolean path="v8o">false</boolean>
+        <boolean path="jpms">false</boolean>
     </presets>
 </archetype-script>
diff --git a/...pe/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache b/...pe/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache
@@ -140,15 +140,35 @@ class GreetResourceMockedTest {
         @Override
         public CreateAlarmResponse createAlarm(CreateAlarmRequest createAlarmRequest) {return null;}
 
+        @Override
+        public CreateAlarmSuppressionResponse createAlarmSuppression(CreateAlarmSuppressionRequest createAlarmSuppressionRequest) {
+            return null;
+        }
+
         @Override
         public DeleteAlarmResponse deleteAlarm(DeleteAlarmRequest deleteAlarmRequest) {return null;}
 
+        @Override
+        public DeleteAlarmSuppressionResponse deleteAlarmSuppression(DeleteAlarmSuppressionRequest deleteAlarmSuppressionRequest) {
+            return null;
+        }
+
         @Override
         public GetAlarmResponse getAlarm(GetAlarmRequest getAlarmRequest) {return null;}
 
         @Override
         public GetAlarmHistoryResponse getAlarmHistory(GetAlarmHistoryRequest getAlarmHistoryRequest) {return null;}
 
+        @Override
+        public GetAlarmSuppressionResponse getAlarmSuppression(GetAlarmSuppressionRequest getAlarmSuppressionRequest) {
+            return null;
+        }
+
+        @Override
+        public ListAlarmSuppressionsResponse listAlarmSuppressions(ListAlarmSuppressionsRequest listAlarmSuppressionsRequest) {
+            return null;
+        }
+
         @Override
         public ListAlarmsResponse listAlarms(ListAlarmsRequest listAlarmsRequest) {return null;}
 
@@ -183,6 +203,11 @@ class GreetResourceMockedTest {
             return null;
         }
 
+        @Override
+        public SummarizeAlarmSuppressionHistoryResponse summarizeAlarmSuppressionHistory(SummarizeAlarmSuppressionHistoryRequest summarizeAlarmSuppressionHistoryRequest) {
+            return null;
+        }
+
         @Override
         public SummarizeMetricsDataResponse summarizeMetricsData(SummarizeMetricsDataRequest summarizeMetricsDataRequest) {
             return null;

diff --git a/archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml b/archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 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.
@@ -45,6 +45,7 @@ This will mount `~/.oci` as a volume in the running docker container.
         <boolean path="docker.jlink-image">false</boolean>
         <boolean path="k8s">true</boolean>
         <boolean path="v8o">false</boolean>
+        <boolean path="jpms">false</boolean>
     </presets>
     <call method="pre-processed-models"/>
     <exec src="/common/common.xml"/>