This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 35e53539 CAMEL-18031: camel-karaf - Upgrade to 4.4.1
35e53539 is described below
commit 35e535395f27286e06c64f41954b4b025d4cc845
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Sep 20 14:35:10 2022 +0200
CAMEL-18031: camel-karaf - Upgrade to 4.4.1
---
platforms/karaf/features/src/main/resources/features.xml | 5 +----
pom.xml | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 7245b6ee..471dbad9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -552,7 +552,6 @@
</feature>
<feature name='camel-box' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature>pax-http-whiteboard</feature>
<bundle
dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-api/${jetty-version}</bundle>
<bundle
dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-common/${jetty-version}</bundle>
<bundle
dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-client/${jetty-version}</bundle>
@@ -2199,11 +2198,10 @@
<bundle>mvn:org.apache.camel/camel-tarfile/${project.version}</bundle>
<bundle
dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
</feature>
- <!-- TODO: need to have java.net.http imported from Java 11 -->
- <!--
<feature name='camel-telegram' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-webhook</feature>
+ <bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -2225,7 +2223,6 @@
<bundle
dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
<bundle>mvn:org.apache.camel/camel-telegram/${project.version}</bundle>
</feature>
- -->
<feature name='camel-test' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 5d2e3c8a..492d35f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<jdk.version>11</jdk.version>
<compiler.fork>false</compiler.fork>
- <karaf4-version>4.3.7</karaf4-version>
+ <karaf4-version>4.4.1</karaf4-version>
<!-- Camel target version -->
<camel-version>3.19.0-SNAPSHOT</camel-version>
