Skip to content

Commit 29ec894

Browse files
committed
Merge branch 'dev-4.x' into my-dev-4.x
2 parents 02b8268 + d2ff629 commit 29ec894

File tree

5 files changed

+45
-3
lines changed

5 files changed

+45
-3
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
#
2+
# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
# Notes
217
# - cannot run on Windows, as we use shell scripts
318

.github/workflows/validate.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
1+
#
2+
# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
# Notes
217
# - cannot run on Windows, as we use shell scripts
318
# - Most jobs require a Helidon priming build to execute
419

520
name: "Validate"
621

7-
on: [pull_request, workflow_call]
22+
on:
23+
pull_request:
24+
push:
25+
branches-ignore: [ 'dev-*.x', 'release-*' ]
26+
tags-ignore: [ '**' ]
27+
workflow_call:
828

929
env:
1030
JAVA_VERSION: '21'
@@ -71,6 +91,8 @@ jobs:
7191
name: io-helidon-maven-artifacts
7292
path: ~/.m2/repository/io/helidon
7393
- uses: actions/checkout@v4
94+
with:
95+
fetch-depth: '0'
7496
- name: Set up JDK ${{ env.JAVA_VERSION }}
7597
uses: actions/[email protected]
7698
with:
@@ -85,7 +107,7 @@ jobs:
85107
steps:
86108
- uses: actions/checkout@v4
87109
with:
88-
ref: ${{ inputs.ref }}
110+
fetch-depth: 0
89111
- name: ShellCheck
90112
run: etc/scripts/shellcheck.sh
91113
spotbugs:
@@ -99,6 +121,8 @@ jobs:
99121
name: io-helidon-maven-artifacts
100122
path: ~/.m2/repository/io/helidon
101123
- uses: actions/checkout@v4
124+
with:
125+
fetch-depth: '0'
102126
- name: Set up JDK ${{ env.JAVA_VERSION }}
103127
uses: actions/[email protected]
104128
with:

etc/copyright-exclude.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
.exe
88
.gif
99
.gitignore
10-
.github/
1110
.ico
1211
.jar
1312
.jks

examples/logging/logback-aot/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
<properties>
4141
<mainClass>io.helidon.examples.logging.logback.aot.Main</mainClass>
42+
<version.lib.logback>1.5.16</version.lib.logback>
4243
</properties>
4344

4445
<dependencies>
@@ -61,6 +62,7 @@
6162
<dependency>
6263
<groupId>ch.qos.logback</groupId>
6364
<artifactId>logback-classic</artifactId>
65+
<version>${version.lib.logback}</version>
6466
</dependency>
6567
</dependencies>
6668

examples/logging/slf4j/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
<properties>
4040
<mainClass>io.helidon.examples.logging.slf4j.Main</mainClass>
41+
<version.lib.logback>1.5.16</version.lib.logback>
4142
</properties>
4243

4344
<dependencies>
@@ -60,6 +61,7 @@
6061
<dependency>
6162
<groupId>ch.qos.logback</groupId>
6263
<artifactId>logback-classic</artifactId>
64+
<version>${version.lib.logback}</version>
6365
</dependency>
6466
</dependencies>
6567

0 commit comments

Comments
 (0)