From 452d3dfc1593cfe53304c9dd290b077e1e9628ff Mon Sep 17 00:00:00 2001
From: Domenico Francesco Bruscino <brusdev@apache.org>
Date: Wed, 6 Oct 2021 10:56:06 +0200
Subject: [PATCH] ARTEMIS-3518 Upgrade karaf version to 4.3.3

---
 artemis-features/pom.xml                                   | 1 +
 pom.xml                                                    | 2 +-
 .../tests/integration/karaf/ArtemisFeatureTest.java        | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml
index 2c491242a5..a971be62f0 100644
--- a/artemis-features/pom.xml
+++ b/artemis-features/pom.xml
@@ -91,6 +91,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
+                                <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
                                 <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
diff --git a/pom.xml b/pom.xml
index b61fce7a6a..c095d261e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
       <logging.config>logging.properties</logging.config>
 
       <activemq-artemis-native-version>1.0.2</activemq-artemis-native-version>
-      <karaf.version>4.3.1</karaf.version>
+      <karaf.version>4.3.3</karaf.version>
       <pax.exam.version>4.13.4</pax.exam.version>
       <commons.config.version>2.7</commons.config.version>
       <commons.lang.version>3.12.0</commons.lang.version>
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
index c96083a43f..dfffee1cbc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
@@ -95,8 +95,8 @@ public class ArtemisFeatureTest extends Assert {
 
    public static final long ASSERTION_TIMEOUT = 30000L;
    public static final long COMMAND_TIMEOUT = 30000L;
-   public static final String USER = "karaf";
-   public static final String PASSWORD = "karaf";
+   public static final String USER = "artemis";
+   public static final String PASSWORD = "artemis";
 
    @ProbeBuilder
    public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
@@ -117,6 +117,8 @@ public class ArtemisFeatureTest extends Assert {
       Option[] options = new Option[]{karafDistributionConfiguration().frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()).unpackDirectory(new File("target/paxexam/unpack/")),
 
          KarafDistributionOption.keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.INFO), editConfigurationFilePut("etc/config.properties", "karaf.startlevel.bundle", "50"),
+         // add artemis user
+         editConfigurationFilePut("etc/users.properties", USER, PASSWORD + ",manager"),
          // [KARAF-6600] Use https URL for Maven Central
          editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", "https://repo1.maven.org/maven2@id=central, https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases"),
          // uncomment this to debug it.
@@ -202,7 +204,6 @@ public class ArtemisFeatureTest extends Assert {
       final PrintStream printStream = new PrintStream(byteArrayOutputStream);
       final Session commandSession = sessionFactory.create(System.in, printStream, printStream);
       commandSession.put("APPLICATION", System.getProperty("karaf.name", "root"));
-      commandSession.put("USER", USER);
       FutureTask<String> commandFuture = new FutureTask<>(new Callable<String>() {
          @Override
          public String call() {