Updates

kiegroup · Sep 19, 2024 · ad15f69 · ad15f69
1 parent 295bd4e
commit ad15f69
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/kie-osgi/kie-karaf-features/pom.xml b/kie-osgi/kie-karaf-features/pom.xml
@@ -57,23 +57,23 @@
     <!-- used by kie-server-client -->
     <karaf.version.org.apache.servicemix.specs>2.9.1</karaf.version.org.apache.servicemix.specs>
 
-    <karaf.version.org.apache.logging.log4j>2.19.0</karaf.version.org.apache.logging.log4j>
+    <karaf.version.org.apache.logging.log4j>2.23.1</karaf.version.org.apache.logging.log4j>
     <!-- used by hibernate-validator -->
     <karaf.version.org.apache.servicemix.specs.jsr303-api>2.4.0</karaf.version.org.apache.servicemix.specs.jsr303-api>
 
     <!-- Overwrites with a different Maven version. Apache POI 3.11+ needs version >=1.9 -->
-    <karaf.version.commons-codec>1.10</karaf.version.commons-codec>
+    <karaf.version.commons-codec>1.15</karaf.version.commons-codec>
     <karaf.version.commons-collections4>4.1</karaf.version.commons-collections4>
     <!-- Overwrites with a servicemix version -->
-    <karaf.servicemix.version.com.google.protobuf>2.4.1_1</karaf.servicemix.version.com.google.protobuf>
+    <karaf.servicemix.version.com.google.protobuf>3.19.6_1</karaf.servicemix.version.com.google.protobuf>
     <karaf.servicemix.version.com.sun.xml.bind.jaxb>2.3.2_3</karaf.servicemix.version.com.sun.xml.bind.jaxb>
     <karaf.servicemix.version.com.sun.xml.bind.jaxb.xjc>2.3.2_2</karaf.servicemix.version.com.sun.xml.bind.jaxb.xjc>
-    <karaf.servicemix.version.com.thoughtworks.xstream>1.4.10_1</karaf.servicemix.version.com.thoughtworks.xstream>
+    <karaf.servicemix.version.com.thoughtworks.xstream>1.4.20_1</karaf.servicemix.version.com.thoughtworks.xstream>
     <karaf.servicemix.version.com.thoughtworks.xmlpull>1.1.4c_7</karaf.servicemix.version.com.thoughtworks.xmlpull>
     <karaf.servicemix.version.javax.xml.bind.jaxb>2.3_3</karaf.servicemix.version.javax.xml.bind.jaxb>
     <karaf.servicemix.version.org.antlr>3.5_1</karaf.servicemix.version.org.antlr>
-    <karaf.servicemix.version.org.apache.poi>4.1.2_1</karaf.servicemix.version.org.apache.poi>
-    <karaf.servicemix.version.org.apache.xmlbeans>3.1.0_2</karaf.servicemix.version.org.apache.xmlbeans>
+    <karaf.servicemix.version.org.apache.poi>5.2.3_1</karaf.servicemix.version.org.apache.poi>
+    <karaf.servicemix.version.org.apache.xmlbeans>5.2.0_1</karaf.servicemix.version.org.apache.xmlbeans>
     <!-- Santurio and xmlresolver needed by POI 3.15+ -->
     <karaf.version.org.apache.commons-collections4>4.1</karaf.version.org.apache.commons-collections4>
     <karaf.version.org.apache.santurio>2.2.6</karaf.version.org.apache.santurio>
@@ -165,7 +165,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xstream-java8</artifactId>
+        <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
         <version>${karaf.servicemix.version.com.thoughtworks.xstream}</version>
       </dependency>
       <dependency>
@@ -623,7 +623,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.xstream-java8</artifactId>
+      <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/kie-osgi/kie-karaf-features/src/main/filtered-resources/repository/features-fuse.xml b/kie-osgi/kie-karaf-features/src/main/filtered-resources/repository/features-fuse.xml
@@ -29,7 +29,9 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/${karaf.servicemix.version.org.apache.poi}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${karaf.servicemix.version.org.apache.xmlbeans}</bundle>
     <bundle>mvn:org.apache.commons/commons-compress/${version.org.apache.commons.compress}</bundle>
+    <bundle>mvn:commons-io/commons-io/${version.commons-io}</bundle>
     <bundle>mvn:org.apache.commons/commons-math3/${version.org.apache.commons.math3}</bundle>
+    <bundle start-level="100">mvn:org.apache.logging.log4j/log4j-api/${karaf.version.org.apache.logging.log4j}</bundle>
   </feature>
 
   <feature name="drools-wb-guided-decisiontables" description="Drools Workbench Guided Decision Tables" version="${project.version}">

diff --git a/kie-osgi/kie-karaf-features/src/main/filtered-resources/repository/features.xml b/kie-osgi/kie-karaf-features/src/main/filtered-resources/repository/features.xml
@@ -32,9 +32,11 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/${karaf.servicemix.version.org.apache.poi}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${karaf.servicemix.version.org.apache.xmlbeans}</bundle>
     <bundle>mvn:org.apache.commons/commons-compress/${version.org.apache.commons.compress}</bundle>
+    <bundle>mvn:commons-io/commons-io/${version.commons-io}</bundle>
     <bundle>mvn:org.apache.commons/commons-math3/${version.org.apache.commons.math3}</bundle>
     <bundle>mvn:org.apache.santuario/xmlsec/${karaf.version.org.apache.santurio}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${karaf.servicemix.version.xmlresolver}</bundle>
+    <bundle start-level="100">mvn:org.apache.logging.log4j/log4j-api/${karaf.version.org.apache.logging.log4j}</bundle>
   </feature>
 
   <feature name="drools-wb-guided-decisiontables" description="Drools Workbench Guided Decision Tables" version="${project.version}">
@@ -66,7 +68,7 @@
     <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${karaf.servicemix.version.scripting-api}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${karaf.servicemix.version.org.quartz-scheduler}</bundle>
     <bundle>mvn:jakarta.security.jacc/jakarta.security.jacc-api/${version.jakarta.security.jacc-api}</bundle>
-    <bundle>mvn:joda-time/joda-time/${karaf.version.joda-time}</bundle>
+    <bundle>wrap:mvn:joda-time/joda-time/${karaf.version.joda-time}</bundle>
     <bundle>mvn:jakarta.interceptor/jakarta.interceptor-api/${version.jakarta.interceptor-api}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${karaf.version.org.apache.geronimo.specs.jms}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${karaf.version.org.apache.geronimo.specs.jpa}</bundle>

diff --git a/kie-osgi/kie-karaf-itests/pom.xml b/kie-osgi/kie-karaf-itests/pom.xml
@@ -352,6 +352,16 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>java11</id>
+      <activation>
+        <jdk>11</jdk>
+      </activation>
+      <properties>
+        <skipTests>false</skipTests>
+      </properties>
+    </profile>
+
     <profile>
       <id>fuse7</id>
       <properties>