Skip to content

Commit 0232a65

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 65cff23 + f1b3a6a commit 0232a65

File tree

17 files changed

+61
-46
lines changed

17 files changed

+61
-46
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.10" date="2025-09-19">
28+
<action type="update" dev="sseifert">
29+
Update dependencies.
30+
</action>
31+
</release>
32+
2733
<release version="1.4.8" date="2025-04-01">
2834
<action type="update" dev="sseifert">
2935
Update dependencies.

‎conga-ansible-plugin/pom.xml‎

Lines changed: 4 additions & 4 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.ansible.parent</artifactId>
28-
<version>1.4.8</version>
28+
<version>1.4.10</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.ansible</artifactId>
34-
<version>1.4.8</version>
34+
<version>1.4.10</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA Ansible Plugin</name>
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>io.wcm.devops.conga</groupId>
5959
<artifactId>io.wcm.devops.conga.generator</artifactId>
60-
<version>1.17.2</version>
60+
<version>1.17.6</version>
6161
<scope>compile</scope>
6262
</dependency>
6363

@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>org.apache.commons</groupId>
8383
<artifactId>commons-exec</artifactId>
84-
<version>1.4.0</version>
84+
<version>1.5.0</version>
8585
<scope>compile</scope>
8686
</dependency>
8787

‎conga-ansible-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

@@ -65,7 +65,7 @@
6565
<plugin>
6666
<groupId>io.wcm.devops.conga</groupId>
6767
<artifactId>conga-maven-plugin</artifactId>
68-
<version>1.17.2</version>
68+
<version>1.17.6</version>
6969
<extensions>true</extensions>
7070
<configuration>
7171
<valueProvider>

‎conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/urlfile/AnsibleVaultUrlFilePlugin.java‎

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

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

2930
import io.wcm.devops.conga.generator.spi.UrlFilePlugin;
3031
import io.wcm.devops.conga.generator.spi.context.UrlFilePluginContext;
@@ -50,7 +51,7 @@ public String getName() {
5051

5152
@Override
5253
public boolean accepts(String url, UrlFilePluginContext context) {
53-
return StringUtils.startsWith(url, PREFIX);
54+
return Strings.CS.startsWith(url, PREFIX);
5455
}
5556

5657
@Override

‎conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/util/FileScriptLoader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.commons.exec.ExecuteException;
3030
import org.apache.commons.exec.PumpStreamHandler;
3131
import org.apache.commons.io.FileUtils;
32-
import org.apache.commons.lang3.StringUtils;
32+
import org.apache.commons.lang3.Strings;
3333

3434
import io.wcm.devops.conga.generator.util.FileUtil;
3535

@@ -59,7 +59,7 @@ public static String readFileToString(File file) throws IOException {
5959
}
6060

6161
private static boolean isPythonScript(File file) {
62-
return StringUtils.endsWith(file.getName(), ".py");
62+
return Strings.CS.endsWith(file.getName(), ".py");
6363
}
6464

6565
private static String executePyhtonScript(File file) throws IOException {

‎conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/valueencryption/YamlVaultValueRepresent.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727

2828
class YamlVaultValueRepresent implements Represent {
2929

30+
/**
31+
* Vault tag
32+
*/
3033
public static final String VAULT_TAG = "!vault";
3134

3235
@Override

‎conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/valueprovider/AnsibleInventoryValueProviderPlugin.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.stream.Collectors;
2929

3030
import org.apache.commons.lang3.StringUtils;
31+
import org.apache.commons.lang3.Strings;
3132

3233
import com.google.gson.JsonArray;
3334
import com.google.gson.JsonElement;
@@ -37,7 +38,6 @@
3738
import com.jayway.jsonpath.JsonPath;
3839
import com.jayway.jsonpath.ReadContext;
3940

40-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
4141
import io.wcm.devops.conga.generator.GeneratorException;
4242
import io.wcm.devops.conga.generator.spi.ValueProviderPlugin;
4343
import io.wcm.devops.conga.generator.spi.context.ValueProviderContext;
@@ -75,7 +75,7 @@ public Object resolve(String variableName, ValueProviderContext context) {
7575
}
7676

7777
private Object resolveVariableOrJsonPath(InventoryContent content, String variableName) {
78-
if (StringUtils.startsWith(variableName, "$")) {
78+
if (Strings.CS.startsWith(variableName, "$")) {
7979
if (content.getJsonpathReadContext() != null) {
8080
return content.getJsonpathReadContext().read(variableName, List.class);
8181
}
@@ -86,7 +86,6 @@ private Object resolveVariableOrJsonPath(InventoryContent content, String variab
8686
return content.getMap().get(variableName);
8787
}
8888

89-
@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
9089
private InventoryContent getInventoryContent(ValueProviderContext context) {
9190

9291
// try to get from cache
@@ -146,7 +145,7 @@ private InventoryContent tryReadJsonStyle(String inventoryContent, File file, Va
146145
private Map<String, List<String>> jsonToConfig(JsonObject root) {
147146
Map<String, List<String>> content = new HashMap<>();
148147
for (Map.Entry<String, JsonElement> entry : root.entrySet()) {
149-
if (!StringUtils.equals(entry.getKey(), "_meta")) {
148+
if (!Strings.CS.equals(entry.getKey(), "_meta")) {
150149
JsonArray hostNamesArray = null;
151150
if (entry.getValue() instanceof JsonArray) {
152151
hostNamesArray = (JsonArray)entry.getValue();

‎conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleConstants.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ private AnsibleConstants() {
210210
/**
211211
* @author Andrea Scarpino
212212
*/
213-
public static class AnsibleConnection {
213+
public static final class AnsibleConnection {
214214

215215
public static final String LOCAL = "local";
216216

@@ -230,7 +230,7 @@ private AnsibleConnection() {
230230
/**
231231
* @author Andrea Scarpino
232232
*/
233-
public static class AnsibleWinRMScheme {
233+
public static final class AnsibleWinRMScheme {
234234

235235
public static final String HTTP = "http";
236236

@@ -244,7 +244,7 @@ private AnsibleWinRMScheme() {
244244
/**
245245
* @author Andrea Scarpino
246246
*/
247-
public static class AnsibleWinRMTransport {
247+
public static final class AnsibleWinRMTransport {
248248

249249
public static final String NTLM = "ntlm";
250250

@@ -259,7 +259,7 @@ private AnsibleWinRMTransport() {
259259
/**
260260
* @author Andrea Scarpino
261261
*/
262-
public static class AnsibleWinRMServerCertValidation {
262+
public static final class AnsibleWinRMServerCertValidation {
263263

264264
public static final String IGNORE = "ignore";
265265

‎conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleHost.java‎

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

26-
import org.apache.commons.lang3.StringUtils;
26+
import org.apache.commons.lang3.Strings;
2727

2828
/**
2929
* @author Andrea Scarpino
@@ -83,7 +83,7 @@ public void removeVariable(String variableName) {
8383
Iterator<AnsibleVariable> variableIterator = variables.iterator();
8484
while (variableIterator.hasNext()) {
8585
AnsibleVariable v = variableIterator.next();
86-
if (StringUtils.equals(v.getName(), variableName)) {
86+
if (Strings.CS.equals(v.getName(), variableName)) {
8787
variableIterator.remove();
8888
}
8989
}

0 commit comments

Comments
 (0)