Skip to content

Commit 1a8fa2a

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 33bb11f + 49be31d commit 1a8fa2a

File tree

57 files changed

+174
-143
lines changed

Some content is hidden

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

57 files changed

+174
-143
lines changed

‎.github/renovate.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"extends": [
44
"github>wcm-io/renovate-config:maven",
55
"github>wcm-io/renovate-config:automerge-parent",
6+
"github>wcm-io/renovate-config:automerge-trusted-3rdparty",
67
"github>wcm-io/renovate-config:automerge-testing",
78
"github>wcm-io-devops/renovate-config:automerge-parent"
89
],

‎changes.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
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.17.6" date="2025-09-19">
28+
<action type="update" dev="sseifert">
29+
Update dependencies.
30+
</action>
31+
</release>
2732

2833
<release version="1.17.4" date="2025-06-18">
2934
<action type="fix" dev="trichter" issue="125">

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

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.apache.commons.io.FilenameUtils;
3838
import org.apache.commons.lang3.ArrayUtils;
3939
import org.apache.commons.lang3.StringUtils;
40+
import org.apache.commons.lang3.Strings;
4041
import org.slf4j.Logger;
4142

4243
import com.github.jknack.handlebars.Handlebars;
@@ -271,7 +272,7 @@ private void generateNode(Node node) {
271272

272273
private RoleVariant getRoleVariant(Role role, String variant, String roleName, Node node) {
273274
for (RoleVariant roleVariant : role.getVariants()) {
274-
if (StringUtils.equals(variant, roleVariant.getVariant())) {
275+
if (Strings.CS.equals(variant, roleVariant.getVariant())) {
275276
return roleVariant;
276277
}
277278
}
@@ -312,7 +313,7 @@ private String getEscapingStrategy(RoleFile roleFile) {
312313
EscapingStrategyContext context = new EscapingStrategyContext()
313314
.pluginContextOptions(this.pluginContextOptions);
314315
return options.getPluginManager().getAll(EscapingStrategyPlugin.class).stream()
315-
.filter(plugin -> !StringUtils.equals(plugin.getName(), NoneEscapingStrategy.NAME))
316+
.filter(plugin -> !Strings.CS.equals(plugin.getName(), NoneEscapingStrategy.NAME))
316317
.filter(plugin -> plugin.accepts(fileExtension, context))
317318
.findFirst().orElse(options.getPluginManager().get(NoneEscapingStrategy.NAME, EscapingStrategyPlugin.class))
318319
.getName();
@@ -347,7 +348,7 @@ private void multiplyFiles(Role role, RoleFile roleFile, Map<String, Object> con
347348
boolean skip = false;
348349
if (StringUtils.isNotEmpty(roleFile.getCondition())) {
349350
String condition = variableStringResolver.resolveString(roleFile.getCondition(), resolvedConfig);
350-
skip = StringUtils.isBlank(condition) || StringUtils.equalsIgnoreCase(condition, "false");
351+
skip = StringUtils.isBlank(condition) || Strings.CI.equals(condition, "false");
351352
}
352353

353354
if (!skip) {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.apache.commons.io.FileUtils;
4040
import org.apache.commons.io.IOUtils;
4141
import org.apache.commons.lang3.StringUtils;
42+
import org.apache.commons.lang3.Strings;
4243
import org.slf4j.Logger;
4344

4445
import com.github.jknack.handlebars.Template;
@@ -390,7 +391,7 @@ private void applyFileHeader(FileContext fileItem, String pluginName) {
390391
pluginNames.add(pluginName);
391392
}
392393
collectFilePlugins(FileHeaderPlugin.class, fileItem, fileHeaderContext, pluginNames)
393-
.filter(plugin -> !StringUtils.equals(plugin.getName(), NoneFileHeader.NAME))
394+
.filter(plugin -> !Strings.CS.equals(plugin.getName(), NoneFileHeader.NAME))
394395
.forEach(plugin -> applyFileHeader(fileItem, plugin));
395396
}
396397

@@ -403,7 +404,7 @@ private void applyFileHeader(FileContext fileItem, FileHeaderPlugin plugin) {
403404

404405
private void applyValidation(FileContext fileItem, List<String> pluginNames) {
405406
collectFilePlugins(ValidatorPlugin.class, fileItem, validatorContext, pluginNames)
406-
.filter(plugin -> !StringUtils.equals(plugin.getName(), NoneValidator.NAME))
407+
.filter(plugin -> !Strings.CS.equals(plugin.getName(), NoneValidator.NAME))
407408
.forEach(plugin -> applyValidation(fileItem, plugin));
408409
}
409410

‎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.apache.commons.lang3.Strings;
3536
import org.yaml.snakeyaml.DumperOptions;
3637
import org.yaml.snakeyaml.Yaml;
3738

@@ -163,7 +164,7 @@ private void save(Map<String, Object> modelMap, NodeModelExportContext context)
163164

164165
private String cleanupFileName(String fileName, String basePath) {
165166
String relativePath = StringUtils.substring(fileName, basePath.length() + 1);
166-
return StringUtils.replace(relativePath, File.separator, "/");
167+
return Strings.CS.replace(relativePath, File.separator, "/");
167168
}
168169

169170
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
import org.apache.commons.io.FileUtils;
3131
import org.apache.commons.lang3.StringUtils;
32+
import org.apache.commons.lang3.Strings;
3233

3334
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3435
import io.wcm.devops.conga.generator.GeneratorException;
@@ -145,10 +146,10 @@ protected final FileHeaderContext extractFileHeaderWithLinePrefixes(FileContext
145146
content = content.substring(insertPosition);
146147

147148
String[] contentLines = StringUtils.split(content, getLineBreak());
148-
if (contentLines.length > 0 && StringUtils.startsWith(contentLines[0], getCommentLinePrefix())) {
149+
if (contentLines.length > 0 && Strings.CS.startsWith(contentLines[0], getCommentLinePrefix())) {
149150
List<String> lines = new ArrayList<>();
150151
for (int i = 0; i < contentLines.length; i++) {
151-
if (StringUtils.startsWith(contentLines[i], getCommentLinePrefix())) {
152+
if (Strings.CS.startsWith(contentLines[i], getCommentLinePrefix())) {
152153
lines.add(contentLines[i].substring(getCommentLinePrefix().length()));
153154
}
154155
else {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
package io.wcm.devops.conga.generator.plugins.fileheader;
2121

22-
import org.apache.commons.lang3.StringUtils;
22+
import org.apache.commons.lang3.Strings;
2323

2424
import io.wcm.devops.conga.generator.spi.context.FileContext;
2525
import io.wcm.devops.conga.generator.spi.context.FileHeaderContext;
@@ -49,7 +49,7 @@ public boolean accepts(FileContext file, FileHeaderContext context) {
4949

5050
@Override
5151
protected String sanitizeComment(String line) {
52-
return StringUtils.replace(StringUtils.replace(line, "/*", "/+"), "*/", "+/");
52+
return Strings.CS.replace(Strings.CS.replace(line, "/*", "/+"), "*/", "+/");
5353
}
5454

5555
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
package io.wcm.devops.conga.generator.plugins.fileheader;
2121

22-
import org.apache.commons.lang3.StringUtils;
22+
import org.apache.commons.lang3.Strings;
2323

2424
import io.wcm.devops.conga.generator.spi.context.FileContext;
2525
import io.wcm.devops.conga.generator.spi.context.FileHeaderContext;
@@ -60,8 +60,8 @@ protected String getBlockSuffix() {
6060
@Override
6161
protected int getInsertPosition(String content) {
6262
// keep shebang on first line if present
63-
if (StringUtils.startsWith(content, "#!")) {
64-
return StringUtils.indexOf(content, "\n") + 1;
63+
if (Strings.CS.startsWith(content, "#!")) {
64+
return Strings.CS.indexOf(content, "\n") + 1;
6565
}
6666
return 0;
6767
}

‎generator/src/main/java/io/wcm/devops/conga/generator/plugins/postprocessor/AbstractPostProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.util.Optional;
2323

24-
import org.apache.commons.lang3.StringUtils;
24+
import org.apache.commons.lang3.Strings;
2525

2626
import io.wcm.devops.conga.generator.plugins.fileheader.NoneFileHeader;
2727
import io.wcm.devops.conga.generator.spi.FileHeaderPlugin;
@@ -80,7 +80,7 @@ private FileHeaderPlugin detectFileHeaderPlugin(FileContext file, PostProcessorC
8080
Optional<FileHeaderPlugin> fileHeaderPlugin = postProcessorContext.getPluginManager()
8181
.getAll(FileHeaderPlugin.class).stream()
8282
.filter(plugin -> plugin.accepts(file, dummyFileHeader))
83-
.filter(plugin -> !StringUtils.equals(plugin.getName(), NoneFileHeader.NAME))
83+
.filter(plugin -> !Strings.CS.equals(plugin.getName(), NoneFileHeader.NAME))
8484
.findFirst();
8585
if (fileHeaderPlugin.isPresent()) {
8686
return fileHeaderPlugin.get();

0 commit comments

Comments
 (0)