You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/12/12 17:07:44 UTC

[karaf-decanter] branch master updated: [KARAF-6930] Upgrade to Apache Karaf 4.2.10

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 702bfbb  [KARAF-6930] Upgrade to Apache Karaf 4.2.10
     new 11c7604  Merge pull request #215 from jbonofre/KARAF-6930
702bfbb is described below

commit 702bfbb721e899ba26c46208141c476792b686bc
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Dec 1 16:00:21 2020 +0100

    [KARAF-6930] Upgrade to Apache Karaf 4.2.10
---
 assembly/src/main/feature/feature.xml | 5 +++++
 pom.xml                               | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 61d72d9..5506cf9 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -398,6 +398,11 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
         <feature>decanter-common</feature>
         <feature>http</feature>
         <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
+        <bundle dependency="true">mvn:org.ow2.asm/asm/7.3.1</bundle>
+        <bundle dependency="true">mvn:org.ow2.asm/asm-util/7.3.1</bundle>
+        <bundle dependency="true">mvn:org.ow2.asm/asm-tree/7.3.1</bundle>
+        <bundle dependency="true">mvn:org.ow2.asm/asm-analysis/7.3.1</bundle>
+        <bundle dependency="true">mvn:org.ow2.asm/asm-commons/7.3.1</bundle>
         <bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.orientdb/${project.version}</bundle>
     </feature>
 
diff --git a/pom.xml b/pom.xml
index b18d317..b622b6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <glassfish-json.version>1.1.4</glassfish-json.version>
         <json-api.version>1.1.4</json-api.version>
         <kafka.version>2.6.0</kafka.version>
-        <karaf.version>4.2.8</karaf.version>
+        <karaf.version>4.2.10</karaf.version>
         <kibana.version>3.1.1</kibana.version>
         <kibana4.version>4.1.2</kibana4.version>
         <kibana6.version>6.1.1</kibana6.version>