Skip to content

Commit 6a96af0

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 1efec8d + a8b0447 commit 6a96af0

File tree

12 files changed

+45
-21
lines changed

12 files changed

+45
-21
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

‎.github/workflows/maven-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
matrix:
23-
java: [8, 11, 17]
23+
java: [11, 17]
2424
os: [ubuntu-latest]
2525
distribution: [temurin]
2626
include:

‎.github/workflows/maven-deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
1+
# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
22

33
name: Deploy
44

@@ -15,19 +15,19 @@ jobs:
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919

2020
- name: Configure GIT
2121
run: |
2222
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
2323
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2424
2525
- name: Setup JDK
26-
uses: actions/setup-java@v2
26+
uses: actions/setup-java@v3
2727
with:
2828
distribution: temurin
29-
java-version: 8
30-
cache: 'maven'
29+
java-version: 11
30+
cache: maven
3131

3232
- name: Build, verify, deploy, generate site
3333
env:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- uses: ncipollo/release-action@v1
1717
with:
1818
body: 'Changes: https://devops.wcm.io/conga/plugins/ansible/changes-report.html'

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<img src="https://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for Ansible
22
======
33
[![Build](https://github.com/wcm-io-devops/conga-ansible-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-ansible-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
4-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.ansible/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.ansible)
4+
[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.ansible)](https://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/io.wcm.devops.conga.plugins.ansible)
55
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-ansible-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-ansible-plugin)
66

77
Documentation: https://devops.wcm.io/conga/plugins/ansible/<br/>
8-
Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>
8+
Issues: https://github.com/wcm-io-devops/conga-ansible-plugin/issues<br/>
99
Wiki: https://wcm-io.atlassian.net/wiki/<br/>
1010
Continuous Integration: https://github.com/wcm-io-devops/conga-ansible-plugin/actions<br/>
1111
Commercial support: https://wcm.io/commercial-support.html

‎changes.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.4.2" date="2023-03-27">
27+
<action type="update" dev="sseifert">
28+
Switch to Java 11 as minimum version.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to SnakeYAML 2.0, use TrustedTagInspector.
32+
</action>
33+
</release>
34+
2635
<release version="1.4.0" date="2022-05-11">
2736
<action type="add" dev="trichter">
2837
Support retrieving Ansible vault password from ANSIBLE_VAULT_PASSWORD environment variable.

‎conga-ansible-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.ansible.parent</artifactId>
28-
<version>1.4.0</version>
28+
<version>1.4.2</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.0</version>
34+
<version>1.4.2</version>
3535
<packaging>jar</packaging>
3636

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

6464
<dependency>
6565
<groupId>de.rtner</groupId>
6666
<artifactId>PBKDF2</artifactId>
67-
<version>1.1.2</version>
67+
<version>1.1.4</version>
6868
<scope>compile</scope>
6969
<exclusions>
7070
<exclusion>
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>com.jayway.jsonpath</groupId>
9090
<artifactId>json-path</artifactId>
91-
<version>2.4.0</version>
91+
<version>2.7.0</version>
9292
<scope>compile</scope>
9393
</dependency>
9494

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<plugin>
6666
<groupId>io.wcm.devops.conga</groupId>
6767
<artifactId>conga-maven-plugin</artifactId>
68-
<version>1.14.4</version>
68+
<version>1.15.0</version>
6969
<extensions>true</extensions>
7070
<configuration>
7171
<valueProvider>

‎conga-ansible-plugin/src/main/java/net/wedjaa/ansible/vault/Manager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@
2121
import java.io.IOException;
2222
import java.io.StringWriter;
2323

24+
import org.yaml.snakeyaml.LoaderOptions;
2425
import org.yaml.snakeyaml.Yaml;
2526
import org.yaml.snakeyaml.constructor.Constructor;
27+
import org.yaml.snakeyaml.inspector.TrustedTagInspector;
2628

2729
import net.wedjaa.ansible.vault.crypto.VaultHandler;
2830

2931
public class Manager {
3032

3133
public Object getFromYaml(Class<?> objectClass, String yaml) {
32-
Yaml reader = new Yaml(new Constructor(objectClass));
34+
LoaderOptions options = new LoaderOptions();
35+
options.setTagInspector(new TrustedTagInspector());
36+
Yaml reader = new Yaml(new Constructor(objectClass, options));
3337
return reader.load(yaml);
3438
}
3539

‎parent/pom.xml

Lines changed: 7 additions & 2 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>1.3.2</version>
28+
<version>1.4.0</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.ansible.parent</artifactId>
34-
<version>1.4.0</version>
34+
<version>1.4.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA Ansible Plugin</name>
@@ -41,6 +41,11 @@
4141
<url>https://github.com/wcm-io-devops/conga-ansible-plugin/actions</url>
4242
</ciManagement>
4343

44+
<issueManagement>
45+
<system>GitHub</system>
46+
<url>https://github.com/wcm-io/conga-ansible-plugin/issues/</url>
47+
</issueManagement>
48+
4449
<build>
4550
<plugins>
4651

0 commit comments

Comments
 (0)