Skip to content

Commit 6576429

Browse files
jbescosjbescos
committed
Merge branch 'helidon-3.x' into issue7206
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
2 parents ba9c9a5 + 1277e61 commit 6576429

File tree

610 files changed

+2158
-1351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

610 files changed

+2158
-1351
lines changed

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ For Helidon 2.x releases please see [Helidon 2.x CHANGELOG.md](https://github.co
99

1010
For Helidon 1.x releases please see [Helidon 1.x CHANGELOG.md](https://github.com/oracle/helidon/blob/helidon-1.x/CHANGELOG.md)
1111

12+
## [3.2.6]
13+
14+
This is a bugfix release of Helidon and is recommended for all users of Helidon 3. Helidon 3 requires Java 17 or newer.
15+
16+
### CHANGES
17+
18+
- Common: Manually count number of offered tasks instead of relying on pool active count [8264](https://github.com/helidon-io/helidon/pull/8264)
19+
- JAX-RS Client: TLS replace in HelidonConnector fix [7902](https://github.com/helidon-io/helidon/pull/7902)
20+
- Tracing: Backport of scope/baggage fix [8244](https://github.com/helidon-io/helidon/pull/8244)
21+
- Tracing: Guard against NPE during early invocation of Span.current() [8256](https://github.com/helidon-io/helidon/pull/8256)
22+
- WebClient: Calls clearData() on all data propagation providers. [8328](https://github.com/helidon-io/helidon/pull/8328)
23+
- Dependencies: Upgrade OCI SDK to 3.34.0 [8351](https://github.com/helidon-io/helidon/pull/8351)
24+
- Dependencies: Upgrade to Jersey 3.0.12 [8346](https://github.com/helidon-io/helidon/pull/8346)
25+
- Dependencies: Upgrading to latest Tyrus 2.1.5 [8277](https://github.com/helidon-io/helidon/pull/8277)
26+
- Dependencies: upgrade jsonp-api to 2.0.2 [8203](https://github.com/helidon-io/helidon/pull/8203)
27+
- Examples: Archetype - Add jpms option with false as default [8310](https://github.com/helidon-io/helidon/pull/8310)
28+
- Tests: Make OciMetricsDataTest.beforeEach non private [7328](https://github.com/helidon-io/helidon/pull/7328)
29+
1230
## [3.2.5]
1331

1432
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:
845863
- Examples: Update bare-mp archetype to use microprofile-core [3795](https://github.com/oracle/helidon/pull/3795)
846864

847865

866+
[3.2.6]: https://github.com/helidon-io/helidon/compare/3.2.5...3.2.6
848867
[3.2.5]: https://github.com/helidon-io/helidon/compare/3.2.4...3.2.5
849868
[3.2.4]: https://github.com/helidon-io/helidon/compare/3.2.3...3.2.4
850869
[3.2.3]: https://github.com/helidon-io/helidon/compare/3.2.2...3.2.3

‎applications/mp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2019, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.helidon.applications</groupId>
2525
<artifactId>helidon-applications</artifactId>
26-
<version>3.2.6-SNAPSHOT</version>
26+
<version>3.2.7-SNAPSHOT</version>
2727
<relativePath>../parent/pom.xml</relativePath>
2828
</parent>
2929
<artifactId>helidon-mp</artifactId>

‎applications/parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2023, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.helidon.applications</groupId>
2525
<artifactId>helidon-applications-project</artifactId>
26-
<version>3.2.6-SNAPSHOT</version>
26+
<version>3.2.7-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<artifactId>helidon-applications</artifactId>

‎applications/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2019, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.helidon</groupId>
2525
<artifactId>helidon-dependencies</artifactId>
26-
<version>3.2.6-SNAPSHOT</version>
26+
<version>3.2.7-SNAPSHOT</version>
2727
<relativePath>../dependencies/pom.xml</relativePath>
2828
</parent>
2929
<groupId>io.helidon.applications</groupId>

‎applications/se/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2019, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.helidon.applications</groupId>
2525
<artifactId>helidon-applications</artifactId>
26-
<version>3.2.6-SNAPSHOT</version>
26+
<version>3.2.7-SNAPSHOT</version>
2727
<relativePath>../parent/pom.xml</relativePath>
2828
</parent>
2929
<artifactId>helidon-se</artifactId>

‎archetypes/helidon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>io.helidon.archetypes</groupId>
2525
<artifactId>helidon-archetypes-project</artifactId>
26-
<version>3.2.6-SNAPSHOT</version>
26+
<version>3.2.7-SNAPSHOT</version>
2727
</parent>
2828
<packaging>helidon-archetype</packaging>
2929
<artifactId>helidon</artifactId>

‎archetypes/helidon/src/main/archetype/common/common.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021, 2022 Oracle and/or its affiliates.
4+
Copyright (c) 2021, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@
4242
<includes>
4343
<include>.helidon.mustache</include>
4444
<include>README.md.mustache</include>
45-
<include>src/main/java/module-info.java.mustache</include>
4645
</includes>
4746
</templates>
4847
<model>

‎archetypes/helidon/src/main/archetype/common/extra.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022, 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -72,12 +72,12 @@
7272
<value if="${flavor} == 'mp'">io.helidon.common.reactive</value>
7373
<value if="${flavor} == 'se'">io.helidon.faulttolerance</value>
7474
</list>
75-
<list key="Main-helidon-imports">
75+
<list key="Main-helidon-imports" if="${flavor} == 'se'">
7676
<value>io.helidon.common.http.Http</value>
7777
<value>io.helidon.faulttolerance.BulkheadException</value>
7878
<value>io.helidon.faulttolerance.CircuitBreakerOpenException</value>
7979
</list>
80-
<list key="Main-other-imports">
80+
<list key="Main-other-imports" if="${flavor} == 'se'">
8181
<value>java.util.concurrent.TimeoutException</value>
8282
</list>
8383
<list key="Main-routingBuilder">

‎archetypes/helidon/src/main/archetype/common/files/src/main/java/__pkg__/Main.java.mustache

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package {{package}};
2+
3+
{{#Main-java-imports}}
4+
import {{.}};
5+
{{/Main-java-imports}}
6+
7+
{{#Main-helidon-imports}}
8+
import {{.}};
9+
{{/Main-helidon-imports}}
10+
11+
{{#Main-other-imports}}
12+
import {{.}};
13+
{{/Main-other-imports}}
14+
15+
{{#Main-static-imports}}
16+
import {{.}};
17+
{{/Main-static-imports}}
18+
19+
{{Main-class-javadoc}}
20+
public class Main {
21+
{{#Main-class-fields}}
22+
{{.}}
23+
{{/Main-class-fields}}
24+
25+
{{Main-method-javadoc}}
26+
public static void main(String[] args) {
27+
{{#Main-method-content}}
28+
{{.}}
29+
{{/Main-method-content}}
30+
}
31+
32+
{{#Main-class-content}}
33+
{{.}}
34+
{{/Main-class-content}}
35+
}

‎archetypes/helidon/src/main/archetype/common/observability.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022, 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
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
6666
<value key="artifactId">helidon-microprofile-metrics</value>
6767
</map>
6868
</list>
69-
<list key="Main-helidon-imports">
70-
<value>io.helidon.metrics.MetricsSupport</value>
71-
</list>
72-
<list key="Main-routingBuilder">
73-
<value><![CDATA[ .register(MetricsSupport.create()) // Metrics at "/metrics"]]></value>
74-
</list>
7569
<list key="SimpleGreetService-imports">
7670
<value>org.eclipse.microprofile.metrics.MetricUnits</value>
7771
<value>org.eclipse.microprofile.metrics.annotation.Counted</value>
@@ -355,7 +349,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
355349
<value>io.helidon.health</value>
356350
<value if="${flavor} == 'se'">io.helidon.health.checks</value>
357351
</list>
358-
<list key="Main-helidon-imports">
352+
<list key="Main-helidon-imports" if="${flavor} == 'se'">
359353
<value>io.helidon.health.HealthSupport</value>
360354
<value>io.helidon.health.checks.HealthChecks</value>
361355
</list>

‎archetypes/helidon/src/main/archetype/common/packaging.xml

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022, 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -93,6 +93,57 @@ kubectl delete -f app.yaml
9393
</templates>
9494
</output>
9595
</boolean>
96+
<boolean id="jpms"
97+
name="Module support (JPMS)"
98+
description="Add a module-info to your project"
99+
default="false"
100+
optional="true">
101+
<output>
102+
<templates engine="mustache" transformations="mustache,packaged">
103+
<directory>files</directory>
104+
<includes>
105+
<include>src/main/java/module-info.java.mustache</include>
106+
<include if="${flavor} == 'mp'">src/**/Main.java.mustache</include>
107+
</includes>
108+
</templates>
109+
<model if="${flavor} == 'mp'">
110+
<value key="mainClass">${package}.Main</value>
111+
<value key="Main-class-javadoc"><![CDATA[
112+
/**
113+
* Main entry point of the application.
114+
* <p>
115+
* Note that this class is required when using modules as the module main class must be in a package that is either exported
116+
* or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
117+
* <p>
118+
* This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
119+
*/]]>
120+
</value>
121+
<value key="Main-method-javadoc"><![CDATA[
122+
/**
123+
* Main method. Starts CDI (and the application).
124+
*
125+
* @param args ignored
126+
*/]]>
127+
</value>
128+
<list key="Main-class-fields">
129+
<value><![CDATA[
130+
/**
131+
* Cannot be instantiated.
132+
*/
133+
private Main() {
134+
}
135+
]]>
136+
</value>
137+
</list>
138+
<list key="Main-method-content">
139+
<value><![CDATA[io.helidon.microprofile.cdi.Main.main(args);]]></value>
140+
</list>
141+
<list key="modules">
142+
<value>io.helidon.microprofile.cdi</value>
143+
</list>
144+
</model>
145+
</output>
146+
</boolean>
96147
</inputs>
97148
</step>
98149
</archetype-script>

‎archetypes/helidon/src/main/archetype/common/presets.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022 Oracle and/or its affiliates.
4+
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -37,5 +37,6 @@
3737
<boolean path="docker.jlink-image">true</boolean>
3838
<boolean path="k8s">true</boolean>
3939
<boolean path="v8o">false</boolean>
40+
<boolean path="jpms">false</boolean>
4041
</presets>
4142
</archetype-script>

‎archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,35 @@ class GreetResourceMockedTest {
140140
@Override
141141
public CreateAlarmResponse createAlarm(CreateAlarmRequest createAlarmRequest) {return null;}
142142

143+
@Override
144+
public CreateAlarmSuppressionResponse createAlarmSuppression(CreateAlarmSuppressionRequest createAlarmSuppressionRequest) {
145+
return null;
146+
}
147+
143148
@Override
144149
public DeleteAlarmResponse deleteAlarm(DeleteAlarmRequest deleteAlarmRequest) {return null;}
145150

151+
@Override
152+
public DeleteAlarmSuppressionResponse deleteAlarmSuppression(DeleteAlarmSuppressionRequest deleteAlarmSuppressionRequest) {
153+
return null;
154+
}
155+
146156
@Override
147157
public GetAlarmResponse getAlarm(GetAlarmRequest getAlarmRequest) {return null;}
148158

149159
@Override
150160
public GetAlarmHistoryResponse getAlarmHistory(GetAlarmHistoryRequest getAlarmHistoryRequest) {return null;}
151161

162+
@Override
163+
public GetAlarmSuppressionResponse getAlarmSuppression(GetAlarmSuppressionRequest getAlarmSuppressionRequest) {
164+
return null;
165+
}
166+
167+
@Override
168+
public ListAlarmSuppressionsResponse listAlarmSuppressions(ListAlarmSuppressionsRequest listAlarmSuppressionsRequest) {
169+
return null;
170+
}
171+
152172
@Override
153173
public ListAlarmsResponse listAlarms(ListAlarmsRequest listAlarmsRequest) {return null;}
154174

@@ -183,6 +203,11 @@ class GreetResourceMockedTest {
183203
return null;
184204
}
185205

206+
@Override
207+
public SummarizeAlarmSuppressionHistoryResponse summarizeAlarmSuppressionHistory(SummarizeAlarmSuppressionHistoryRequest summarizeAlarmSuppressionHistoryRequest) {
208+
return null;
209+
}
210+
186211
@Override
187212
public SummarizeMetricsDataResponse summarizeMetricsData(SummarizeMetricsDataRequest summarizeMetricsDataRequest) {
188213
return null;

‎archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2023 Oracle and/or its affiliates.
4+
Copyright (c) 2023, 2024 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
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.
4545
<boolean path="docker.jlink-image">false</boolean>
4646
<boolean path="k8s">true</boolean>
4747
<boolean path="v8o">false</boolean>
48+
<boolean path="jpms">false</boolean>
4849
</presets>
4950
<call method="pre-processed-models"/>
5051
<exec src="/common/common.xml"/>

0 commit comments

Comments
 (0)