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 2020/10/02 16:57:04 UTC

[camel-karaf] branch master updated (e9f7307 -> 0b259d1)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.


    from e9f7307  Removed Jenkinsfile.karaf.deploy, we are now using a gh action for this purpose
     new 6c5b880  Camel-Kubernetes: Added ASM and Aries bundle needed
     new 0b259d1  Camel-Kubernetes: Fixed Karaf feature

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 | 11 +++++++++++
 pom.xml                                                  |  2 ++
 2 files changed, 13 insertions(+)


[camel-karaf] 01/02: Camel-Kubernetes: Added ASM and Aries bundle needed

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit 6c5b8805ebaa61a5f5d91b508b581c1c1176d0a5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 2 18:37:57 2020 +0200

    Camel-Kubernetes: Added ASM and Aries bundle needed
---
 platforms/karaf/features/src/main/resources/features.xml | 6 ++++++
 pom.xml                                                  | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b02281d..b5f6f7d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1639,6 +1639,12 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
     <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
     <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly.bundle.version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm.bundle.version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm-analysis/${asm.bundle.version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm.bundle.version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm.bundle.version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm-util/${asm.bundle.version}</bundle>
     <bundle dependency='true'>mvn:io.fabric8/zjsonpatch/${zjsonpatch-version}</bundle>
     <bundle>mvn:io.fabric8/kubernetes-model-core/${kubernetes-model-version}</bundle>
     <bundle>mvn:io.fabric8/kubernetes-model-rbac/${kubernetes-model-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 15d39ac..1a96a90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,8 @@
         <apache-mime4j-version>0.8.3</apache-mime4j-version>
         <asciidoctorj-version>2.1.0</asciidoctorj-version>
         <asm-version>5.0.4</asm-version>
+        <aries-spifly.bundle.version>1.3.0</aries-spifly.bundle.version>
+        <asm.bundle.version>8.0.1</asm.bundle.version>
         <asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
         <automaton-bundle-version>1.11-8_1</automaton-bundle-version>
         <avalon-bundle-version>4.3.1_1</avalon-bundle-version>


[camel-karaf] 02/02: Camel-Kubernetes: Fixed Karaf feature

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit 0b259d11191a79cd65d50d3b847c626845c19c01
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 2 18:56:40 2020 +0200

    Camel-Kubernetes: Fixed Karaf feature
---
 platforms/karaf/features/src/main/resources/features.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b5f6f7d..2b6fb53 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1665,7 +1665,12 @@
     <bundle>mvn:io.fabric8/kubernetes-model-settings/${kubernetes-model-version}</bundle>
     <bundle>mvn:io.fabric8/kubernetes-model-storageclass/${kubernetes-model-version}</bundle>
     <bundle>mvn:io.fabric8/kubernetes-model-common/${kubernetes-model-version}</bundle>
+    <bundle>mvn:io.fabric8/openshift-client/${kubernetes-client-version}/jar/bundle</bundle>
     <bundle>mvn:io.fabric8/openshift-model/${kubernetes-model-version}</bundle>
+    <bundle>mvn:io.fabric8/openshift-model-console/${kubernetes-model-version}</bundle>
+    <bundle>mvn:io.fabric8/openshift-model-monitoring/${kubernetes-model-version}</bundle>
+    <bundle>mvn:io.fabric8/openshift-model-operator/${kubernetes-model-version}</bundle>
+    <bundle>mvn:io.fabric8/openshift-model-operatorhub/${kubernetes-model-version}</bundle>
     <bundle dependency='true'>mvn:io.fabric8/kubernetes-client/${kubernetes-client-version}/jar/bundle</bundle>
     <bundle dependency='true'>mvn:io.fabric8/openshift-client/${kubernetes-client-version}/jar/bundle</bundle>
     <bundle>mvn:org.apache.camel/camel-kubernetes/${project.version}</bundle>