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 a62e1078 [KARAF-7654] Upgrade to redisson 3.19.1
new c5ee0917 Merge pull request #317 from jbonofre/KARAF-7654
a62e1078 is described below
commit a62e10784b1cad0de8371780dd885701d5967b93
Author: JB Onofré <jb.ono...@dremio.com>
AuthorDate: Mon Feb 6 09:43:49 2023 +0100
[KARAF-7654] Upgrade to redisson 3.19.1
---
appender/redis/pom.xml | 7 ++++++-
assembly/src/main/feature/feature.xml | 12 ++++++------
collector/redis/pom.xml | 7 ++++++-
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/appender/redis/pom.xml b/appender/redis/pom.xml
index 362233fe..c47b56cb 100644
--- a/appender/redis/pom.xml
+++ b/appender/redis/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
- <version>3.16.7</version>
+ <version>3.19.1</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.appender</groupId>
@@ -64,6 +64,7 @@
!net.bytebuddy*,
!org.xerial.snappy*,
!reactor*,
+
!org.objenesis*,
com.google.protobuf*;resolution:=optional,
com.jcraft.jzlib;resolution:=optional,
com.ning.compress*;resolution:=optional,
@@ -92,6 +93,9 @@
javax.annotation*;resolution:=optional,
kotlin*;resolution:=optional,
sun*;resolution:=optional,
+
com.sun.jna;resolution:=optional,
+
COM.newmonics*;resolution:=optional,
+
android*;resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -104,6 +108,7 @@
org.xerial.snappy*,
reactor*,
jodd.*,
+
org.objenesis*,
org.apache.karaf.decanter.appender.utils,
org.apache.karaf.decanter.appender.redis
</Private-Package>
diff --git a/assembly/src/main/feature/feature.xml
b/assembly/src/main/feature/feature.xml
index cf9a649d..3d63b503 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -230,9 +230,9 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<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.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>
+ <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>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.redis/${project.version}</bundle>
</feature>
@@ -404,9 +404,9 @@
org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<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.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>
+ <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>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.redis/${project.version}</bundle>
</feature>
diff --git a/collector/redis/pom.xml b/collector/redis/pom.xml
index 854bded7..f0fbe326 100644
--- a/collector/redis/pom.xml
+++ b/collector/redis/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
- <version>3.16.7</version>
+ <version>3.19.1</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
@@ -86,6 +86,7 @@
!net.bytebuddy*,
!org.xerial.snappy*,
!reactor*,
+
!org.objenesis*,
com.google.protobuf*;resolution:=optional,
com.jcraft.jzlib;resolution:=optional,
com.ning.compress*;resolution:=optional,
@@ -114,6 +115,9 @@
javax.annotation*;resolution:=optional,
kotlin*;resolution:=optional,
sun*;resolution:=optional,
+ com.sun.jna;resolution:=optional,
+
COM.newmonics*;resolution:=optional,
+
android*;resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -126,6 +130,7 @@
org.xerial.snappy*,
reactor*,
jodd.*,
+
org.objenesis*,
org.apache.karaf.decanter.collector.redis,
org.apache.karaf.decanter.collector.utils
</Private-Package>
