From af8fdb524dc9d651b9d17cb8b6465a2052657727 Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Wed, 2 Dec 2020 08:03:43 +0100
Subject: [PATCH] [AMQ-8096] Upgrade to Apache Karaf 4.2.10 and improve
 features XML

---
 .../karaf/itest/AbstractFeatureTest.java       |  3 ++-
 .../src/main/resources/features-core.xml       | 18 +++++++++---------
 activemq-karaf/src/main/resources/features.xml | 16 ++++++++--------
 pom.xml                                        |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
index 66a44c1a29..6cb007b089 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
 @ExamReactorStrategy(PerClass.class)
 public abstract class AbstractFeatureTest {
 
-    private static final String KARAF_MAJOR_VERSION = "4.2.8";
+    private static final String KARAF_MAJOR_VERSION = "4.2.10";
     public static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureTest.class);
     public static final long ASSERTION_TIMEOUT = 30000L;
     public static final String RESOURCE_BASE = "src/test/resources/org/apache/activemq/karaf/itest/";
@@ -120,6 +120,7 @@ public abstract class AbstractFeatureTest {
 	}
 
 	protected void assertBrokerStarted() throws Exception {
+        Thread.sleep(4000);
 		withinReason(new Runnable() {
 	        public void run() {
 	            assertEquals("brokerName = amq-broker", executeCommand("activemq:list").trim());
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 6ff831fcd4..ea7c3fb783 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -18,12 +18,12 @@
 
 -->
 
-<features name="activemq-core-${project.version}">
+<features name="activemq-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 
     <repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features</repository>
 
     <!-- Bundles needed if only client will be deployed in the container -->
-    <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
         <feature version="[4,5)">spring</feature>
         <feature version="[4,5)">shell-compat</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
@@ -32,28 +32,28 @@
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
         <bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
-        <bundle dependency="false">mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
-        <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
-        <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+        <bundle>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
+        <bundle>mvn:commons-net/commons-net/${commons-net-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
         <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle -->
         <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
     </feature>
     
-    <feature name="activemq-cf" description="ActiveMQ ConnectionFactory from config" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-cf" description="ActiveMQ ConnectionFactory from config" version="${project.version}">
         <feature>activemq-client</feature>
         <feature>scr</feature>
         <bundle>mvn:org.apache.activemq/activemq-cf/${project.version}</bundle>
     </feature>
 
     <!-- All bundles needed by the broker -->
-    <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}">
       <feature>connector</feature>
       <feature>http</feature>
       <feature version="${project.version}">activemq-client</feature>
       <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
       <bundle dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle>
       <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-      <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+      <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
       <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6</bundle>
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1</bundle>
@@ -70,4 +70,4 @@
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
       <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
     </feature>
-  </features>
+</features>
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 9c514df700..3e748bc576 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -18,26 +18,26 @@
 
 -->
 
-<features name="activemq-${project.version}">
+<features name="activemq-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 
     <repository>mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core</repository>
 
     <!-- Starts the broker with default configuration -->
-    <feature name="activemq-broker-noweb" description="Full ActiveMQ broker with default configuration" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-broker-noweb" description="Full ActiveMQ broker with default configuration" version="${project.version}">
         <feature version="${project.version}">activemq</feature>
         <configfile finalname="${karaf.etc}/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq</configfile>
         <configfile finalname="${karaf.etc}/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq</configfile>
     </feature>
 
     <!-- Starts the broker with default configuration and web console -->
-    <feature name="activemq-broker" description="Full ActiveMQ broker with default configuration and web console" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-broker" description="Full ActiveMQ broker with default configuration and web console" version="${project.version}">
         <feature version="${project.version}">activemq</feature>
         <configfile finalname="${karaf.etc}/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq</configfile>
         <configfile finalname="${karaf.etc}/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq</configfile>
         <feature version="${project.version}">activemq-web-console</feature>
     </feature>
 
-    <feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-camel" version="${project.version}">
         <feature version="${project.version}">activemq-client</feature>
         <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
         <feature version="${camel-version-range}">camel-jms</feature>
@@ -46,14 +46,14 @@
         <feature version="${camel-version-range}">camel-blueprint</feature>
     </feature>
 
-    <feature name="activemq-web-console" version="${project.version}" resolver="(obr)" start-level="50">
-      <feature start-level="10">war</feature>
-      <feature start-level="10">eventadmin</feature>
+    <feature name="activemq-web-console" version="${project.version}">
+      <feature>war</feature>
+      <feature>eventadmin</feature>
       <configfile finalname="${karaf.etc}/org.apache.activemq.webconsole.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq-webconsole</configfile>
       <bundle>mvn:org.apache.activemq/activemq-web-console/${project.version}/war</bundle>
     </feature>
 
-    <feature name="activemq-blueprint" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-blueprint" version="${project.version}">
       <feature version="${project.version}">activemq</feature>
       <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
       <bundle dependency="true">mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
diff --git a/pom.xml b/pom.xml
index a339ff99bc..f54645e773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     <junit-version>4.13.1</junit-version>
     <hamcrest-version>1.3</hamcrest-version>
     <jxta-version>2.0</jxta-version>
-    <karaf-version>4.2.8</karaf-version>
+    <karaf-version>4.2.10</karaf-version>
     <leveldb-api-version>0.9</leveldb-api-version>
     <leveldb-version>0.9</leveldb-version>
     <leveldbjni-version>1.8</leveldbjni-version>