From 7a8e26e1277cbe14099f5a95f19ac3b0b237d064 Mon Sep 17 00:00:00 2001
From: Andreas Mattes <andreasmattes@fastmail.de>
Date: Thu, 2 Nov 2023 18:17:04 +0100
Subject: [PATCH] TPRUN-6956 dependency version alignments with activemq
 5.17.6.

---
 .../enterprise/src/main/feature/feature.xml        |  2 +-
 .../features/specs/src/main/feature/feature.xml    |  6 +++---
 .../features/standard/src/main/feature/feature.xml |  2 +-
 pom.xml                                            | 14 ++++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 2943c586008..75f5d27533e 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -214,7 +214,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
         <details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}, including additional service, commands, and MBean.</details>
         <feature>aries-proxy</feature>
         <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.xbean/xbean-naming/${xbean.tesb.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.api.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.core.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/${aries.jndi.version}</bundle>
diff --git a/assemblies/features/specs/src/main/feature/feature.xml b/assemblies/features/specs/src/main/feature/feature.xml
index 9c8f3113712..b889eb53687 100644
--- a/assemblies/features/specs/src/main/feature/feature.xml
+++ b/assemblies/features/specs/src/main/feature/feature.xml
@@ -117,9 +117,9 @@
 
     <!-- xbean -->
     <feature name="xbean" version="${xbean.version}">
-        <bundle>mvn:org.apache.xbean/xbean-bundleutils/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.xbean/xbean-finder-shaded/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-bundleutils/${xbean.tesb.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.tesb.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-finder-shaded/${xbean.tesb.version}</bundle>
     </feature>
 
     <!-- converter -->
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index ee7d5aefa1c..316ac466e24 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1456,7 +1456,7 @@ org.apache.felix.eventadmin.AddSubject=true
     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="${upstream.version}">
         <feature>jaas</feature>
         <bundle dependency="true" start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.tesb.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security57.tesb.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${upstream.version}</bundle>
     </feature>
 
diff --git a/pom.xml b/pom.xml
index c90fdad2064..2a5a63023d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,10 +151,10 @@
 
     <properties>
         <upstream.version>4.4.3</upstream.version>
-        <specs.features.tesb.version>4.4.3.20230726</specs.features.tesb.version>
-        <standard.features.tesb.version>4.4.3.20231016</standard.features.tesb.version>
-        <enterprise.features.tesb.version>4.4.3.20230915</enterprise.features.tesb.version>
-        <spring.features.tesb.version>4.4.3.20230726</spring.features.tesb.version>
+        <specs.features.tesb.version>4.4.3.20231031</specs.features.tesb.version>
+        <standard.features.tesb.version>4.4.3.20231031</standard.features.tesb.version>
+        <enterprise.features.tesb.version>4.4.3.20231031</enterprise.features.tesb.version>
+        <spring.features.tesb.version>4.4.3.20231031</spring.features.tesb.version>
         <spring-legacy.features.tesb.version>4.4.3.20230915</spring-legacy.features.tesb.version>
         <karaf.main.tesb.version>4.4.3.20230726</karaf.main.tesb.version>
         <karaf.client.tesb.version>4.4.3.20230915</karaf.client.tesb.version>
@@ -168,9 +168,9 @@
         <pax.transx.tesb.version>0.5.4</pax.transx.tesb.version>
         <spec.mail.tesb.version>1.6.7</spec.mail.tesb.version>
         <bouncycastle.tesb.version>1.76</bouncycastle.tesb.version>
-        <spring53.tesb.version>5.3.28_1</spring53.tesb.version>
+        <spring53.tesb.version>5.3.30_1</spring53.tesb.version>
         <spring.security57.tesb.version>5.7.5_1</spring.security57.tesb.version>
-        <spring.security58.tesb.version>5.8.4_1</spring.security58.tesb.version>
+        <spring.security58.tesb.version>5.8.6_1</spring.security58.tesb.version>
         <jackson.tesb.version>2.14.3</jackson.tesb.version>
         <jackson-databind.tesb.version>${jackson.tesb.version}</jackson-databind.tesb.version>
         <cdi-api.tesb.version>2.0.SP1</cdi-api.tesb.version>
@@ -179,6 +179,7 @@
         <httpclient.tesb.version>4.5.14</httpclient.tesb.version>
         <commons-fileupload.tesb.version>1.5</commons-fileupload.tesb.version>
         <jetty.tesb.version>9.4.53.v20231009</jetty.tesb.version>
+        <xbean.tesb.version>4.24</xbean.tesb.version>
 
         <project.build.outputTimestamp>1</project.build.outputTimestamp>        
 
@@ -497,6 +498,7 @@
                             <httpclient.tesb.version>${httpclient.tesb.version}</httpclient.tesb.version>
                             <commons-fileupload.tesb.version>${commons-fileupload.tesb.version}</commons-fileupload.tesb.version>
                             <jetty.tesb.version>${jetty.tesb.version}</jetty.tesb.version>
+                            <xbean.tesb.version>${xbean.tesb.version}</xbean.tesb.version>
                         </properties>
                     </configuration>
                     <executions>