Merge branch 'main' into issue6105

Signed-off-by: Jorge Bescos Gascon <[email protected]>

Author: jbescos

.github/workflows/create-backport-issues.yml

@@ -9,7 +9,25 @@ on:
       version:
         description: 'Helidon version this issue was reported for'
         required: true
+        type: choice
+        options:
+          - 2.x
+          - 3.x
+          - 4.x
         default: '2.x'
+      target-2:
+        type: boolean
+        description: 'Port to 2.x?'
+        default:  false
+      target-3:
+        type: boolean
+        description: 'Port to 3.x?'
+        default: true
+      target-4:
+        type: boolean
+        description: 'Port to 4.x?'
+        default: true
+
 env:
   GITHUB_API_KEY: ${{ secrets.GITHUB_TOKEN }}
 
@@ -20,4 +38,4 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
-      - run: etc/scripts/actions/create-backport-issues.sh $GITHUB_REPOSITORY ${{ github.event.inputs.issue }} ${{ github.event.inputs.version }}
+      - run: etc/scripts/actions/create-backport-issues.sh $GITHUB_REPOSITORY ${{ github.event.inputs.issue }} ${{ github.event.inputs.version }} ${{ github.event.inputs.target-2 }} ${{ github.event.inputs.target-3 }} ${{ github.event.inputs.target-4 }}

CHANGELOG.md

@@ -11,6 +11,76 @@ 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)
 
+## [4.0.3]
+
+This release contains bugfixes and ehancements and is recommended for all users of Helidon 4.
+
+Java 21 is required to use Helidon 4.0.3.
+
+### CHANGES
+
+- Builders: Support for Map<String, String> in configured builders. [8231](https://github.com/helidon-io/helidon/pull/8231)
+- CORS: Add a little logic to CORS config processing and significantly update the CORS doc [8212](https://github.com/helidon-io/helidon/pull/8212)
+- CORS: Include scheme and port of origin and host in deciding whether to classify a request as CORS or not [8166](https://github.com/helidon-io/helidon/pull/8166)
+- Metrics: Allow programmatic look-up of MetricRegistry via CDI without NPE [8210](https://github.com/helidon-io/helidon/pull/8210)
+- Metrics: Make `RegistryFactory` and its `getInstance` and `getRegistry` methods public [8175](https://github.com/helidon-io/helidon/pull/8175)
+- OCI: Fix issue for checking if app is running in an OCI instance which causes Instance Principal auth to fail [8197](https://github.com/helidon-io/helidon/pull/8197)
+- RestClient: Prevent Helidon connector from re-encoding URI  [8232](https://github.com/helidon-io/helidon/pull/8232)
+- Security: Fixed IDCS role obtaining [8207](https://github.com/helidon-io/helidon/pull/8207)
+- Security: OIDC id token validation and token refresh [8153](https://github.com/helidon-io/helidon/pull/8153)
+- Security: TLS default config values [8206](https://github.com/helidon-io/helidon/pull/8206)
+- Tracing: Add support for `@SpanAttribute` annotation, use entire path for REST resource span name [8216](https://github.com/helidon-io/helidon/pull/8216)
+- Tracing: Manage scopes correctly with baggage; allow baggage to be mutable to honor the Helidon `Span#baggage` semantics [8225](https://github.com/helidon-io/helidon/pull/8225)
+- WebClient: The Helidon WS client must include a Connection header [8198](https://github.com/helidon-io/helidon/pull/8198)
+- WebClient: WebClientService duplication fix [8224](https://github.com/helidon-io/helidon/pull/8224)
+- WebServer: Check result of Integer.parseUnsignedInt() to be non-negative [8215](https://github.com/helidon-io/helidon/pull/8215)
+- Dependencies: Jersey 3.1.5 [8174](https://github.com/helidon-io/helidon/pull/8174)
+- Dependencies: upgrade jsonp 2.1.3 [8202](https://github.com/helidon-io/helidon/pull/8202)
+- Docs: Fix bad include in cors documentation [8220](https://github.com/helidon-io/helidon/pull/8220)
+- Docs: Fix image sizing in SE tracing guide [8201](https://github.com/helidon-io/helidon/pull/8201)
+- Docs: Realign SE tracing guide to code [8193](https://github.com/helidon-io/helidon/pull/8193)
+- Docs: fix broken documentation links Part 1 [8219](https://github.com/helidon-io/helidon/pull/8219)
+- Examples: Remove references to any JDK from examples [8213](https://github.com/helidon-io/helidon/pull/8213)
+
+## [4.0.2]
+
+This release contains bugfixes and ehancements and is recommended for all users of Helidon 4.
+
+Java 21 is required to use Helidon 4.0.2.
+
+### CHANGES
+
+- Builders: required fixes to builders and other tooling [8076](https://github.com/helidon-io/helidon/pull/8076)
+- Metrics: Fix premature access to RegistryFactory [8118](https://github.com/helidon-io/helidon/pull/8118)
+- Metrics: jvm uptime units [8065](https://github.com/helidon-io/helidon/pull/8065)
+- Native image: key-utils are missing native image prop [8146](https://github.com/helidon-io/helidon/pull/8146)
+- Scheduling: 8059 Delayed fixed rate scheduling [8075](https://github.com/helidon-io/helidon/pull/8075)
+- Tracing: Add proper handling of `content-read` and `content-write` logs within `HTTP Request` tracing span [8105](https://github.com/helidon-io/helidon/pull/8105)
+- Tracing: MP OpenTelemetry and Helidon Tracing API [8073](https://github.com/helidon-io/helidon/pull/8073)
+- Tracing: Several fixes to tracing config [8155](https://github.com/helidon-io/helidon/pull/8155)
+- WebClient: #8077 Client keep alive fix [8101](https://github.com/helidon-io/helidon/pull/8101)
+- WebServer: Update server's internal state if a listener fails to start [8111](https://github.com/helidon-io/helidon/pull/8111)
+- WebSocket: Handle WebSocket frames of longer payload [8134](https://github.com/helidon-io/helidon/pull/8134)
+- WebSocket: Make sure a WsListener supplier is called exactly once per connection [8116](https://github.com/helidon-io/helidon/pull/8116)
+- Build: Aggregated javadoc and docs URLs updates [8171](https://github.com/helidon-io/helidon/pull/8171)
+- Build: Incorporate release branch name in artifact bundle name [8081](https://github.com/helidon-io/helidon/pull/8081)
+- Dependencies: 4.x: Upgrade grpc to 1.60.0 [8098](https://github.com/helidon-io/helidon/pull/8098)
+- Dependencies: Upgrade slf4j to 2.0.9 and logback to 1.4.14 [8120](https://github.com/helidon-io/helidon/pull/8120)
+- Docs: Change doc in the wake of OpenAPI UI service reorg in 4.0 to add the `services` level to the config structure [8100](https://github.com/helidon-io/helidon/pull/8100)
+- Docs: Fix health and metrics URLs. Mention health returns 204 [8160](https://github.com/helidon-io/helidon/pull/8160)
+- Docs: Remove doc for tags on `content-read` and `content-write` spans; the tags are no longer added by the code in 4.x [8112](https://github.com/helidon-io/helidon/pull/8112)
+- Docs: Significant changes and corrections to the SE health doc [8125](https://github.com/helidon-io/helidon/pull/8125)
+- Docs: tuning guide update [8140](https://github.com/helidon-io/helidon/pull/8140)
+- Examples: Add missing metrics to Pokemons example [8129](https://github.com/helidon-io/helidon/pull/8129)
+- Examples: Correct typo in MP health example [8131](https://github.com/helidon-io/helidon/pull/8131)
+- Examples: Fix Mongo Dbclient + related example [8130](https://github.com/helidon-io/helidon/pull/8130)
+- Examples: Fix and add test to database SE example [8097](https://github.com/helidon-io/helidon/pull/8097)
+- Tests: Add @RequestScoped support for testing [7916](https://github.com/helidon-io/helidon/pull/7916)
+- Tests: Add Hierarchy tests to MP Telemetry [8089](https://github.com/helidon-io/helidon/pull/8089)
+- Tests: Avoid possible test ordering problem [8145](https://github.com/helidon-io/helidon/pull/8145)
+- Tests: Disable failing `testNonTransactionalEntityManager` JPA test. [8124](https://github.com/helidon-io/helidon/pull/8124)
+- Tests: Enable disabled TCKs [7781](https://github.com/helidon-io/helidon/pull/7781)
+
 ## [4.0.1]
 
 This release contains bugfixes and ehancements and is recommended for all users of Helidon 4.
@@ -911,6 +981,8 @@ Helidon 4.0.0 is a major release that includes significant new features and fixe
 - MicroProfile: MP path based static content should use index.html (4.x) [4737](https://github.com/oracle/helidon/pull/4737)
 - Build: 4.0 version and poms [4655](https://github.com/oracle/helidon/pull/4655)
 
+[4.0.3]: https://github.com/oracle/helidon/compare/4.0.2...4.0.3
+[4.0.2]: https://github.com/oracle/helidon/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/oracle/helidon/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/oracle/helidon/compare/4.0.0-RC2...4.0.0
 [4.0.0-RC2]: https://github.com/oracle/helidon/compare/4.0.0-RC1...4.0.0-RC2

NOTICE.txt

@@ -2,7 +2,7 @@
                            Project Helidon
                            ===============
 
-Copyright (c) 2017, 2023 Oracle and/or its affiliates.
+Copyright (c) 2017, 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.

all/pom.xml

@@ -1,6 +1,6 @@
 <?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.

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.

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.

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.

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.

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.
@@ -103,14 +103,14 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                         <value>io.helidon.metrics.api.MetricsFactory</value>
                                     </list>
                                     <list key="MainTest-other-imports">
-                                        <value>org.junit.jupiter.api.BeforeAll</value>
+                                        <value>org.junit.jupiter.api.AfterAll</value>
                                     </list>
                                     <list key="MainTest-static-imports">
                                         <value>static org.junit.jupiter.api.Assertions.assertEquals</value>
                                     </list>
                                     <list key="MainTest-methods" order="999">
                                         <value><![CDATA[
-    @BeforeAll
+    @AfterAll
     static void clear() {
         MetricsFactory.closeAll();
     }
@@ -199,7 +199,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                         <value>io.helidon.metrics.api.MetricsFactory</value>
                                     </list>
                                     <list key="MainTest-other-imports">
-                                        <value>org.junit.jupiter.api.BeforeAll</value>
+                                        <value>org.junit.jupiter.api.AfterAll</value>
                                     </list>
                                     <list key="MainTest-static-fields">
                                         <value><![CDATA[
@@ -208,7 +208,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                     </list>
                                     <list key="MainTest-methods" order="999">
                                         <value><![CDATA[
-    @BeforeAll
+    @AfterAll
     static void clear() {
         MetricsFactory.closeAll();
     }

bom/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2017, 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.