Skip to content

Commit 9c00173

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 0ad2a28 + 4e20c28 commit 9c00173

File tree

18 files changed

+173
-148
lines changed

18 files changed

+173
-148
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ jobs:
3939
java-version: ${{ matrix.java }}
4040
maven-executable: ./mvnw
4141
sonar-run-on-os: ubuntu-latest
42-
sonar-run-on-java-version: 11
42+
sonar-run-on-java-version: 17
4343
sonar-token: ${{ secrets.SONAR_TOKEN }}
4444
github-token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
name: Deploy
44

5+
concurrency: ${{ github.workflow }}
6+
57
on:
68
push:
79
branches:

‎.mvn/wrapper/maven-wrapper.jar‎

3.73 KB
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

‎changes.xml‎

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

26+
<release version="1.16.2" date="2023-08-31">
27+
<action type="fix" dev="sseifert">
28+
conga-maven-plugin: Eliminate warning "Parameter 'repoSession' (user property 'repositorySystemSession') is read-only, must not be used in configuration".
29+
</action>
30+
</release>
31+
2632
<release version="1.16.0" date="2023-07-03">
2733
<action type="add" dev="sseifert">
2834
Add new custom Handlebars expressions 'disallowProperty' which allows to block property names no longer supported.

‎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.16.0</version>
28+
<version>1.16.2</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.16.0</version>
47+
<version>1.16.2</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎generator/src/main/java/io/wcm/devops/conga/generator/plugins/fileheader/XmlFileHeader.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package io.wcm.devops.conga.generator.plugins.fileheader;
2121

2222
import java.io.IOException;
23+
import java.nio.file.Files;
2324
import java.util.List;
2425

2526
import javax.xml.XMLConstants;
@@ -101,7 +102,7 @@ public Void apply(FileContext file, FileHeaderContext context) {
101102
doc.insertBefore(comment, doc.getChildNodes().item(0));
102103

103104
// write file
104-
file.getFile().delete();
105+
Files.delete(file.getFile().toPath());
105106
DOMSource source = new DOMSource(doc);
106107
StreamResult result = new StreamResult(file.getFile());
107108
transformer.transform(source, result);

‎model/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.16.0</version>
28+
<version>1.16.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>io.wcm.devops.conga</groupId>
4242
<artifactId>io.wcm.devops.conga.resource</artifactId>
43-
<version>1.16.0</version>
43+
<version>1.16.2</version>
4444
<scope>compile</scope>
4545
</dependency>
4646

0 commit comments

Comments
 (0)