From 09a21849e6e7807cb60e257a91c4099826aac7de Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 16 Jun 2022 18:56:47 +0200 Subject: [PATCH 1/5] [gitflow-maven-plugin] Update for next development version 1.14.11-SNAPSHOT --- generator/pom.xml | 4 ++-- model/pom.xml | 4 ++-- parent/pom.xml | 2 +- pom.xml | 4 ++-- resource/pom.xml | 2 +- tooling/conga-cli/pom.xml | 4 ++-- tooling/conga-maven-plugin/pom.xml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/generator/pom.xml b/generator/pom.xml index 59653f7e..21750689 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT ../parent/pom.xml @@ -44,7 +44,7 @@ io.wcm.devops.conga io.wcm.devops.conga.model - 1.14.10 + 1.14.11-SNAPSHOT compile diff --git a/model/pom.xml b/model/pom.xml index 81c86817..b12a684b 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT ../parent/pom.xml @@ -40,7 +40,7 @@ io.wcm.devops.conga io.wcm.devops.conga.resource - 1.14.10 + 1.14.11-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml index d90ae6d6..359b64e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT pom CONGA diff --git a/pom.xml b/pom.xml index 829be123..e1bcd09e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT parent/pom.xml io.wcm.devops.conga io.wcm.devops.conga.root - 1.14.10 + 1.14.11-SNAPSHOT pom CONGA diff --git a/resource/pom.xml b/resource/pom.xml index a15288fd..0bfe7307 100644 --- a/resource/pom.xml +++ b/resource/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT ../parent/pom.xml diff --git a/tooling/conga-cli/pom.xml b/tooling/conga-cli/pom.xml index c01a46e2..9479120e 100644 --- a/tooling/conga-cli/pom.xml +++ b/tooling/conga-cli/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT ../../parent/pom.xml @@ -40,7 +40,7 @@ io.wcm.devops.conga io.wcm.devops.conga.generator - 1.14.10 + 1.14.11-SNAPSHOT compile diff --git a/tooling/conga-maven-plugin/pom.xml b/tooling/conga-maven-plugin/pom.xml index ba1dfdef..5d3ba5b9 100644 --- a/tooling/conga-maven-plugin/pom.xml +++ b/tooling/conga-maven-plugin/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.10 + 1.14.11-SNAPSHOT ../../parent/pom.xml @@ -56,7 +56,7 @@ io.wcm.devops.conga io.wcm.devops.conga.generator - 1.14.10 + 1.14.11-SNAPSHOT compile From 1970288b7c23dfe7382d2d9fca4aa029273a43ca Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 23 Jun 2022 16:27:18 +0200 Subject: [PATCH 2/5] switch maven central badge to shields.io to avoid out-of-sync issues with maven index --- README.md | 2 +- src/site/markdown/index.md | 2 +- src/site/markdown/usage.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2d7598d6..9936763f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ 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/src/site/markdown/index.md b/src/site/markdown/index.md index c81aaf05..ec88145a 100644 --- 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 index 5007ad84..c4af6007 100644 --- 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. From 0f557995d2585a9ee4855b103fecf6e5894bc831 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 29 Sep 2022 16:20:45 +0200 Subject: [PATCH 3/5] update dependencies --- changes.xml | 6 ++++++ parent/pom.xml | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes.xml b/changes.xml index bfb9a225..123262ab 100644 --- 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"> + + + Update dependencies. + + + 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/parent/pom.xml b/parent/pom.xml index 359b64e2..ce8d3440 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.3.2 + 1.3.3-SNAPSHOT @@ -52,7 +52,7 @@ org.yaml snakeyaml - 1.30 + 1.33 @@ -64,7 +64,7 @@ org.apache.commons commons-text - 1.9 + 1.10.0 @@ -105,7 +105,7 @@ com.google.code.gson gson - 2.9.0 + 2.9.1 From 42efd966d5d75bee9982e6ebe234df438acd7139 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 29 Sep 2022 17:44:06 +0200 Subject: [PATCH 4/5] prepare release --- changes.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 123262ab..783cd4a2 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Update dependencies. diff --git a/parent/pom.xml b/parent/pom.xml index ce8d3440..3bc73c5a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.3.3-SNAPSHOT + 1.3.2 From a92117c87fd0e7bea0744388be50f75e113fd0ae Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 29 Sep 2022 17:45:40 +0200 Subject: [PATCH 5/5] [gitflow-maven-plugin] Update versions for release 1.14.12 --- generator/pom.xml | 4 ++-- model/pom.xml | 4 ++-- parent/pom.xml | 2 +- pom.xml | 4 ++-- resource/pom.xml | 2 +- tooling/conga-cli/pom.xml | 4 ++-- tooling/conga-maven-plugin/pom.xml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/generator/pom.xml b/generator/pom.xml index 21750689..9b3194dc 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 ../parent/pom.xml @@ -44,7 +44,7 @@ io.wcm.devops.conga io.wcm.devops.conga.model - 1.14.11-SNAPSHOT + 1.14.12 compile diff --git a/model/pom.xml b/model/pom.xml index b12a684b..b23de557 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 ../parent/pom.xml @@ -40,7 +40,7 @@ io.wcm.devops.conga io.wcm.devops.conga.resource - 1.14.11-SNAPSHOT + 1.14.12 diff --git a/parent/pom.xml b/parent/pom.xml index 3bc73c5a..fce1552d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 pom CONGA diff --git a/pom.xml b/pom.xml index e1bcd09e..915fe2de 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 parent/pom.xml io.wcm.devops.conga io.wcm.devops.conga.root - 1.14.11-SNAPSHOT + 1.14.12 pom CONGA diff --git a/resource/pom.xml b/resource/pom.xml index 0bfe7307..224786fd 100644 --- a/resource/pom.xml +++ b/resource/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 ../parent/pom.xml diff --git a/tooling/conga-cli/pom.xml b/tooling/conga-cli/pom.xml index 9479120e..de020d20 100644 --- a/tooling/conga-cli/pom.xml +++ b/tooling/conga-cli/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 ../../parent/pom.xml @@ -40,7 +40,7 @@ io.wcm.devops.conga io.wcm.devops.conga.generator - 1.14.11-SNAPSHOT + 1.14.12 compile diff --git a/tooling/conga-maven-plugin/pom.xml b/tooling/conga-maven-plugin/pom.xml index 5d3ba5b9..24e9e677 100644 --- a/tooling/conga-maven-plugin/pom.xml +++ b/tooling/conga-maven-plugin/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops.conga io.wcm.devops.conga.parent - 1.14.11-SNAPSHOT + 1.14.12 ../../parent/pom.xml @@ -56,7 +56,7 @@ io.wcm.devops.conga io.wcm.devops.conga.generator - 1.14.11-SNAPSHOT + 1.14.12 compile