[PPP-4893] Karaf upgrade to 4.4.6

pentaho · Nov 1, 2024 · c8dcdc6 · c8dcdc6
1 parent bb4ad0a
commit c8dcdc6
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 7 deletions.
diff --git a/assemblies/core/lib/pom.xml b/assemblies/core/lib/pom.xml
@@ -625,7 +625,7 @@
               <!--Still needed even for a no-osgi build because of PentahoSystem dependency -->
               <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
+                <artifactId>osgi.core</artifactId>
                 <scope>compile</scope>
                 <exclusions>
                     <exclusion>

diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
@@ -49,10 +49,12 @@
     <enunciate-core-annotations.version>1.27</enunciate-core-annotations.version>
     <tyrus-standalone-client.version>1.13.1</tyrus-standalone-client.version>
     <databricks.version>4.0.0</databricks.version>
+<!--    <javax.servlet-api.version>4.0.1</javax.servlet-api.version>-->
     <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
     <jface.version>3.22.0</jface.version>
     <pentaho-metadata.version>10.3.0.0-SNAPSHOT</pentaho-metadata.version>
     <google-http-client.version>1.42.3</google-http-client.version>
+    <pax-swissbox-core.version>1.8.2</pax-swissbox-core.version>
   </properties>
 
   <dependencies>
@@ -456,6 +458,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <!-- Temp dependency until SLF4J is upgraded -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>2.0.12</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
@@ -647,7 +655,7 @@
     <!--Still needed for a no-osgi build because of PentahoSystem dependency -->
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <version>${osgi.core.version}</version>
       <scope>compile</scope>
       <exclusions>
@@ -657,6 +665,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.swissbox</groupId>
+      <artifactId>pax-swissbox-core</artifactId>
+      <version>${pax-swissbox-core.version}</version>
+    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/assemblies/pom.xml b/assemblies/pom.xml
@@ -44,7 +44,7 @@
         <dependencies>
           <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <version>${osgi.core.version}</version>
             <scope>compile</scope>
           </dependency>

diff --git a/plugins/excel/core/pom.xml b/plugins/excel/core/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

diff --git a/plugins/json/core/pom.xml b/plugins/json/core/pom.xml
@@ -216,7 +216,7 @@
     <!-- neccessary -->
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/plugins/pur/core/pom.xml b/plugins/pur/core/pom.xml
@@ -366,7 +366,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/plugins/streaming/impls/jms/pom.xml b/plugins/streaming/impls/jms/pom.xml
@@ -134,6 +134,19 @@
           <groupId>io.netty</groupId>
           <artifactId>netty-handler</artifactId>
         </exclusion>
+        <!-- Excluding Bouncy castle version 1.77 -->
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk18on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk18on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcutil-jdk18on</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- pulling newer version of io-netty version 108 -->

diff --git a/plugins/xml/core/pom.xml b/plugins/xml/core/pom.xml
@@ -101,7 +101,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>