Merge remote-tracking branch 'origin/feature/22871'

Conflicts:
	CHANGELOG.md
	pom.xml

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

pom.xml

@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>gcube-smartgears-bom</artifactId>
-	<version>2.1.1</version>
+	<version>2.2.0</version>
 	<packaging>pom</packaging>
 	<name>gCube Smartgears Bom</name>
 	<description>
@@ -34,7 +34,11 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
+<<<<<<< HEAD
 				<version>2.0.2</version>
+=======
+				<version>2.1.0</version>
+>>>>>>> refs/remotes/origin/feature/22871
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>