diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a78f4e..857a5df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for gCube Smartgears Bom + +## [v2.2.0] + +- enhanced gcube-model version range +- enhanced information-system-model version range +- Upgraded gcube-bom version to 2.1.0-SNAPSHOT + + ## [v2.1.1] - Enhanced gcube-bom version diff --git a/pom.xml b/pom.xml index bf3b47d..c3bf714 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.1.1 + 2.2.0 pom gCube Smartgears Bom @@ -34,7 +34,11 @@ org.gcube.distribution gcube-bom +<<<<<<< HEAD 2.0.2 +======= + 2.1.0 +>>>>>>> refs/remotes/origin/feature/22871 pom import