Merge pull request #203 from jbonofre/KARAF-6938
[KARAF-6938] Upgrade to Apache Kafka 2.6.0
diff --git a/appender/orientdb/pom.xml b/appender/orientdb/pom.xml
index 1bf613b..8890fe5 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.1.0</version>
+ <version>3.1.5</version>
</dependency>
<!-- test -->
@@ -90,6 +90,7 @@
com.kenai.jffi,
jnr*,
com.orientechnologies*,
+ com.ibm.icu*,
com.googlecode.concurrentlinkedhashmap,
net.jpountz.lz4,
net.jpountz.util,
diff --git a/appender/redis/pom.xml b/appender/redis/pom.xml
index 31ce25c..3480a91 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.13.0</version>
+ <version>3.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.appender</groupId>
@@ -101,6 +101,7 @@
net.bytebuddy*,
org.xerial.snappy*,
reactor*,
+ jodd.*,
org.apache.karaf.decanter.appender.utils,
org.apache.karaf.decanter.appender.redis
</Private-Package>
diff --git a/appender/rest/pom.xml b/appender/rest/pom.xml
index 7291b15..78cda2b 100644
--- a/appender/rest/pom.xml
+++ b/appender/rest/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Appender :: REST</name>
<properties>
- <cxf.version>3.3.6</cxf.version>
+ <cxf.version>3.4.1</cxf.version>
</properties>
<dependencies>
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 6484d78..61d72d9 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -213,9 +213,9 @@
<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:com.fasterxml.jackson.core/jackson-core/2.10.5</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.10.5</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.5</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.12.0</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.12.0</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.0</bundle>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.redis/${project.version}</bundle>
</feature>
@@ -363,9 +363,9 @@
<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.10.5</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.10.5</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.5</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.12.0</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.12.0</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.0</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.redis/${project.version}</bundle>
</feature>
@@ -397,6 +397,7 @@
<feature name="decanter-appender-orientdb-core" version="${project.version}" description="Karaf Decanter OrientDB Appender core">
<feature>decanter-common</feature>
<feature>http</feature>
+ <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.orientdb/${project.version}</bundle>
</feature>
diff --git a/collector/log/pom.xml b/collector/log/pom.xml
index 09fc4be..6cb37bb 100644
--- a/collector/log/pom.xml
+++ b/collector/log/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
- <version>1.11.2</version>
+ <version>1.11.7</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
diff --git a/collector/redis/pom.xml b/collector/redis/pom.xml
index ef936cd..8c9ebb8 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.13.0</version>
+ <version>3.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
@@ -123,6 +123,7 @@
net.bytebuddy*,
org.xerial.snappy*,
reactor*,
+ jodd.*,
org.apache.karaf.decanter.collector.redis,
org.apache.karaf.decanter.collector.utils
</Private-Package>
diff --git a/collector/rest/pom.xml b/collector/rest/pom.xml
index dd4b632..6e89180 100644
--- a/collector/rest/pom.xml
+++ b/collector/rest/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Collector :: REST</name>
<properties>
- <cxf.version>3.3.6</cxf.version>
+ <cxf.version>3.4.1</cxf.version>
</properties>
<dependencies>
diff --git a/collector/soap/pom.xml b/collector/soap/pom.xml
index 7dc39a2..8f214ac 100644
--- a/collector/soap/pom.xml
+++ b/collector/soap/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Collector :: SOAP</name>
<properties>
- <cxf.version>3.3.6</cxf.version>
+ <cxf.version>3.4.1</cxf.version>
</properties>
<dependencies>
