[PPP-4893] Karaf upgrade to 4.4.6

pentaho · Nov 1, 2024 · 4a7cc50 · 4a7cc50
1 parent dbe7866
commit 4a7cc50
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 13 deletions.
diff --git a/assemblies/pentaho-war/pom.xml b/assemblies/pentaho-war/pom.xml
@@ -61,10 +61,10 @@
           <artifactId>servlet-api</artifactId>
           <groupId>javax.servlet</groupId>
         </exclusion>
-        <exclusion>
-          <artifactId>javax.servlet-api</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
+<!--        <exclusion>-->
+<!--          <artifactId>javax.servlet-api</artifactId>-->
+<!--          <groupId>javax.servlet</groupId>-->
+<!--        </exclusion>-->
         <exclusion>
           <artifactId>jug-lgpl</artifactId>
           <groupId>org.safehaus.jug</groupId>
@@ -82,11 +82,11 @@
           <groupId>org.apache.xmlgraphics</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>org.osgi.core</artifactId>
+          <artifactId>osgi.core</artifactId>
           <groupId>org.osgi</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>org.osgi.core</artifactId>
+          <artifactId>osgi.core</artifactId>
           <groupId>org.osgi</groupId>
         </exclusion>
         <exclusion>
@@ -549,14 +549,19 @@
     <!-- pentaho-platform-core (PentahoSystem) and pdi-osgi-bridge-core (KarafLifecycleListener and OSGIPluginRegistryExtension) -->
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.log</artifactId>
+      <version>1.5.0</version>
+    </dependency>
     <dependency>
       <groupId>pentaho</groupId>
       <artifactId>pentaho-proxy-factory</artifactId>
@@ -884,6 +889,11 @@
       <artifactId>javax.mail</artifactId>
       <version>${mail.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.json</artifactId>
+      <version>1.0.4</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
@@ -920,6 +930,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>jcommon</groupId>
       <artifactId>jcommon-xml</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -355,7 +355,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -630,6 +630,11 @@
       <version>${javax.servlet-api.version}</version>
       <scope>compile</scope>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jakarta.servlet</groupId>-->
+<!--      <artifactId>jakarta.servlet-api</artifactId>-->
+<!--      <version>4.0.4</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>org.glassfish.metro</groupId>
       <artifactId>webservices-api</artifactId>
@@ -2065,11 +2070,11 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.openjdk.nashorn</groupId>
@@ -2737,6 +2742,14 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto -->
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-crypto</artifactId>
+      <version>5.8.12</version>
+    </dependency>
+
   </dependencies>
   <build>
     <plugins>

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,6 @@
     <asm-attrs.version>2.2.3</asm-attrs.version>
     <mstor.version>0.9.13</mstor.version>
     <hibernate-commons-annotations.version>5.1.2.Final</hibernate-commons-annotations.version>
-    <mina-core.version>2.0.0-M6</mina-core.version>
     <hamcrest-all.version>1.3</hamcrest-all.version>
     <javax.inject.version>1</javax.inject.version>
     <pentaho-vfs.version>1.0</pentaho-vfs.version>

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