Skip to content

DPE-1877 dependency alignment with Camel 4.10.5 and CXF 4.1.3. #142

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
andreasmattes wants to merge 1 commit into
base: tesb/karaf-4.4.6.x
Choose a base branch
from
+18 −14
Open

DPE-1877 dependency alignment with Camel 4.10.5 and CXF 4.1.3. #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions assemblies/features/enterprise/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.4</bundle>
</feature>

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

<feature name="eclipselink" description="Eclipselink JPA persistence engine support" version="${eclipselink.version}">
<details>Eclipselink persistence engine.</details>
Expand Down
12 changes: 6 additions & 6 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 @@ -51,8 +51,8 @@

<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>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version}</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version}</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>
</feature>
Expand Down Expand Up @@ -97,8 +97,8 @@
<feature version="[${spring61.tesb.version},6.2)">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>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.13.11</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version}</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version}</bundle>
<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>
<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>
Expand All @@ -121,8 +121,8 @@
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.tesb.version}.spiprov</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.tesb.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind.tesb.version}.spiprov</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.13.11</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.13.11</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version}</bundle>
<bundle dependency="true">mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version}</bundle>
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/3.0.0</bundle>
<bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/6.1.0</bundle>
<bundle dependency="true">mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.1.1</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 @@ -398,7 +398,7 @@ disableEofExit = false

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

<feature name="shell-compat" description="Karaf Shell Compatibility" version="${upstream.version}">
Expand Down
12 changes: 8 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@
<base.features.tesb.version>4.4.6.20250420</base.features.tesb.version>
<specs.features.tesb.version>4.4.6.20250901</specs.features.tesb.version>
<framework.features.tesb.version>4.4.6.20251010</framework.features.tesb.version>
<standard.features.tesb.version>4.4.6.20251212</standard.features.tesb.version>
<enterprise.features.tesb.version>4.4.6.20250901</enterprise.features.tesb.version>
<spring.features.tesb.version>4.4.6.20251001</spring.features.tesb.version>
<standard.features.tesb.version>4.4.6.20251224</standard.features.tesb.version>
<enterprise.features.tesb.version>4.4.6.20251224</enterprise.features.tesb.version>
<spring.features.tesb.version>4.4.6.20251224</spring.features.tesb.version>
<spring-legacy.features.tesb.version>4.4.6.20240820</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>
Expand Down Expand Up @@ -205,7 +205,8 @@
<johnzon.core.tesb.version>1.2.21</johnzon.core.tesb.version>
<snakeyaml.tesb.version>2.4</snakeyaml.tesb.version>
<cdi-api.tesb.version>2.0.SP1</cdi-api.tesb.version>
<sshd.tesb.version>2.13.2</sshd.tesb.version>
<jline.tesb.version>3.29.0</jline.tesb.version>
<sshd.tesb.version>2.14.0</sshd.tesb.version>
<groovy.tesb.version>3.0.8</groovy.tesb.version>
<httpclient.tesb.version>4.5.14</httpclient.tesb.version>
<cbp.tesb.version>1.0.9</cbp.tesb.version>
Expand All @@ -221,6 +222,7 @@
<servlet.spec.tesb.version>6.1.0</servlet.spec.tesb.version>
<jolokia.tesb.version>2.2.8</jolokia.tesb.version>
<nimbus-jose-jwt.tesb.version>10.4</nimbus-jose-jwt.tesb.version>
<micrometer.tesb.version>1.14.9</micrometer.tesb.version>

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

Expand Down Expand Up @@ -589,6 +591,7 @@
<jolokia.tesb.version>${jolokia.tesb.version}</jolokia.tesb.version>
<snakeyaml.tesb.version>${snakeyaml.tesb.version}</snakeyaml.tesb.version>
<cdi-api.tesb.version>${cdi-api.tesb.version}</cdi-api.tesb.version>
<jline.tesb.version>${jline.tesb.version}</jline.tesb.version>
<sshd.tesb.version>${sshd.tesb.version}</sshd.tesb.version>
<groovy.tesb.version>${groovy.tesb.version}</groovy.tesb.version>
<httpclient.tesb.version>${httpclient.tesb.version}</httpclient.tesb.version>
Expand All @@ -601,6 +604,7 @@
<commons-lang3.tesb.version>${commons-lang3.tesb.version}</commons-lang3.tesb.version>
<xbean.tesb.version>${xbean.tesb.version}</xbean.tesb.version>
<nimbus-jose-jwt.tesb.version>${nimbus-jose-jwt.tesb.version}</nimbus-jose-jwt.tesb.version>
<micrometer.tesb.version>${micrometer.tesb.version}</micrometer.tesb.version>
</properties>
</configuration>
<executions>
Expand Down
Loading