Skip to content

Commit 3d33285

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 5c2d304 + 896b339 commit 3d33285

37 files changed

Lines changed: 687 additions & 217 deletions

‎.github/workflows/maven-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
java: [17, 21]
18+
java: [21, 25]
1919
os: [ubuntu-latest]
2020
distribution: [temurin]
2121
include:
22-
- java: 17
22+
- java: 21
2323
os: windows-latest
2424
distribution: temurin
25-
- java: 17
25+
- java: 21
2626
os: macos-latest
2727
distribution: temurin
2828

‎.github/workflows/maven-deploy.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,14 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- name: Checkout code
20-
uses: actions/checkout@v5
21-
22-
- name: Configure GIT
23-
run: |
24-
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
25-
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
26-
27-
- name: Setup JDK
28-
uses: actions/setup-java@v5
19+
- name: Maven Deploy with Site
20+
uses: wcm-io-devops/github-action-maven-deploy-site@v1
2921
with:
30-
distribution: temurin
31-
java-version: 17
32-
cache: maven
33-
34-
- name: Build, verify, deploy, generate site
35-
env:
36-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
37-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
38-
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
39-
40-
- name: Stage and deploy site
41-
run: >
42-
./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
43-
-Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
44-
-Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
45-
-Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}
22+
java-version: 21
23+
maven-executable: ./mvnw
24+
sonatype-username: ${{ secrets.SONATYPE_USERNAME }}
25+
sonatype-password: ${{ secrets.SONATYPE_PASSWORD }}
26+
github-site-site-deploy-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
27+
github-site-site-deploy-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
28+
github-site-site-deploy-username: ${{ secrets.GH_SITE_DEPLOY_USERNAME }}
29+
github-site-site-deploy-password: ${{ secrets.GH_SITE_DEPLOY_PAT }}

‎.github/workflows/release-from-tag.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v5
16-
- uses: ncipollo/release-action@v1
17-
with:
18-
body: 'Changes: https://devops.wcm.io/conga/plugins/ansible/changes.html'
19-
token: ${{ secrets.GITHUB_TOKEN }}
15+
- name: Release from Tag
16+
uses: wcm-io-devops/github-action-release-from-tag@v1
17+
with:
18+
body: 'Changes: https://devops.wcm.io/conga/plugins/ansible/changes.html'
19+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎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.6.0" date="2026-06-12">
28+
<action type="update" dev="sseifert">
29+
Switch to Java 21.
30+
</action>
31+
</release>
32+
2733
<release version="1.5.0" date="2025-09-25">
2834
<action type="update" dev="sseifert">
2935
Switch to Java 17.

‎conga-ansible-plugin/pom.xml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,19 @@
1818
limitations under the License.
1919
#L%
2020
-->
21-
2221
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2322
<modelVersion>4.0.0</modelVersion>
2423

2524
<parent>
2625
<groupId>io.wcm.devops.conga.plugins</groupId>
2726
<artifactId>io.wcm.devops.conga.plugins.ansible.parent</artifactId>
28-
<version>1.5.0</version>
27+
<version>1.6.0</version>
2928
<relativePath>../parent/pom.xml</relativePath>
3029
</parent>
3130

3231
<groupId>io.wcm.devops.conga.plugins</groupId>
3332
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
34-
<version>1.5.0</version>
33+
<version>1.6.0</version>
3534
<packaging>jar</packaging>
3635

3736
<name>CONGA Ansible Plugin</name>
@@ -40,8 +39,8 @@
4039
<scm>
4140
<connection>scm:git:https://github.com/wcm-io-devops/conga-ansible-plugin.git</connection>
4241
<developerConnection>scm:git:https://github.com/wcm-io-devops/conga-ansible-plugin.git</developerConnection>
43-
<url>https://github.com/wcm-io-devops/conga-ansible-plugin</url>
4442
<tag>HEAD</tag>
43+
<url>https://github.com/wcm-io-devops/conga-ansible-plugin</url>
4544
</scm>
4645

4746
<properties>
@@ -57,7 +56,7 @@
5756
<dependency>
5857
<groupId>io.wcm.devops.conga</groupId>
5958
<artifactId>io.wcm.devops.conga.generator</artifactId>
60-
<version>1.18.0</version>
59+
<version>1.20.0</version>
6160
<scope>compile</scope>
6261
</dependency>
6362

@@ -81,14 +80,14 @@
8180
<dependency>
8281
<groupId>org.apache.commons</groupId>
8382
<artifactId>commons-exec</artifactId>
84-
<version>1.5.0</version>
83+
<version>1.6.0</version>
8584
<scope>compile</scope>
8685
</dependency>
8786

8887
<dependency>
8988
<groupId>com.jayway.jsonpath</groupId>
9089
<artifactId>json-path</artifactId>
91-
<version>2.9.0</version>
90+
<version>3.0.0</version>
9291
<scope>compile</scope>
9392
</dependency>
9493

@@ -122,18 +121,18 @@
122121
<id>before-integration-test-execution</id>
123122
<goals>
124123
<goal>prepare-agent-integration</goal>
125-
</goals>
124+
</goals>
126125
<configuration>
127126
<destFile>${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</destFile>
128127
<propertyName>invoker.jacoco.args</propertyName>
129128
</configuration>
130129
</execution>
131130
<execution>
132131
<id>merge-unit-and-integration</id>
133-
<phase>post-integration-test</phase>
134132
<goals>
135133
<goal>merge</goal>
136134
</goals>
135+
<phase>post-integration-test</phase>
137136
<configuration>
138137
<fileSets>
139138
<fileSet>

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

Lines changed: 3 additions & 3 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>70</version>
29+
<version>80</version>
3030
<relativePath/>
3131
</parent>
3232

@@ -46,7 +46,7 @@
4646
<plugin>
4747
<groupId>org.codehaus.mojo</groupId>
4848
<artifactId>properties-maven-plugin</artifactId>
49-
<version>1.2.1</version>
49+
<version>1.3.0</version>
5050
<executions>
5151
<execution>
5252
<id>set-properties</id>
@@ -65,7 +65,7 @@
6565
<plugin>
6666
<groupId>io.wcm.devops.conga</groupId>
6767
<artifactId>conga-maven-plugin</artifactId>
68-
<version>1.18.0</version>
68+
<version>1.20.0</version>
6969
<extensions>true</extensions>
7070
<configuration>
7171
<valueProvider>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* Exception is throws when the Ansible Vault password is not set.
2424
*/
2525
public class AnsibleVaultPasswordMissing extends RuntimeException {
26+
2627
private static final long serialVersionUID = 1L;
2728

2829
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ private Map<String, List<String>> inventoryToConfig(AnsibleInventory inventory)
182182
Map<String, List<String>> config = new HashMap<>();
183183
for (AnsibleGroup group : inventory.getGroups()) {
184184
config.put(group.getName(), group.getHosts().stream()
185-
.map(AnsibleHost::getName)
186-
.toList());
185+
.map(AnsibleHost::getName)
186+
.toList());
187187
}
188188
return config;
189189
}

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

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* #%L
3+
* wcm.io
4+
* %%
5+
* Copyright (C) 2016 wcm.io
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package it.andreascarpino.ansible.inventory.type;
21+
122
/*
223
* The MIT License (MIT)
324
* Copyright (c) 2016 Andrea Scarpino <me@andreascarpino.it>
@@ -16,7 +37,6 @@
1637
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1738
*/
1839
//CHECKSTYLE:OFF
19-
package it.andreascarpino.ansible.inventory.type;
2040

2141
/**
2242
* @author Andrea Scarpino
@@ -204,8 +224,7 @@ public final class AnsibleConstants {
204224
*/
205225
public static final String ALL_GROUP = "all";
206226

207-
private AnsibleConstants() {
208-
}
227+
private AnsibleConstants() {}
209228

210229
/**
211230
* @author Andrea Scarpino
@@ -222,8 +241,7 @@ public static final class AnsibleConnection {
222241

223242
public static final String WINRM = "winrm";
224243

225-
private AnsibleConnection() {
226-
}
244+
private AnsibleConnection() {}
227245

228246
}
229247

@@ -236,8 +254,7 @@ public static final class AnsibleWinRMScheme {
236254

237255
public static final String HTTPS = "https";
238256

239-
private AnsibleWinRMScheme() {
240-
}
257+
private AnsibleWinRMScheme() {}
241258

242259
}
243260

@@ -252,8 +269,7 @@ public static final class AnsibleWinRMTransport {
252269

253270
public static final String PLAINTEXT = "plaintext";
254271

255-
private AnsibleWinRMTransport() {
256-
}
272+
private AnsibleWinRMTransport() {}
257273
}
258274

259275
/**
@@ -265,8 +281,7 @@ public static final class AnsibleWinRMServerCertValidation {
265281

266282
public static final String VALIDATE = "validate";
267283

268-
private AnsibleWinRMServerCertValidation() {
269-
}
284+
private AnsibleWinRMServerCertValidation() {}
270285

271286
}
272287

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* #%L
3+
* wcm.io
4+
* %%
5+
* Copyright (C) 2016 wcm.io
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package it.andreascarpino.ansible.inventory.type;
21+
122
/*
223
* The MIT License (MIT)
324
* Copyright (c) 2016 Andrea Scarpino <me@andreascarpino.it>
@@ -16,7 +37,6 @@
1637
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1738
*/
1839
//CHECKSTYLE:OFF
19-
package it.andreascarpino.ansible.inventory.type;
2040

2141
import java.util.Collection;
2242
import java.util.LinkedHashMap;
@@ -140,7 +160,7 @@ public boolean equals(Object o) {
140160
return false;
141161
}
142162

143-
AnsibleGroup group = (AnsibleGroup) o;
163+
AnsibleGroup group = (AnsibleGroup)o;
144164

145165
return name.equals(group.name);
146166
}

0 commit comments

Comments
 (0)