Merge pull request #290 from jbonofre/KARAF-7268
[KARAF-7268] Upgrade to johnzon 1.2.16
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index d75c993..e5ee0b3 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -198,4 +198,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/appender/influxdb/pom.xml b/appender/influxdb/pom.xml
index 1da3708..f43d240 100644
--- a/appender/influxdb/pom.xml
+++ b/appender/influxdb/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
- <version>2.21</version>
+ <version>2.22</version>
</dependency>
</dependencies>
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index 97c4f69..fac5555 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.5.1</version>
+ <version>2.13.1</version>
</dependency>
<!-- test -->
diff --git a/appender/redis/pom.xml b/appender/redis/pom.xml
index 223bcd0..81ccf83 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.2</version>
+ <version>3.16.7</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.appender</groupId>
diff --git a/appender/rest/pom.xml b/appender/rest/pom.xml
index 634692e..a15b9ce 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.4.4</cxf.version>
+ <cxf.version>3.5.0</cxf.version>
</properties>
<dependencies>
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 4d1fdc2..b0b0362 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -229,9 +229,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.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 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>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.redis/${project.version}</bundle>
</feature>
@@ -385,27 +385,27 @@
<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.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 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>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.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 dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.12.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.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.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 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>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.redis/${project.version}</bundle>
</feature>
@@ -437,9 +437,9 @@
<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.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 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>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>
diff --git a/collector/kafka/pom.xml b/collector/kafka/pom.xml
index a383063..b615bbf 100644
--- a/collector/kafka/pom.xml
+++ b/collector/kafka/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.5.1</version>
+ <version>2.13.1</version>
</dependency>
</dependencies>
diff --git a/collector/oshi/pom.xml b/collector/oshi/pom.xml
index d7ac526..137e7d1 100644
--- a/collector/oshi/pom.xml
+++ b/collector/oshi/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
- <version>5.8.2</version>
+ <version>6.1.0</version>
</dependency>
</dependencies>
diff --git a/collector/redis/pom.xml b/collector/redis/pom.xml
index c323f90..d3b34ac 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.2</version>
+ <version>3.16.7</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
diff --git a/collector/rest/pom.xml b/collector/rest/pom.xml
index 28823b5..d2c894c 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.4.4</cxf.version>
+ <cxf.version>3.5.0</cxf.version>
</properties>
<dependencies>
diff --git a/collector/snmp/pom.xml b/collector/snmp/pom.xml
index 03ab4ee..9bf19e6 100644
--- a/collector/snmp/pom.xml
+++ b/collector/snmp/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.snmp4j</groupId>
<artifactId>snmp4j</artifactId>
- <version>2.8.6</version>
+ <version>3.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
@@ -70,6 +70,7 @@
org.snmp4j*
</Private-Package>
<_dsannotations>*</_dsannotations>
+ <_noee>true</_noee>
</instructions>
</configuration>
</plugin>
diff --git a/collector/soap/pom.xml b/collector/soap/pom.xml
index 892a6ed..e3f665d 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.4.4</cxf.version>
+ <cxf.version>3.5.0</cxf.version>
</properties>
<dependencies>
