Skip to content

Commit b6f9d26

Browse files
committed
Merge remote-tracking branch 'origin/master' into dependencies
2 parents a71a90b + cb71372 commit b6f9d26

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ updates:
1111
versions: [">= 5"]
1212
- dependency-name: "org.mockito:mockito-junit-jupiter"
1313
versions: [">= 5"]
14+
- dependency-name: "org.junit.jupiter:junit-jupiter-engine"
15+
versions: [">= 6"]
16+
- dependency-name: "org.junit.jupiter:junit-jupiter-params"
17+
versions: [">= 6"]
1418
- package-ecosystem: "github-actions"
1519
directory: "/"
1620
schedule:

.github/workflows/maven_jdk8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
coveralls_repo_token: ${{ secrets.COVERALLS_REPO_TOKEN }}
1313

1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616

1717
- name: Set up JDK 8
1818
uses: actions/setup-java@v5

.github/workflows/maven_jdk_lts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Java ${{ matrix.java }} build
1616

1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
- name: Set up Java
2020
uses: actions/setup-java@v5
2121
with:

.github/workflows/mega-linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
# Git Checkout
4949
- name: Checkout Code
50-
uses: actions/checkout@v5
50+
uses: actions/checkout@v6
5151
with:
5252
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
5353

@@ -98,7 +98,7 @@ jobs:
9898

9999
# Upload MegaLinter artifacts
100100
- name: Archive production artifacts
101-
uses: actions/upload-artifact@v4
101+
uses: actions/upload-artifact@v5
102102
if: success() || failure()
103103
with:
104104
name: MegaLinter reports

src/main/java/ch/jalu/configme/configurationdata/CommentsConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
*/
1717
public class CommentsConfiguration {
1818

19-
private final @NotNull Map<String, List<String>> comments;
20-
19+
/** Fake path under which footer comments are registered. */
2120
public static final String FOOTER_KEY = "..FOOTER";
2221

22+
private final @NotNull Map<String, List<String>> comments;
23+
2324
/**
2425
* Constructor.
2526
*/

src/test/java/ch/jalu/configme/resource/YamlFileResourceFooterCommentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.io.IOException;
1515
import java.nio.file.Files;
1616
import java.nio.file.Path;
17-
import java.util.*;
17+
import java.util.List;
1818

1919
import static org.hamcrest.MatcherAssert.assertThat;
2020
import static org.hamcrest.Matchers.contains;

0 commit comments

Comments
 (0)