Skip to content

Commit 5520396

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents fa648cf + 4d2d8a5 commit 5520396

File tree

30 files changed

+146
-98
lines changed

30 files changed

+146
-98
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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
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="2.22.0" date="2025-09-19">
28+
<action type="add" dev="sseifert" issue="208">
29+
CRX Package Manager Upload: Add system ready check after deployment (enabled by default, can be disabled).
30+
It only has an effect when deploying to AEMaaCS instances. Default responses from AEM 6.5 and 6.6 instances are accepted as valid.
31+
</action>
32+
</release>
33+
2734
<release version="2.21.0" date="2025-06-18">
2835
<action type="add" dev="sseifert" issue="179">
2936
Content Package Post Processors: Add option "dependencyChainIgnore" to ignore a content package in the dependency chain, i.e. it does not play a role for this package in which order it is deployed compared to other packages.

‎conga-aem-plugin/pom.xml‎

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

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
34-
<version>2.21.0</version>
34+
<version>2.22.0</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/crypto/CryptoString.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.plugins.aem.crypto;
2121

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

2424
/**
2525
* Converts byte array to crypto string and back in the same fashion as it is done by the Adobe Granite Crypto
@@ -39,7 +39,7 @@ private CryptoString() {
3939
public static boolean isCryptoString(final String text) {
4040
// very simplified check - just check for start and end of curly braces.
4141
return text != null && text.length() > 2
42-
&& StringUtils.startsWith(text, "{") && StringUtils.endsWith(text, "}");
42+
&& Strings.CS.startsWith(text, "{") && Strings.CS.endsWith(text, "}");
4343
}
4444

4545
/**

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackageOsgiConfigPostProcessor.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
import org.apache.commons.io.FilenameUtils;
3838
import org.apache.commons.lang3.StringUtils;
39+
import org.apache.commons.lang3.Strings;
3940
import org.apache.sling.provisioning.model.Model;
4041
import org.slf4j.Logger;
4142

@@ -71,7 +72,7 @@ public String getName() {
7172
@Override
7273
public boolean accepts(FileContext file, PostProcessorContext context) {
7374
return ProvisioningUtil.isProvisioningFile(file)
74-
|| StringUtils.endsWith(file.getFile().getName(), JsonOsgiConfigPostProcessor.FILE_EXTENSION);
75+
|| Strings.CS.endsWith(file.getFile().getName(), JsonOsgiConfigPostProcessor.FILE_EXTENSION);
7576
}
7677

7778
@Override
@@ -146,7 +147,7 @@ private boolean generateOsgiConfigurations(Model model, ContentPackage contentPa
146147
@Override
147148
@SuppressWarnings("java:S3457") // log placeholders
148149
public Void accept(String path, Dictionary<String, Object> properties) throws IOException {
149-
String contentPath = rootPath + (StringUtils.contains(path, "/") ? "." : "/") + path;
150+
String contentPath = rootPath + (Strings.CS.contains(path, "/") ? "." : "/") + path;
150151
context.getLogger().info(" Include " + contentPath);
151152

152153
// write configuration to temporary file
@@ -171,7 +172,7 @@ public Void accept(String path, Dictionary<String, Object> properties) throws IO
171172
}
172173

173174
private String getBaseFileName(String fileName) {
174-
if (StringUtils.endsWith(fileName, JsonOsgiConfigPostProcessor.FILE_EXTENSION)) {
175+
if (Strings.CS.endsWith(fileName, JsonOsgiConfigPostProcessor.FILE_EXTENSION)) {
175176
return StringUtils.substringBeforeLast(fileName, JsonOsgiConfigPostProcessor.FILE_EXTENSION);
176177
}
177178
else {

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/util/ContentElementHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.regex.Pattern;
2525

2626
import org.apache.commons.lang3.StringUtils;
27+
import org.apache.commons.lang3.Strings;
2728
import org.apache.sling.contentparser.api.ContentHandler;
2829

2930
import io.wcm.tooling.commons.contentpackagebuilder.element.ContentElement;
@@ -41,7 +42,7 @@ final class ContentElementHandler implements ContentHandler {
4142

4243
@Override
4344
public void resource(String path, Map<String, Object> properties) {
44-
if (StringUtils.equals(path, "/")) {
45+
if (Strings.CS.equals(path, "/")) {
4546
root = new ContentElementImpl(null, properties);
4647
}
4748
else {

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/util/ContentPackageUtil.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
import org.apache.commons.lang3.BooleanUtils;
5454
import org.apache.commons.lang3.StringUtils;
55+
import org.apache.commons.lang3.Strings;
5556

5657
import io.wcm.devops.conga.generator.GeneratorException;
5758
import io.wcm.devops.conga.generator.UrlFileManager;
@@ -156,10 +157,10 @@ private static List<PackageFilter> getFilters(Map<String, Object> options) {
156157
for (Map<String, Object> ruleDefinition : ruleDefinitions) {
157158
String rule = getMandatoryProp(ruleDefinition, "rule");
158159
String pattern = getMandatoryProp(ruleDefinition, "pattern");
159-
if (StringUtils.equals(rule, "include")) {
160+
if (Strings.CS.equals(rule, "include")) {
160161
filter.addIncludeRule(pattern);
161162
}
162-
else if (StringUtils.equals(rule, "exclude")) {
163+
else if (Strings.CS.equals(rule, "exclude")) {
163164
filter.addExcludeRule(pattern);
164165
}
165166
else {
@@ -216,7 +217,7 @@ private static AcHandling getAcHandling(Map<String, Object> options) {
216217
return null;
217218
}
218219
for (AcHandling acHandling : AcHandling.values()) {
219-
if (StringUtils.equals(acHandling.getMode(), acHandlingString)) {
220+
if (Strings.CS.equals(acHandling.getMode(), acHandlingString)) {
220221
return acHandling;
221222
}
222223
}
@@ -355,7 +356,7 @@ private static List<ContentPackageBinaryFile> getMatchingFiles(File targetDir, S
355356
return paths.filter(Files::isRegularFile)
356357
// strip off the target dir paths, keep only the relative path/file name
357358
.map(ContentPackageUtil::normalizedAbsolutePath)
358-
.map(file -> StringUtils.removeStart(file, targetPathPrefix))
359+
.map(file -> Strings.CS.removeStart(file, targetPathPrefix))
359360
// check if file matches with the regex, apply matching input groups to path
360361
.map(file -> {
361362
Matcher matcher = pattern.matcher(file);
@@ -373,7 +374,7 @@ private static List<ContentPackageBinaryFile> getMatchingFiles(File targetDir, S
373374
}
374375

375376
private static String normalizedAbsolutePath(Path path) {
376-
return StringUtils.replace(path.toAbsolutePath().toString(), "\\", "/");
377+
return Strings.CS.replace(path.toAbsolutePath().toString(), "\\", "/");
377378
}
378379

379380
}

‎conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/fileheader/AnyFileHeaderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.List;
2727

2828
import org.apache.commons.io.FileUtils;
29-
import org.apache.commons.lang3.StringUtils;
29+
import org.apache.commons.lang3.Strings;
3030
import org.junit.jupiter.api.BeforeEach;
3131
import org.junit.jupiter.api.Test;
3232

@@ -56,7 +56,7 @@ void testApply() throws Exception {
5656
assertTrue(underTest.accepts(fileContext, context));
5757
underTest.apply(fileContext, context);
5858

59-
assertTrue(StringUtils.contains(FileUtils.readFileToString(file, StandardCharsets.UTF_8),
59+
assertTrue(Strings.CS.contains(FileUtils.readFileToString(file, StandardCharsets.UTF_8),
6060
"# Der Jodelkaiser\n# aus dem Oetztal\n# ist wieder daheim.\n"));
6161

6262
FileHeaderContext extractContext = underTest.extract(fileContext);

‎parent/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>2.0.2</version>
28+
<version>2.0.4</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
34-
<version>2.21.0</version>
34+
<version>2.22.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -48,7 +48,7 @@
4848

4949
<properties>
5050
<maven.version>3.3.9</maven.version>
51-
<oak.version>1.80</oak.version>
51+
<oak.version>1.84.0</oak.version>
5252
</properties>
5353

5454
<dependencyManagement>
@@ -57,24 +57,24 @@
5757
<dependency>
5858
<groupId>io.wcm.devops.conga</groupId>
5959
<artifactId>io.wcm.devops.conga.generator</artifactId>
60-
<version>1.17.4</version>
60+
<version>1.17.6</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>io.wcm.devops.conga</groupId>
6464
<artifactId>conga-maven-plugin</artifactId>
65-
<version>1.17.4</version>
65+
<version>1.17.6</version>
6666
</dependency>
6767

6868
<dependency>
6969
<groupId>io.wcm.devops.conga.plugins</groupId>
7070
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
71-
<version>1.4.2</version>
71+
<version>1.4.4</version>
7272
</dependency>
7373

7474
<dependency>
7575
<groupId>io.wcm.devops.conga.plugins</groupId>
7676
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
77-
<version>1.4.8</version>
77+
<version>1.4.10</version>
7878
</dependency>
7979

8080
<dependency>
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>io.wcm.tooling.commons</groupId>
8787
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
88-
<version>2.2.0</version>
88+
<version>2.3.0</version>
8989
</dependency>
9090

9191
<dependency>
@@ -108,22 +108,22 @@
108108
<dependency>
109109
<groupId>org.apache.commons</groupId>
110110
<artifactId>commons-compress</artifactId>
111-
<version>1.27.1</version>
111+
<version>1.28.0</version>
112112
</dependency>
113113
<dependency>
114114
<groupId>commons-cli</groupId>
115115
<artifactId>commons-cli</artifactId>
116-
<version>1.9.0</version>
116+
<version>1.10.0</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>org.apache.commons</groupId>
120120
<artifactId>commons-lang3</artifactId>
121-
<version>3.17.0</version>
121+
<version>3.18.0</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>commons-io</groupId>
125125
<artifactId>commons-io</artifactId>
126-
<version>2.19.0</version>
126+
<version>2.20.0</version>
127127
</dependency>
128128

129129
<dependency>
@@ -174,7 +174,7 @@
174174
<dependency>
175175
<groupId>org.xmlunit</groupId>
176176
<artifactId>xmlunit-core</artifactId>
177-
<version>2.10.2</version>
177+
<version>2.10.4</version>
178178
</dependency>
179179
<dependency>
180180
<groupId>org.zeroturnaround</groupId>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<parent>
2424
<groupId>io.wcm.devops.conga.plugins</groupId>
2525
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
26-
<version>2.21.0</version>
26+
<version>2.22.0</version>
2727
<relativePath>parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>io.wcm.devops.conga.plugins</groupId>
3131
<artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
32-
<version>2.21.0</version>
32+
<version>2.22.0</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

0 commit comments

Comments
 (0)