Skip to content

Commit 7193ef8

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 1a8fa2a + 25ef4e5 commit 7193ef8

File tree

41 files changed

+184
-129
lines changed

Some content is hidden

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

41 files changed

+184
-129
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
java: [11, 17, 21]
18+
java: [17, 21]
1919
os: [ubuntu-latest]
2020
distribution: [temurin]
2121
include:
22-
- java: 11
22+
- java: 17
2323
os: windows-latest
2424
distribution: temurin
25-
- java: 11
25+
- java: 17
2626
os: macos-latest
2727
distribution: temurin
2828

‎.github/workflows/maven-deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Configure GIT
2323
run: |
2424
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
2525
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2626
2727
- name: Setup JDK
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
distribution: temurin
31-
java-version: 11
31+
java-version: 17
3232
cache: maven
3333

3434
- name: Build, verify, deploy, generate site

‎.github/workflows/release-from-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: ncipollo/release-action@v1
1717
with:
1818
body: 'Changes: https://devops.wcm.io/conga/changes.html'

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<img src="https://wcm.io/images/[email protected]"/> CONGA - CONfiguration GenerAtor
22
======
3-
[![Build](https://github.com/wcm-io-devops/conga/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga/actions?query=workflow%3ABuild+branch%3Adevelop)
3+
[![Build](https://github.com/wcm-io-devops/conga/actions/workflows/maven-build.yml/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga/actions?query=workflow%3ABuild+branch%3Adevelop)
44
[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga/conga-maven-plugin)](https://repo1.maven.org/maven2/io/wcm/devops/conga/conga-maven-plugin)
55
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga)
66

‎changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
2525
<body>
2626

27+
<release version="1.18.0" date="2025-09-25">
28+
<action type="update" dev="sseifert">
29+
Switch to Java 17.
30+
</action>
31+
</release>
32+
2733
<release version="1.17.6" date="2025-09-19">
2834
<action type="update" dev="sseifert">
2935
Update dependencies.

‎generator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga</groupId>
2727
<artifactId>io.wcm.devops.conga.parent</artifactId>
28-
<version>1.17.6</version>
28+
<version>1.18.0</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm.devops.conga</groupId>
4646
<artifactId>io.wcm.devops.conga.model</artifactId>
47-
<version>1.17.6</version>
47+
<version>1.18.0</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎generator/src/main/java/io/wcm/devops/conga/generator/EnvironmentGenerator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.List;
3232
import java.util.Map;
3333
import java.util.Set;
34-
import java.util.stream.Collectors;
3534

3635
import org.apache.commons.collections.CollectionUtils;
3736
import org.apache.commons.io.FilenameUtils;
@@ -256,7 +255,7 @@ private void generateNode(Node node) {
256255
// filter out result files probably deleted by other file definitions
257256
allFiles = allFiles.stream()
258257
.filter(generatedFile -> generatedFile.getFileContext().getFile().exists())
259-
.collect(Collectors.toList());
258+
.toList();
260259

261260
exportNodeRoleData.files(allFiles);
262261
}

‎generator/src/main/java/io/wcm/devops/conga/generator/FileGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ private List<FileContext> applyPostProcessor(FileContext fileItem, PostProcessor
510510

511511
private String getPostProcessorFileHeader() {
512512
Object fileHeader = MapExpander.getDeep(postProcessorContext.getOptions(), POSTPROCESSOR_KEY_FILE_HEADER);
513-
if (fileHeader instanceof String) {
514-
return (String)fileHeader;
513+
if (fileHeader instanceof String fileHeaderString) {
514+
return fileHeaderString;
515515
}
516516
else {
517517
return null;

‎generator/src/main/java/io/wcm/devops/conga/generator/handlebars/HandlebarsKey.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public int hashCode() {
5353

5454
@Override
5555
public boolean equals(Object obj) {
56-
if (obj instanceof HandlebarsKey) {
57-
return combinedKey.equals(((HandlebarsKey)obj).combinedKey);
56+
if (obj instanceof HandlebarsKey key) {
57+
return combinedKey.equals(key.combinedKey);
5858
}
5959
return false;
6060
}

0 commit comments

Comments
 (0)