From fa3ac60b218e1f57ac1e5674294cb2c48992f995 Mon Sep 17 00:00:00 2001
From: Oliver Lietz <info@oliverlietz.de>
Date: Fri, 25 Oct 2024 19:53:13 +0200
Subject: [PATCH] #1091 Modernize Karaf test container

update Karaf to 4.4.6
---
 .../karaf/container/AbstractKarafTestContainerIT.java     | 2 +-
 .../regression/karaf/BootClasspathLibraryOptionTest.java  | 2 +-
 .../regression-karaf/src/test/resources/exam.properties   | 2 +-
 .../src/test/resources/expected_extra.properties          | 8 ++++----
 pom/pom.xml                                               | 2 +-
 .../org/ops4j/pax/exam/sample/karaf/CalculatorITest.java  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java
index 3eb607833..3fc007eba 100644
--- a/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java
+++ b/containers/pax-exam-container-karaf/src/test/java/org/ops4j/pax/exam/karaf/container/AbstractKarafTestContainerIT.java
@@ -75,7 +75,7 @@ public String karafVersion() {
     }
 
     protected String getDefaultKarafVersion() {
-        return "4.4.5";
+        return "4.4.6";
     }
 
     @Test
diff --git a/itest/karaf/src/it/regression-karaf/src/test/java/org/ops4j/pax/exam/regression/karaf/BootClasspathLibraryOptionTest.java b/itest/karaf/src/it/regression-karaf/src/test/java/org/ops4j/pax/exam/regression/karaf/BootClasspathLibraryOptionTest.java
index 162c951a6..8fd9e9803 100644
--- a/itest/karaf/src/it/regression-karaf/src/test/java/org/ops4j/pax/exam/regression/karaf/BootClasspathLibraryOptionTest.java
+++ b/itest/karaf/src/it/regression-karaf/src/test/java/org/ops4j/pax/exam/regression/karaf/BootClasspathLibraryOptionTest.java
@@ -50,7 +50,7 @@ public void test() throws Exception {
                 foundJarFiles++;
             }
         }
-        // Karaf 4.4.4 has 5 boot libs, we expect another one to show up
+        // Karaf 4.4.6 has 5 boot libs, we expect another one to show up
         assertEquals(5 + 1, foundJarFiles);
     }
 
diff --git a/itest/karaf/src/it/regression-karaf/src/test/resources/exam.properties b/itest/karaf/src/it/regression-karaf/src/test/resources/exam.properties
index eb58fd343..832a0ca2f 100644
--- a/itest/karaf/src/it/regression-karaf/src/test/resources/exam.properties
+++ b/itest/karaf/src/it/regression-karaf/src/test/resources/exam.properties
@@ -1,2 +1,2 @@
 # Change this version to override the default
-pax.exam.karaf.version = 4.4.5
+pax.exam.karaf.version = 4.4.6
diff --git a/itest/karaf/src/it/regression-karaf/src/test/resources/expected_extra.properties b/itest/karaf/src/it/regression-karaf/src/test/resources/expected_extra.properties
index 2485d2f35..6ecc69ed5 100644
--- a/itest/karaf/src/it/regression-karaf/src/test/resources/expected_extra.properties
+++ b/itest/karaf/src/it/regression-karaf/src/test/resources/expected_extra.properties
@@ -3,7 +3,7 @@ org.osgi.framework.system.packages.extra = \
     sun.misc, \
     com.sun.jmx.remote.protocol, \
     com.sun.jmx.remote.protocol.jmxmp, \
-    org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=4.4.5, \
-    org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=4.4.5, \
-    org.apache.karaf.jaas.boot;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework\";version=4.4.5, \
-    org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=4.4.5
+    org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=4.4.6, \
+    org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=4.4.6, \
+    org.apache.karaf.jaas.boot;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework\";version=4.4.6, \
+    org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=4.4.6
diff --git a/pom/pom.xml b/pom/pom.xml
index f4d28165a..5e0398c6d 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -26,7 +26,7 @@
         <dependency.junit.version>4.13.2</dependency.junit.version>
         <dependency.osgicore.version>8.0.0</dependency.osgicore.version>
         <dependency.atinject.version>1.0.5</dependency.atinject.version>
-        <dependency.karaf.version>4.4.5</dependency.karaf.version>
+        <dependency.karaf.version>4.4.6</dependency.karaf.version>
 
         <dependency.logback.version>1.2.12</dependency.logback.version>
 
diff --git a/samples/exam-itest-sample-karaf/src/test/java/org/ops4j/pax/exam/sample/karaf/CalculatorITest.java b/samples/exam-itest-sample-karaf/src/test/java/org/ops4j/pax/exam/sample/karaf/CalculatorITest.java
index 889b8fe80..1368f45cc 100644
--- a/samples/exam-itest-sample-karaf/src/test/java/org/ops4j/pax/exam/sample/karaf/CalculatorITest.java
+++ b/samples/exam-itest-sample-karaf/src/test/java/org/ops4j/pax/exam/sample/karaf/CalculatorITest.java
@@ -77,7 +77,7 @@ public Option[] config() {
 
     public static String karafVersion() {
         ConfigurationManager cm = new ConfigurationManager();
-        String karafVersion = cm.getProperty("pax.exam.karaf.version", "4.4.5");
+        String karafVersion = cm.getProperty("pax.exam.karaf.version", "4.4.6");
         return karafVersion;
     }