You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/08/24 05:20:26 UTC
[camel-karaf] branch main updated (ae01757 -> 1ad5df4)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.
from ae01757 OSGi features updates
new 112c359 Camel-Thrift Feature: Fixed by using the OSGi bundle
new 1ad5df4 Camel-Thrift Feature: Bundle version as version property placeholder
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
platforms/karaf/features/src/main/resources/features.xml | 4 +++-
pom.xml | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
[camel-karaf] 02/02: Camel-Thrift Feature: Bundle version as
version property placeholder
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 1ad5df4e2b22767ab41ee75b904fe920b735ddf4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 24 07:16:45 2021 +0200
Camel-Thrift Feature: Bundle version as version property placeholder
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 5fd73cd..51c11d9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2178,7 +2178,7 @@
</feature>
<feature name='camel-thrift' 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.libthrift/0.14.1_1</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/${libthrift-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 0982cf3..3e45964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,7 @@
<libphonenumber-bundle-version>8.12.26_1</libphonenumber-bundle-version>
<lucene-bundle-version>8.9.0_1</lucene-bundle-version>
<lightcouch-bundle-version>0.2.0_1</lightcouch-bundle-version>
+ <libthrift-bundle-version>0.14.1_1</libthrift-bundle-version>
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
<maven-owasp-plugin-version>5.3.1</maven-owasp-plugin-version>
<maven-surefire-plugin-version>3.0.0-M4</maven-surefire-plugin-version>
[camel-karaf] 01/02: Camel-Thrift Feature: Fixed by using the OSGi
bundle
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 112c359ab94da1869539315290ce3aa7b0d72dba
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 24 07:15:25 2021 +0200
Camel-Thrift Feature: Fixed by using the OSGi bundle
---
platforms/karaf/features/src/main/resources/features.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 412dd4c..5fd73cd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2178,7 +2178,9 @@
</feature>
<feature name='camel-thrift' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.thrift/libthrift/${libthrift-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/0.14.1_1</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle>
<bundle>mvn:org.apache.camel/camel-thrift/${project.version}</bundle>