Skip to content

fix(DPE-2868): karaf update for camel 4.18 #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
f2par0 wants to merge 3 commits into
base: tesb/karaf-4.4.6.x
Choose a base branch
from
+43 −45
Open

fix(DPE-2868): karaf update for camel 4.18 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
972d6b8
fix(DPE-2868): karaf update for camel 4.18
f2par0 May 5, 2026
a748a03
Merge branch 'tesb/karaf-4.4.6.x' into fdeparscau/fix/DPE-2868
stataru8 May 27, 2026
162651a
Merge branch 'tesb/karaf-4.4.6.x' into fdeparscau/fix/DPE-2868
stataru8 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions assemblies/features/spring/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,42 +24,42 @@

<!-- Spring 6.1.x support -->

<feature name="spring" description="Spring 6.1.x support" version="${spring61.tesb.version}">
<feature name="spring" description="Spring 6.2.x support" version="${spring62.tesb.version}">
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring62.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring62.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring62.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring62.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring62.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring62.tesb.version}</bundle>
</feature>

<feature name="spring-aspects" description="Spring 6.1.x AOP support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring61.tesb.version}</bundle>
<feature name="spring-aspects" description="Spring 6.2.x AOP support" version="${spring61.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring62.tesb.version}</bundle>
</feature>

<feature name="spring-instrument" description="Spring 6.1.x Instrument support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring61.tesb.version}</bundle>
<feature name="spring-instrument" description="Spring 6.2.x Instrument support" version="${spring62.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring62.tesb.version}</bundle>
</feature>

<feature name="spring-jdbc" description="Spring 6.1.x JDBC support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring-tx</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring61.tesb.version}</bundle>
<feature name="spring-jdbc" description="Spring 6.2.x JDBC support" version="${spring62.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring-tx</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring62.tesb.version}</bundle>
</feature>

<feature name="spring-jms" description="Spring 6.1.x JMS support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring-tx</feature>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.13.11</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.13.11</bundle>
<feature name="spring-jms" description="Spring 6.2.x JMS support" version="${spring62.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring-tx</feature>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.14.14</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.14.14</bundle>
<bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring61.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring62.tesb.version}</bundle>
</feature>

<feature name="spring-messaging" description="Spring 6.1.x Messaging support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring61.tesb.version}</bundle>
<feature name="spring-messaging" description="Spring 6.2.x Messaging support" version="${spring62.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring62.tesb.version}</bundle>
</feature>

<!-- Waiting https://issues.apache.org/jira/browse/SM-5703 fix
Expand All @@ -72,9 +72,9 @@
</feature>
-->

<feature name="spring-orm" description="Spring 6.1.x ORM support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring-jdbc</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring61.tesb.version}</bundle>
<feature name="spring-orm" description="Spring 6.2.x ORM support" version="${spring62.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring-jdbc</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring62.tesb.version}</bundle>
</feature>

<!-- Waiting https://issues.apache.org/jira/browse/SM-5703 fix
Expand All @@ -85,16 +85,16 @@
</feature>
-->

<feature name="spring-tx" description="Spring 6.1.x Transaction (TX) support" version="${spring61.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring61.tesb.version}</bundle>
<feature name="spring-tx" description="Spring 6.2.x Transaction (TX) support" version="${spring62.tesb.version}">
<feature version="[${spring62.tesb.version},6.3)">spring</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring62.tesb.version}</bundle>
</feature>

<feature name="spring-web" description="Spring 6.1.x Web support" version="${spring61.tesb.version}">
</feature>

<feature name="spring-web" description="Spring 6.2.x Web support" version="${springbundle62.tesb.version}">
<feature version="[${spring61.tesb.version},6.2)">spring</feature>
<feature version="[${spring62.tesb.version},6.3)">spring</feature>
<bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/${servlet.spec.tesb.version}</bundle>
<bundle dependency="true">mvn:org.ops4j.pax.web/pax-web-compatibility-servlet/${pax.web.tesb.version}</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.13.11</bundle>
Expand All @@ -103,19 +103,19 @@
<bundle start-level="30">wrap:mvn:org.springframework/spring-webmvc/${springbundle62.tesb.version}$Bundle-SymbolicName=spring-webmvc&amp;Bundle-Version=${springbundle62.tesb.version}&amp;Export-Package=org.springframework.*;version=${springbundle62.tesb.version}</bundle>
</feature>

<feature name="spring-websocket" description="Spring 6.1.x WebSocket support" version="${spring61.tesb.version}">
<feature name="spring-websocket" description="Spring 6.2.x WebSocket support" version="${spring62.tesb.version}">
<bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
<feature version="[${spring61.tesb.version},6.2)">spring-web</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring61.tesb.version}</bundle>
<feature version="[${spring62.tesb.version},6.3)">spring-web</feature>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring62.tesb.version}</bundle>
</feature>

<!-- Spring Security -->

<feature name="spring-security" description="Spring Security 6.3.x support" version="${spring.security63.tesb.version}">
<feature>pax-web-jsp</feature>
<feature>pax-web-war</feature>
<feature version="[6.1,6.2)">spring-jdbc</feature>
<feature version="[6.1,6.2)">spring-tx</feature>
<feature version="[6.1,6.3)">spring-jdbc</feature>
<feature version="[6.1,6.3)">spring-tx</feature>
<feature version="[6.2,6.3)">spring-web</feature>
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${javax.annotation.tesb.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.tesb.version}.spiprov</bundle>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/features/standard/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ org.apache.felix.eventadmin.AddSubject=true
<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.security63.tesb.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring61.tesb.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring62.tesb.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${karaf.jaas.spring-security-crypto.tesb.version}</bundle>
</feature>

Expand Down
14 changes: 6 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@
<properties>
<upstream.version>4.4.6</upstream.version>
<base.features.tesb.version>4.4.6.20250420</base.features.tesb.version>
<specs.features.tesb.version>4.4.6.20260512</specs.features.tesb.version>
<framework.features.tesb.version>4.4.6.20260512</framework.features.tesb.version>
<specs.features.tesb.version>4.4.6.20260601</specs.features.tesb.version>
<framework.features.tesb.version>4.4.6.20260601</framework.features.tesb.version>
<standard.features.tesb.version>4.4.6.20260601</standard.features.tesb.version>
<enterprise.features.tesb.version>4.4.6.20260323</enterprise.features.tesb.version>
<spring.features.tesb.version>4.4.6.20260512</spring.features.tesb.version>
<spring-legacy.features.tesb.version>4.4.6.20260323</spring-legacy.features.tesb.version>
<enterprise.features.tesb.version>4.4.6.20260601</enterprise.features.tesb.version>
<spring.features.tesb.version>4.4.6.20260601</spring.features.tesb.version>
<spring-legacy.features.tesb.version>4.4.6.20260601</spring-legacy.features.tesb.version>
<karaf.main.tesb.version>4.4.6.20240820</karaf.main.tesb.version>
<karaf.client.tesb.version>4.4.6.20250320</karaf.client.tesb.version>
<karaf.features.core.tesb.version>${upstream.version}</karaf.features.core.tesb.version>
Expand All @@ -177,7 +177,7 @@
<geronimo.jms2-spec.tesb.version>1.0-alpha-2</geronimo.jms2-spec.tesb.version>
<geronimo-jms2-bundle-override.tesb.version>1.0.0.tp20240209</geronimo-jms2-bundle-override.tesb.version>
<pax.logging.tesb.version>2.3.1.tesb2</pax.logging.tesb.version>
<pax.web.tesb.version>11.0.1</pax.web.tesb.version>
<pax.web.tesb.version>11.1.0</pax.web.tesb.version>
<pax.url.tesb.version>2.6.17</pax.url.tesb.version>
<pax.url.aether.tesb.version>2.6.17.tesb2</pax.url.aether.tesb.version>
<!-- <pax.jms.tesb.version>1.1.3</pax.jms.tesb.version> -->
Expand All @@ -190,9 +190,7 @@
<aspectj.bundle.tesb.version>1.9.21.1_1</aspectj.bundle.tesb.version>
<bouncycastle.tesb.version>1.84</bouncycastle.tesb.version>
<spring53.tesb.version>5.3.39</spring53.tesb.version>
<spring61.tesb.version>6.1.21_1</spring61.tesb.version>
<spring62.tesb.version>6.2.8_1</spring62.tesb.version>
<springbundle61.tesb.version>6.1.21</springbundle61.tesb.version>
<springbundle62.tesb.version>6.2.18</springbundle62.tesb.version>
<springmessaging53.tesb.version>${spring53.tesb.version}</springmessaging53.tesb.version>
<spring.security57.tesb.version>5.7.14</spring.security57.tesb.version>
Expand Down
Loading