Skip to content

Commit 33bb11f

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents dc29d27 + 13a0b84 commit 33bb11f

File tree

32 files changed

+114
-80
lines changed

32 files changed

+114
-80
lines changed

‎.maven-settings.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</repository>
4444

4545
<repository>
46-
<id>oss-snapshots</id>
47-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
46+
<id>sonatype-central-snapshots</id>
47+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
4848
<layout>default</layout>
4949
<releases>
5050
<enabled>false</enabled>
@@ -86,8 +86,8 @@
8686
</pluginRepository>
8787

8888
<pluginRepository>
89-
<id>oss-snapshots</id>
90-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
89+
<id>sonatype-central-snapshots</id>
90+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
9191
<layout>default</layout>
9292
<releases>
9393
<enabled>false</enabled>
@@ -123,7 +123,12 @@
123123

124124
<servers>
125125
<server>
126-
<id>ossrh</id>
126+
<id>sonatype-central</id>
127+
<username>${env.SONATYPE_USERNAME}</username>
128+
<password>${env.SONATYPE_PASSWORD}</password>
129+
</server>
130+
<server>
131+
<id>sonatype-central-snapshots</id>
127132
<username>${env.SONATYPE_USERNAME}</username>
128133
<password>${env.SONATYPE_PASSWORD}</password>
129134
</server>

‎changes.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@
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+
28+
<release version="1.17.4" date="2025-06-18">
29+
<action type="fix" dev="trichter" issue="125">
30+
Increase SnakeYAML codepoint limit to 256MB (from 64MB)
31+
</action>
32+
<action type="update" dev="sseifert">
33+
CONGA Maven Plugin: Switch to JSR-330 annotations.
34+
</action>
35+
</release>
36+
2737
<release version="1.17.2" date="2025-03-31">
2838
<action type="update" dev="sseifert">
2939
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.2</version>
28+
<version>1.17.4</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.2</version>
47+
<version>1.17.4</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎generator/src/main/java/io/wcm/devops/conga/generator/plugins/export/YamlNodeModelExport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.stream.Collectors;
3333

3434
import org.apache.commons.lang3.StringUtils;
35+
import org.yaml.snakeyaml.DumperOptions;
3536
import org.yaml.snakeyaml.Yaml;
3637

3738
import io.wcm.devops.conga.generator.GeneratorException;
@@ -152,7 +153,7 @@ private void save(Map<String, Object> modelMap, NodeModelExportContext context)
152153
File file = new File(context.getNodeDir(), MODEL_FILE);
153154
try (FileOutputStream os = new FileOutputStream(file);
154155
OutputStreamWriter writer = new OutputStreamWriter(os, StandardCharsets.UTF_8)) {
155-
Yaml yaml = new Yaml(context.getYamlRepresenter());
156+
Yaml yaml = new Yaml(context.getYamlRepresenter(), new DumperOptions());
156157
yaml.dump(modelMap, writer);
157158
}
158159
/*CHECKSTYLE:OFF*/ catch (Exception ex) { /*CHECKSTYLE:ON*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public FileHeaderContext extract(FileContext file) {
119119
if (doc.getChildNodes().getLength() > 0) {
120120
Node firstNode = doc.getChildNodes().item(0);
121121
if (firstNode instanceof Comment) {
122-
String comment = StringUtils.trim(((Comment)firstNode).getTextContent());
122+
String comment = StringUtils.trim(firstNode.getTextContent());
123123
List<String> lines = Arrays.asList(StringUtils.split(comment, "\n"));
124124
return new FileHeaderContext().commentLines(lines);
125125
}

‎generator/src/main/java/io/wcm/devops/conga/generator/util/ValueUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ else if (value instanceof Map) {
109109
if (sb.length() > 0) {
110110
sb.append(",");
111111
}
112-
sb.append(valueToString(entry.getKey()));
113-
sb.append("=");
114-
sb.append(valueToString(entry.getValue()));
112+
sb.append(valueToString(entry.getKey()))
113+
.append("=")
114+
.append(valueToString(entry.getValue()));
115115
}
116116
return sb.toString();
117117
}

‎generator/src/test/java/io/wcm/devops/conga/generator/UrlFileManagerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void testGetFile_Classpath() throws Exception {
7171
}
7272

7373
@Test
74-
void testGetFile_Invalid() throws Exception {
74+
void testGetFile_Invalid() {
7575
assertThrows(IOException.class, () -> {
7676
underTest.getFile("other:/x/y/z");
7777
});
@@ -106,7 +106,7 @@ void testGetFileUrl_Classpath() throws Exception {
106106
}
107107

108108
@Test
109-
void testGetFileUrl_Invalid() throws Exception {
109+
void testGetFileUrl_Invalid() {
110110
assertThrows(IOException.class, () -> {
111111
underTest.getFileUrl("other:/x/y/z");
112112
});

‎generator/src/test/java/io/wcm/devops/conga/generator/plugins/handlebars/helper/DisallowPropertyHelperTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ void setUp() {
4242
}
4343

4444
@Test
45-
void testSetCase1() throws Exception {
45+
void testSetCase1() {
4646
assertThrows(IOException.class, () -> {
4747
assertHelper(null, helper, "p1", new MockOptions()
4848
.withProperty("p1", "v1"));
4949
});
5050
}
5151

5252
@Test
53-
void testSetCase2() throws Exception {
53+
void testSetCase2() {
5454
IOException ex = assertThrows(IOException.class, () -> {
5555
assertHelper(null, helper, "p1", new MockOptions("Custom Error Message")
5656
.withProperty("p1", "v1")

‎generator/src/test/java/io/wcm/devops/conga/generator/plugins/handlebars/helper/EnsurePropertiesHelperTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ void testSet() throws Exception {
5555
}
5656

5757
@Test
58-
void testNotSetCase1() throws Exception {
58+
void testNotSetCase1() {
5959
assertThrows(IOException.class, () -> {
6060
assertHelper(null, helper, "p1", new MockOptions());
6161
});
6262
}
6363

6464
@Test
65-
void testNotSetCase2() throws Exception {
65+
void testNotSetCase2() {
6666
assertThrows(IOException.class, () -> {
6767
assertHelper(null, helper, "p1", new MockOptions("p2", "p3"));
6868
});
6969
}
7070

7171
@Test
72-
void testNotSetCase3() throws Exception {
72+
void testNotSetCase3() {
7373
assertThrows(IOException.class, () -> {
7474
assertHelper(null, helper, "p1", new MockOptions("p2", "p3")
7575
.withProperty("p1", "v1")
@@ -78,7 +78,7 @@ void testNotSetCase3() throws Exception {
7878
}
7979

8080
@Test
81-
void testNotSetCase4() throws Exception {
81+
void testNotSetCase4() {
8282
assertThrows(IOException.class, () -> {
8383
assertHelper(null, helper, "p1", new MockOptions("p2", "p3")
8484
.withProperty("p2", "v1"));

‎generator/src/test/java/io/wcm/devops/conga/generator/plugins/urlfile/ClasspathUrlFilePluginTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void testGetFile() throws Exception {
6262
}
6363

6464
@Test
65-
void testGetFile_NonExisting() throws Exception {
65+
void testGetFile_NonExisting() {
6666
assertThrows(FileNotFoundException.class, () -> {
6767
underTest.getFile("classpath:/non-exixting-file", context);
6868
});
@@ -78,7 +78,7 @@ void testGetFileUrl() throws Exception {
7878
}
7979

8080
@Test
81-
void testGetFileUrl_NonExisting() throws Exception {
81+
void testGetFileUrl_NonExisting() {
8282
assertThrows(FileNotFoundException.class, () -> {
8383
underTest.getFileUrl("classpath:/non-exixting-file", context);
8484
});

0 commit comments

Comments
 (0)