Skip to content

Commit 7569815

Browse files
committed
Merge branch 'main' into issue6105
Signed-off-by: Jorge Bescos Gascon <[email protected]>
2 parents db59583 + 0292d9b commit 7569815

File tree

2,199 files changed

+64598
-77477
lines changed

Some content is hidden

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

2,199 files changed

+64598
-77477
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022 Oracle and/or its affiliates.
2+
# Copyright (c) 2022, 2025 Oracle and/or its affiliates.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,3 +15,4 @@
1515

1616
# don't let GIT perform end of line mapping on these files
1717
enum-test*.txt -text
18+
Object*._java_ -text
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
## Environment Details
11+
* Helidon Version:
12+
* Helidon SE or Helidon MP
13+
* JDK version:
14+
* OS:
15+
16+
----------
17+
18+
## Problem Description
19+
[//]: # "Describe the bug in detail highlighting current behavior vs expected behavior"
20+
[//]: # "State if the problem is easily reproducible or happens intermittently"
21+
[//]: # "Include stack traces or command outputs"
22+
23+
## Steps to reproduce
24+
[//]: # "Step by step instructions to reproduce the problem"
25+
[//]: # "Provide sample code/application if relevant"
26+
27+

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Enhancement request
3+
about: Request an enhancement
4+
title: ''
5+
labels: 'enhancement'
6+
assignees: ''
7+
type: 'Feature'
8+
9+
---
10+
11+
## Environment Details
12+
* Helidon Version:
13+
* Helidon SE or Helidon MP
14+
15+
----------
16+
17+
## Enhancement Description
18+

.github/actions/common/action.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ inputs:
5454
runs:
5555
using: "composite"
5656
steps:
57-
- if: ${{ inputs.free-space == 'true' }}
57+
- if: ${{ inputs.free-space == 'true' && runner.os != 'Windows'}}
5858
# See https://github.com/actions/runner-images/issues/2840
5959
name: Free disk space
6060
shell: bash
@@ -84,7 +84,7 @@ runs:
8484
java-version: ${{ env.JAVA_VERSION }}
8585
- name: Cache local Maven repository (read-write)
8686
if: ${{ inputs.maven-cache == 'read-write' }}
87-
uses: actions/cache@v4.0.2
87+
uses: actions/cache@v4.2.0
8888
with:
8989
# See https://github.com/actions/toolkit/issues/713
9090
# Include must not match top level directories
@@ -98,7 +98,7 @@ runs:
9898
local-maven-
9999
- name: Cache local Maven repository (read-only)
100100
if: ${{ inputs.maven-cache == 'read-only' }}
101-
uses: actions/cache/restore@v4.0.2
101+
uses: actions/cache/restore@v4.2.0
102102
with:
103103
path: |
104104
.m2/repository/**/*.*
@@ -109,7 +109,7 @@ runs:
109109
local-maven-
110110
- name: Build cache (read-write)
111111
if: ${{ inputs.build-cache == 'read-write' }}
112-
uses: actions/cache@v4.0.2
112+
uses: actions/cache@v4.2.0
113113
with:
114114
path: |
115115
./**/target/**
@@ -121,7 +121,7 @@ runs:
121121
build-cache-${{ github.run_id }}-
122122
- name: Build cache (read-only)
123123
if: ${{ inputs.build-cache == 'read-only' }}
124-
uses: actions/cache/restore@v4.0.2
124+
uses: actions/cache/restore@v4.2.0
125125
with:
126126
path: |
127127
./**/target/**
@@ -134,14 +134,13 @@ runs:
134134
build-cache-${{ github.run_id }}-
135135
- name: Exec
136136
env:
137-
MAVEN_ARGS: |
138-
${{ env.MAVEN_ARGS }}
137+
MVN_ARGS: |
138+
${{ env.MVN_ARGS }}
139139
-Dmaven.repo.local=${{ github.workspace }}/.m2/repository
140140
run: ${{ inputs.run }}
141141
shell: bash
142142
- name: Archive test results
143-
# https://github.com/actions/upload-artifact/issues/240
144-
if: ${{ inputs.test-artifact-name != '' && runner.os != 'Windows' && always() }}
143+
if: ${{ inputs.test-artifact-name != '' && always() }}
145144
uses: actions/upload-artifact@v4
146145
with:
147146
if-no-files-found: 'ignore'

.github/issue_template.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
env:
2323
JAVA_VERSION: '21'
2424
JAVA_DISTRO: 'oracle'
25-
MAVEN_ARGS: |
25+
MVN_ARGS: |
2626
-B -e
2727
-Dmaven.wagon.httpconnectionManager.ttlSeconds=60
2828
-Dmaven.wagon.http.retryHandler.count=3
@@ -35,7 +35,7 @@ concurrency:
3535

3636
jobs:
3737
create-tag:
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-22.04
3939
environment: release
4040
outputs:
4141
version: ${{ steps.create-tag.outputs.version }}
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
matrix:
5959
moduleSet: [ core, integrations, others ]
60-
runs-on: ubuntu-20.04
60+
runs-on: ubuntu-22.04
6161
timeout-minutes: 30
6262
environment: release
6363
steps:
@@ -80,7 +80,7 @@ jobs:
8080
artifact-name: io-helidon-artifacts-part-${{ matrix.moduleSet }}
8181
artifact-path: staging
8282
run: |
83-
mvn ${MAVEN_ARGS} \
83+
mvn ${MVN_ARGS} \
8484
-DreactorRule=default \
8585
-DmoduleSet=${{ matrix.moduleSet }} \
8686
-Dcache.loadSuffixes=javadoc,docs \
@@ -118,7 +118,7 @@ jobs:
118118
resolve-all:
119119
needs: [ create-tag, deploy ]
120120
timeout-minutes: 30
121-
runs-on: ubuntu-20.04
121+
runs-on: ubuntu-22.04
122122
name: resolve-all
123123
steps:
124124
- uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
128128
- uses: ./.github/actions/common
129129
with:
130130
run: |
131-
mvn ${MAVEN_ARGS} -N \
131+
mvn ${MVN_ARGS} -N \
132132
-Possrh-staging \
133133
-Dartifact=io.helidon:helidon-all:${{ needs.create-tag.outputs.version }}:pom \
134134
dependency:get
@@ -144,7 +144,7 @@ jobs:
144144
- quickstart-mp
145145
- database-se
146146
- database-mp
147-
runs-on: ubuntu-20.04
147+
runs-on: ubuntu-22.04
148148
name: smoketest/${{ matrix.archetype }}
149149
steps:
150150
- uses: actions/checkout@v4

.github/workflows/snapshot.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
env:
2626
JAVA_VERSION: '21'
2727
JAVA_DISTRO: 'oracle'
28-
MAVEN_ARGS: |
28+
MVN_ARGS: |
2929
-B -e
3030
-Dmaven.wagon.httpconnectionManager.ttlSeconds=60
3131
-Dmaven.wagon.http.retryHandler.count=3
@@ -38,7 +38,7 @@ concurrency:
3838

3939
jobs:
4040
get-version:
41-
runs-on: ubuntu-20.04
41+
runs-on: ubuntu-22.04
4242
environment: release
4343
outputs:
4444
version: ${{ steps.get-version.outputs.version }}
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
matrix:
5959
moduleSet: [ core, integrations, others ]
60-
runs-on: ubuntu-20.04
60+
runs-on: ubuntu-22.04
6161
timeout-minutes: 30
6262
environment: release
6363
steps:
@@ -79,7 +79,7 @@ jobs:
7979
artifact-name: io-helidon-artifacts-part-${{ matrix.moduleSet }}
8080
artifact-path: staging
8181
run: |
82-
mvn ${MAVEN_ARGS} \
82+
mvn ${MVN_ARGS} \
8383
-DreactorRule=default \
8484
-DmoduleSet=${{ matrix.moduleSet }} \
8585
-Dcache.loadSuffixes=javadoc,docs \

0 commit comments

Comments
 (0)