From d717a4e9a128853603e4abdcd167c7a2d0b20a29 Mon Sep 17 00:00:00 2001
From: francois papon <fpapon@apache.org>
Date: Fri, 22 Nov 2024 14:30:25 +0100
Subject: [PATCH] [KARAF-7885] Use version properties for Commons-IO and
 feature.xml

---
 assembly/src/main/feature/feature.xml | 4 ++--
 pom.xml                               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index f847b1ca..675e10bf 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -80,7 +80,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
 
     <feature name="decanter-collector-file" version="${project.version}" description="Karaf Decanter Log File Collector">
         <feature>decanter-common</feature>
-        <bundle dependency="true">mvn:commons-io/commons-io/2.7</bundle>
+        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.file/${project.version}</bundle>
     </feature>
 
@@ -186,7 +186,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
         <feature>decanter-common</feature>
         <feature>http-whiteboard</feature>
         <configfile finalname="/etc/org.apache.karaf.decanter.collector.rest.servlet.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.rest.servlet/${project.version}/cfg</configfile>
-        <bundle dependency="true">mvn:commons-io/commons-io/2.7</bundle>
+        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.rest.servlet/${project.version}</bundle>
     </feature>
 
diff --git a/pom.xml b/pom.xml
index 326fdf9a..a3e00f18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
         <karaf.version>4.4.3</karaf.version>
         <paho.version>1.2.5</paho.version>
         <slf4j.version>1.7.7</slf4j.version>
+        <commons-io.version>2.18.0</commons-io.version>
     </properties>
 
     <modules>
@@ -385,7 +386,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.18.0</version>
+                <version>${commons-io.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>