Skip to content

Commit d279f48

Browse files
committed
DPE-1877 dependency alignment with Camel 4.10.5 and CXF 4.1.3.
1 parent af87f93 commit d279f48

4 files changed

Lines changed: 18 additions & 14 deletions

File tree

assemblies/features/enterprise/src/main/feature/feature.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
139139
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.4</bundle>
140140
</feature>
141141

142-
<feature name="hibernate" description="Hibernate JPA engine support" version="${hibernate.version}">
143-
<!-- hibernate-orm feature installs osgi.core and osgi.compendium bundle (it should not), causing huge refresh -->
142+
<!-- <feature name="hibernate" description="Hibernate JPA engine support" version="${hibernate.version}">
143+
--><!-- hibernate-orm feature installs osgi.core and osgi.compendium bundle (it should not), causing huge refresh --><!--
144144
<feature prerequisite="true">pax-url-wrap</feature>
145145
<feature>transaction-api</feature>
146146
<feature>aries-blueprint</feature>
@@ -166,7 +166,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
166166
<feature version="${hibernate.version}">hibernate</feature>
167167
<bundle>mvn:org.jboss/jandex/2.2.3.Final</bundle>
168168
<bundle>mvn:org.hibernate/hibernate-envers/${hibernate.version}</bundle>
169-
</feature>
169+
</feature> -->
170170

171171
<feature name="eclipselink" description="Eclipselink JPA persistence engine support" version="${eclipselink.version}">
172172
<details>Eclipselink persistence engine.</details>

assemblies/features/spring/src/main/feature/feature.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151

5252
<feature name="spring-jms" description="Spring 6.1.x JMS support" version="${spring61.tesb.version}">
5353
<feature version="[${spring61.tesb.version},6.2)">spring-tx</feature>
54-
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.13.11</bundle>
55-
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.13.11</bundle>
54+
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version}</bundle>
55+
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version}</bundle>
5656
<bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
5757
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring61.tesb.version}</bundle>
5858
</feature>
@@ -97,8 +97,8 @@
9797
<feature version="[${spring61.tesb.version},6.2)">spring</feature>
9898
<bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/${servlet.spec.tesb.version}</bundle>
9999
<bundle dependency="true">mvn:org.ops4j.pax.web/pax-web-compatibility-servlet/${pax.web.tesb.version}</bundle>
100-
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.13.11</bundle>
101-
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.13.11</bundle>
100+
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version}</bundle>
101+
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version}</bundle>
102102
<bundle start-level="30">wrap:mvn:org.springframework/spring-web/${springbundle62.tesb.version}$Bundle-SymbolicName=spring-web&amp;Bundle-Version=${springbundle62.tesb.version}&amp;Export-Package=org.springframework.*;version=${springbundle62.tesb.version}</bundle>
103103
<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>
104104
</feature>
@@ -121,8 +121,8 @@
121121
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.tesb.version}.spiprov</bundle>
122122
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.tesb.version}</bundle>
123123
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind.tesb.version}.spiprov</bundle>
124-
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.13.11</bundle>
125-
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.13.11</bundle>
124+
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version}</bundle>
125+
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version}</bundle>
126126
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/3.0.0</bundle>
127127
<bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/6.1.0</bundle>
128128
<bundle dependency="true">mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.1.1</bundle>

assemblies/features/standard/src/main/feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ disableEofExit = false
398398

399399
<feature name="jline" version="${jline.version}" hidden="true">
400400
<bundle dependency="true" start-level="30">mvn:org.fusesource.jansi/jansi/${jansi.version}</bundle>
401-
<bundle start-level="30">mvn:org.jline/jline/${jline.version}</bundle>
401+
<bundle start-level="30">mvn:org.jline/jline/${jline.tesb.version}</bundle>
402402
</feature>
403403

404404
<feature name="shell-compat" description="Karaf Shell Compatibility" version="${upstream.version}">

pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@
154154
<base.features.tesb.version>4.4.6.20250420</base.features.tesb.version>
155155
<specs.features.tesb.version>4.4.6.20250901</specs.features.tesb.version>
156156
<framework.features.tesb.version>4.4.6.20251010</framework.features.tesb.version>
157-
<standard.features.tesb.version>4.4.6.20251013</standard.features.tesb.version>
158-
<enterprise.features.tesb.version>4.4.6.20250901</enterprise.features.tesb.version>
159-
<spring.features.tesb.version>4.4.6.20251001</spring.features.tesb.version>
157+
<standard.features.tesb.version>4.4.6.20251020</standard.features.tesb.version>
158+
<enterprise.features.tesb.version>4.4.6.20251020</enterprise.features.tesb.version>
159+
<spring.features.tesb.version>4.4.6.20251020</spring.features.tesb.version>
160160
<spring-legacy.features.tesb.version>4.4.6.20240820</spring-legacy.features.tesb.version>
161161
<karaf.main.tesb.version>4.4.6.20240820</karaf.main.tesb.version>
162162
<karaf.client.tesb.version>4.4.6.20250320</karaf.client.tesb.version>
@@ -205,7 +205,8 @@
205205
<johnzon.core.tesb.version>1.2.21</johnzon.core.tesb.version>
206206
<snakeyaml.tesb.version>2.4</snakeyaml.tesb.version>
207207
<cdi-api.tesb.version>2.0.SP1</cdi-api.tesb.version>
208-
<sshd.tesb.version>2.13.2</sshd.tesb.version>
208+
<jline.tesb.version>3.29.0</jline.tesb.version>
209+
<sshd.tesb.version>2.14.0</sshd.tesb.version>
209210
<groovy.tesb.version>3.0.8</groovy.tesb.version>
210211
<httpclient.tesb.version>4.5.14</httpclient.tesb.version>
211212
<cbp.tesb.version>1.0.9</cbp.tesb.version>
@@ -221,6 +222,7 @@
221222
<servlet.spec.tesb.version>6.1.0</servlet.spec.tesb.version>
222223
<jolokia.tesb.version>2.2.8</jolokia.tesb.version>
223224
<nimbus-jose-jwt.tesb.version>10.4</nimbus-jose-jwt.tesb.version>
225+
<micrometer.tesb.version>1.14.9</micrometer.tesb.version>
224226

225227
<project.build.outputTimestamp>1712650974</project.build.outputTimestamp>
226228

@@ -589,6 +591,7 @@
589591
<jolokia.tesb.version>${jolokia.tesb.version}</jolokia.tesb.version>
590592
<snakeyaml.tesb.version>${snakeyaml.tesb.version}</snakeyaml.tesb.version>
591593
<cdi-api.tesb.version>${cdi-api.tesb.version}</cdi-api.tesb.version>
594+
<jline.tesb.version>${jline.tesb.version}</jline.tesb.version>
592595
<sshd.tesb.version>${sshd.tesb.version}</sshd.tesb.version>
593596
<groovy.tesb.version>${groovy.tesb.version}</groovy.tesb.version>
594597
<httpclient.tesb.version>${httpclient.tesb.version}</httpclient.tesb.version>
@@ -601,6 +604,7 @@
601604
<commons-lang3.tesb.version>${commons-lang3.tesb.version}</commons-lang3.tesb.version>
602605
<xbean.tesb.version>${xbean.tesb.version}</xbean.tesb.version>
603606
<nimbus-jose-jwt.tesb.version>${nimbus-jose-jwt.tesb.version}</nimbus-jose-jwt.tesb.version>
607+
<micrometer.tesb.version>${micrometer.tesb.version}</micrometer.tesb.version>
604608
</properties>
605609
</configuration>
606610
<executions>

0 commit comments

Comments
 (0)