This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/main by this push:
new f9f5af2c [KARAF-7660] Upgrade to orientdb-client 3.2.15
new 8611f2fb Merge pull request #319 from jbonofre/KARAF-7660
f9f5af2c is described below
commit f9f5af2c11cfa8a836681034d6a082e43aa807dc
Author: JB Onofré <[email protected]>
AuthorDate: Mon Feb 6 14:07:59 2023 +0100
[KARAF-7660] Upgrade to orientdb-client 3.2.15
---
appender/orientdb/pom.xml | 2 +-
assembly/pom.xml | 1 +
assembly/src/main/feature/feature.xml | 30 ++++++++----------------------
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/appender/orientdb/pom.xml b/appender/orientdb/pom.xml
index c14c5843..e467693b 100644
--- a/appender/orientdb/pom.xml
+++ b/appender/orientdb/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-client</artifactId>
- <version>3.2.4</version>
+ <version>3.2.15</version>
</dependency>
<!-- test -->
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ed5e07dc..1d609690 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -90,6 +90,7 @@
<descriptor>file:${project.build.directory}/classes/feature.xml</descriptor>
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
</descriptors>
diff --git a/assembly/src/main/feature/feature.xml
b/assembly/src/main/feature/feature.xml
index 3d63b503..f847b1ca 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -229,10 +229,8 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-collector-redis-core" version="${project.version}"
description="Karaf Decanter Redis Collector core">
<feature>decanter-common</feature>
<feature>scheduler</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.14.2</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.14.2</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.2</bundle>
+ <feature>activation</feature>
+ <feature>jackson</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.redis/${project.version}</bundle>
</feature>
@@ -386,28 +384,22 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-hdfs" version="${project.version}"
description="Karaf Decanter HDFS appender">
<feature>decanter-common</feature>
<configfile
finalname="/etc/org.apache.karaf.decanter.appender.hdfs.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.hdfs/${project.version}/cfg</configfile>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.13.1</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.13.1</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.1</bundle>
+ <feature>jackson</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.hdfs/${project.version}</bundle>
</feature>
<feature name="decanter-appender-s3" version="${project.version}"
description="Karaf Decanter AWS S3 appender">
<feature>decanter-common</feature>
<configfile
finalname="/etc/org.apache.karaf.decanter.appender.s3.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.s3/${project.version}/cfg</configfile>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.13.1</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.13.1</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.1</bundle>
+ <feature>jackson</feature>
<bundle
dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.13.1</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.s3/${project.version}</bundle>
</feature>
<feature name="decanter-appender-redis-core" version="${project.version}"
description="Karaf Decanter Redis Appender core">
<feature>decanter-common</feature>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.14.2</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.14.2</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.2</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
+ <feature>jackson</feature>
+ <feature>activation</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.redis/${project.version}</bundle>
</feature>
@@ -439,15 +431,9 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-orientdb-core"
version="${project.version}" description="Karaf Decanter OrientDB Appender
core">
<feature>decanter-common</feature>
<feature>http</feature>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.13.1</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.13.1</bundle>
- <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.1</bundle>
+ <feature>jackson</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>
+ <feature>asm</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.orientdb/${project.version}</bundle>
</feature>
