Merge branch 'develop'

wcm-io-devops · Sep 29, 2022 · 7188d83 · 7188d83
2 parents 4a3b81d + a92117c
commit 7188d83
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <img src="https://wcm.io/images/[email protected]"/> CONGA - CONfiguration GenerAtor
 ======
 [![Build](https://github.com/wcm-io-devops/conga/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga/actions?query=workflow%3ABuild+branch%3Adevelop)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/conga-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/conga-maven-plugin)
+[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga/conga-maven-plugin)](https://repo1.maven.org/maven2/io/wcm/devops/conga/conga-maven-plugin)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga)
 
 wcm.io DevOps CONGA Configuration Generator.

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.14.12" date="2022-09-29">
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+    </release>
+
     <release version="1.14.10" date="2022-06-16">
       <action type="fix" dev="sseifert">
         Conversion of strings to values (default values, maven properties): Keep values which look like decimals but are actually version numbers as string (e.g. "1.20).

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops.conga</groupId>
     <artifactId>io.wcm.devops.conga.parent</artifactId>
-    <version>1.14.10</version>
+    <version>1.14.12</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.model</artifactId>
-      <version>1.14.10</version>
+      <version>1.14.12</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/model/pom.xml b/model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops.conga</groupId>
     <artifactId>io.wcm.devops.conga.parent</artifactId>
-    <version>1.14.10</version>
+    <version>1.14.12</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.resource</artifactId>
-      <version>1.14.10</version>
+      <version>1.14.12</version>
     </dependency>
 
     <dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga</groupId>
   <artifactId>io.wcm.devops.conga.parent</artifactId>
-  <version>1.14.10</version>
+  <version>1.14.12</version>
   <packaging>pom</packaging>
 
   <name>CONGA</name>
@@ -52,7 +52,7 @@
       <dependency>
         <groupId>org.yaml</groupId>
         <artifactId>snakeyaml</artifactId>
-        <version>1.30</version>
+        <version>1.33</version>
       </dependency>
 
       <dependency>
@@ -64,7 +64,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
-        <version>1.9</version>
+        <version>1.10.0</version>
       </dependency>
 
       <dependency>
@@ -105,7 +105,7 @@
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
       </dependency>
 
       <dependency>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga</groupId>
     <artifactId>io.wcm.devops.conga.parent</artifactId>
-    <version>1.14.10</version>
+    <version>1.14.12</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga</groupId>
   <artifactId>io.wcm.devops.conga.root</artifactId>
-  <version>1.14.10</version>
+  <version>1.14.12</version>
   <packaging>pom</packaging>
 
   <name>CONGA</name>

diff --git a/resource/pom.xml b/resource/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops.conga</groupId>
     <artifactId>io.wcm.devops.conga.parent</artifactId>
-    <version>1.14.10</version>
+    <version>1.14.12</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -2,7 +2,7 @@
 
 Configuration generator for DevOps Teams.
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/conga-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/conga-maven-plugin)
+[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga/conga-maven-plugin)](https://repo1.maven.org/maven2/io/wcm/devops/conga/conga-maven-plugin)
 
 
 ### Documentation

diff --git a/src/site/markdown/usage.md b/src/site/markdown/usage.md
@@ -64,6 +64,6 @@ You find the generated files at `target/configuration`, they are packed as well
 It is possible to use CONGA outside Maven from the command line using this prepackaged JAR with all dependencies:
 
 |---|---|---|
-| [CONGA Command Line Interface](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/io.wcm.devops.conga.tooling.cli) | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/io.wcm.devops.conga.tooling.cli/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga/io.wcm.devops.conga.tooling.cli) |
+| [CONGA Command Line Interface](https://repo1.maven.org/maven2/io/wcm/devops/conga/io.wcm.devops.conga.tooling.cli) | [![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga/io.wcm.devops.conga.tooling.cli)](https://repo1.maven.org/maven2/io/wcm/devops/conga/io.wcm.devops.conga.tooling.cli) |
 
 This mode lacks some features like building definition artifacts, versioning etc. So it is recommended to use the Maven plugin whenever possible.
diff --git a/tooling/conga-cli/pom.xml b/tooling/conga-cli/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops.conga</groupId>
     <artifactId>io.wcm.devops.conga.parent</artifactId>
-    <version>1.14.10</version>
+    <version>1.14.12</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.14.10</version>
+      <version>1.14.12</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/tooling/conga-maven-plugin/pom.xml b/tooling/conga-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops.conga</groupId>
     <artifactId>io.wcm.devops.conga.parent</artifactId>
-    <version>1.14.10</version>
+    <version>1.14.12</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.14.10</version>
+      <version>1.14.12</version>
       <scope>compile</scope>
     </dependency>