Skip to content

Commit 5733c4a

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents e31d6c2 + 8e7e785 commit 5733c4a

File tree

14 files changed

+44
-33
lines changed

14 files changed

+44
-33
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: 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.4.4" date="2025-09-19">
28+
<action type="update" dev="sseifert">
29+
Update dependencies.
30+
</action>
31+
</release>
32+
2733
<release version="1.4.2" date="2025-04-01">
2834
<action type="update" dev="sseifert">
2935
Switch to Johnzon 2.x and jakarta.json.

‎conga-sling-plugin/pom.xml‎

Lines changed: 5 additions & 5 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.sling.parent</artifactId>
28-
<version>1.4.2</version>
28+
<version>1.4.4</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.sling</artifactId>
34-
<version>1.4.2</version>
34+
<version>1.4.4</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA Sling Plugin</name>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>io.wcm.devops.conga</groupId>
6262
<artifactId>io.wcm.devops.conga.generator</artifactId>
63-
<version>1.17.2</version>
63+
<version>1.17.6</version>
6464
<scope>compile</scope>
6565
</dependency>
6666

@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>com.fasterxml.jackson.core</groupId>
8484
<artifactId>jackson-databind</artifactId>
85-
<version>2.18.3</version>
85+
<version>2.20.0</version>
8686
<scope>compile</scope>
8787
</dependency>
8888

@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>org.apache.johnzon</groupId>
103103
<artifactId>johnzon-core</artifactId>
104-
<version>2.0.1</version>
104+
<version>2.0.2</version>
105105
<scope>compile</scope>
106106
</dependency>
107107
<dependency>

‎conga-sling-plugin/src/it/example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.maven</groupId>
2828
<artifactId>io.wcm.maven.global-parent</artifactId>
29-
<version>62</version>
29+
<version>66</version>
3030
<relativePath/>
3131
</parent>
3232

@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>io.wcm.devops.conga</groupId>
4747
<artifactId>conga-maven-plugin</artifactId>
48-
<version>1.17.2</version>
48+
<version>1.17.6</version>
4949
<extensions>true</extensions>
5050
<dependencies>
5151

‎conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/fileheader/OsgiConfigFileHeader.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import org.apache.commons.io.FileUtils;
2727
import org.apache.commons.lang3.StringUtils;
28+
import org.apache.commons.lang3.Strings;
2829

2930
import io.wcm.devops.conga.generator.GeneratorException;
3031
import io.wcm.devops.conga.generator.plugins.fileheader.AbstractFileHeader;
@@ -34,6 +35,7 @@
3435

3536
/**
3637
* Adds file headers to OSGi .config files.
38+
*
3739
* <p>
3840
* Please note: This plugin converts the file header to a single comment line,
3941
* because Felix Configuation Admin Service versions &lt; 1.8.8 do not support multi-line comments.
@@ -60,7 +62,7 @@ public boolean accepts(FileContext file, FileHeaderContext context) {
6062

6163
@Override
6264
protected String sanitizeComment(String line) {
63-
if (StringUtils.equals(line, "") || StringUtils.contains(line, "*****")) {
65+
if (Strings.CS.equals(line, "") || Strings.CS.contains(line, "*****")) {
6466
return null;
6567
}
6668
return StringUtils.trim(line);
@@ -92,7 +94,7 @@ public FileHeaderContext extract(FileContext file) {
9294
try {
9395
String content = FileUtils.readFileToString(file.getFile(), file.getCharset());
9496
String[] contentLines = StringUtils.split(content, "\n");
95-
if (contentLines.length > 0 && StringUtils.startsWith(contentLines[0], getCommentLinePrefix())) {
97+
if (contentLines.length > 0 && Strings.CS.startsWith(contentLines[0], getCommentLinePrefix())) {
9698
String fullComment = StringUtils.trim(StringUtils.substringAfter(contentLines[0], getCommentBlockStart()));
9799
List<String> lines = Arrays.asList(fullComment);
98100
return new FileHeaderContext().commentLines(lines);

‎conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/postprocessor/JsonOsgiConfigPostProcessor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
import java.nio.file.Files;
2525
import java.util.List;
2626

27-
import org.apache.commons.lang3.StringUtils;
27+
import org.apache.commons.lang3.Strings;
2828
import org.apache.sling.provisioning.model.Model;
2929

30-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3130
import io.wcm.devops.conga.generator.GeneratorException;
3231
import io.wcm.devops.conga.generator.spi.PostProcessorPlugin;
3332
import io.wcm.devops.conga.generator.spi.context.FileContext;
@@ -57,11 +56,10 @@ public String getName() {
5756

5857
@Override
5958
public boolean accepts(FileContext file, PostProcessorContext context) {
60-
return StringUtils.endsWith(file.getFile().getName(), FILE_EXTENSION);
59+
return Strings.CS.endsWith(file.getFile().getName(), FILE_EXTENSION);
6160
}
6261

6362
@Override
64-
@SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
6563
public List<FileContext> apply(FileContext fileContext, PostProcessorContext context) {
6664
File file = fileContext.getFile();
6765
try {

‎conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/postprocessor/ProvisioningOsgiConfigPostProcessor.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import org.apache.sling.provisioning.model.Model;
2828

29-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3029
import io.wcm.devops.conga.generator.GeneratorException;
3130
import io.wcm.devops.conga.generator.spi.PostProcessorPlugin;
3231
import io.wcm.devops.conga.generator.spi.context.FileContext;
@@ -55,7 +54,6 @@ public boolean accepts(FileContext file, PostProcessorContext context) {
5554
}
5655

5756
@Override
58-
@SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
5957
public List<FileContext> apply(FileContext fileContext, PostProcessorContext context) {
6058
File file = fileContext.getFile();
6159
try {

‎conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/util/OsgiConfigUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ private OsgiConfigUtil() {
3939

4040
/**
4141
* Writes the configuration data from the <code>Dictionary</code> to the given <code>OutputStream</code>.
42+
*
4243
* <p>
4344
* This method writes at the current location in the stream and does not close the outputstream.
4445
* </p>

‎conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/util/ProvisioningUtil.java‎

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

3939
import org.apache.commons.io.FileUtils;
4040
import org.apache.commons.lang3.StringUtils;
41+
import org.apache.commons.lang3.Strings;
4142
import org.apache.sling.provisioning.model.Configuration;
4243
import org.apache.sling.provisioning.model.Feature;
4344
import org.apache.sling.provisioning.model.Model;
@@ -87,7 +88,7 @@ public static boolean isProvisioningFile(FileContext file) {
8788
try {
8889
// check for generic txt extension and do some heuristics on the content of the file
8990
return FileUtil.matchesExtension(file.getFile(), TEXT_FILE_EXTENSION)
90-
&& StringUtils.contains(FileUtils.readFileToString(file.getFile(), file.getCharset()), "[feature ");
91+
&& Strings.CS.contains(FileUtils.readFileToString(file.getFile(), file.getCharset()), "[feature ");
9192
}
9293
catch (IOException ex) {
9394
return false;
@@ -154,7 +155,7 @@ public static <R> List<R> visitOsgiConfigurations(Model model, ConfigConsumer<R>
154155

155156
// prepare repoinit OSGi configuration
156157
String pid = Objects.toString(feature.getName(), "conga")
157-
+ (runModesString != null ? "-" + StringUtils.replace(runModesString, ",", "-") : "");
158+
+ (runModesString != null ? "-" + Strings.CS.replace(runModesString, ",", "-") : "");
158159
Configuration configuration = new Configuration(pid, REPOINIT_PID);
159160
configuration.getProperties().put("scripts", new String[] { script });
160161
String path = getPathForConfiguration(configuration, runMode);
@@ -201,7 +202,7 @@ private static String getPathForConfiguration(Configuration configuration, RunMo
201202
* @throws IOException I/O exception
202203
*/
203204
public static List<FileContext> generateOsgiConfigurations(Model model, File dir, PostProcessorContext context) throws IOException {
204-
return ProvisioningUtil.visitOsgiConfigurations(model, new ConfigConsumer<FileContext>() {
205+
return visitOsgiConfigurations(model, new ConfigConsumer<FileContext>() {
205206

206207
@Override
207208
@SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")

‎conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/util/RunModeComparator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Comparator;
2424
import java.util.Set;
2525

26-
import org.apache.commons.lang3.StringUtils;
26+
import org.apache.commons.lang3.Strings;
2727
import org.jetbrains.annotations.Nullable;
2828

2929
/**
@@ -43,7 +43,7 @@ public int compare(String runmode1, String runmode2) {
4343
if (!isServiceRunmode(runmode1) && isServiceRunmode(runmode2)) {
4444
return 1;
4545
}
46-
return StringUtils.compare(runmode1, runmode2);
46+
return Strings.CS.compare(runmode1, runmode2);
4747
}
4848

4949
private static boolean isServiceRunmode(@Nullable String runmode) {

0 commit comments

Comments
 (0)