From 37bc57f856934b8b8625bf9b63f1d56ba35eadce Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Fri, 22 Jan 2021 13:24:28 +0100
Subject: [PATCH] Do not define bundel related versions in OH feature file
 (#9904)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../src/main/feature/feature.xml                   | 14 +++++++-------
 features/pom.xml                                   | 11 -----------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml b/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
index 0d6d97c2e598d..3edd233332c27 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
@@ -6,49 +6,49 @@
 	<feature name="openhab-persistence-jdbc-derby" description="JDBC Persistence Apache Derby" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:org.apache.derby/derbyclient/${derby.version}</bundle>
+		<bundle start-level="80">mvn:org.apache.derby/derbyclient/10.12.1.1</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
 	<feature name="openhab-persistence-jdbc-h2" description="JDBC Persistence H2" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:com.h2database/h2/${h2.version}</bundle>
+		<bundle start-level="80">mvn:com.h2database/h2/1.4.191</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
 	<feature name="openhab-persistence-jdbc-hsqldb" description="JDBC Persistence HSQLDB" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:org.hsqldb/hsqldb/${hsqldb.version}</bundle>
+		<bundle start-level="80">mvn:org.hsqldb/hsqldb/2.3.3</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
 	<feature name="openhab-persistence-jdbc-mariadb" description="JDBC Persistence MariaDB" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.version}</bundle>
+		<bundle start-level="80">mvn:org.mariadb.jdbc/mariadb-java-client/1.4.6</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
 	<feature name="openhab-persistence-jdbc-mysql" description="JDBC Persistence MySQL" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:mysql/mysql-connector-java/${mysql.version}</bundle>
+		<bundle start-level="80">mvn:mysql/mysql-connector-java/8.0.22</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
 	<feature name="openhab-persistence-jdbc-postgresql" description="JDBC Persistence PostgreSQL" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:org.postgresql/postgresql/${postgresql.version}</bundle>
+		<bundle start-level="80">mvn:org.postgresql/postgresql/9.4.1212</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
 	<feature name="openhab-persistence-jdbc-sqlite" description="JDBC Persistence SQLite" version="${project.version}">
 		<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
 		<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
-		<bundle start-level="80">mvn:org.xerial/sqlite-jdbc/${sqlite.version}</bundle>
+		<bundle start-level="80">mvn:org.xerial/sqlite-jdbc/3.16.1</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
 	</feature>
 
diff --git a/features/pom.xml b/features/pom.xml
index fc9650366acb9..392e70f7a5ba9 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -16,17 +16,6 @@
 
   <name>openHAB Add-ons :: Features :: Karaf</name>
 
-  <properties>
-    <!-- JDBC database driver versions -->
-    <derby.version>10.12.1.1</derby.version>
-    <h2.version>1.4.191</h2.version>
-    <hsqldb.version>2.3.3</hsqldb.version>
-    <mariadb.version>1.3.5</mariadb.version>
-    <mysql.version>8.0.13</mysql.version>
-    <postgresql.version>9.4.1212</postgresql.version>
-    <sqlite.version>3.16.1</sqlite.version>
-  </properties>
-
   <modules>
     <module>openhab-addons</module>
     <module>openhab-addons-external</module>