Merge pull request #295 from jbonofre/KARAF-7260
[KARAF-7260] Add included.categories property
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index fac5555..7631034 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -85,6 +85,7 @@
!org.xerial.snappy*,
!net.jpountz*,
!com.fasterxml.jackson*,
+ !org.jose4j*,
!kafka,
com.github.luben.zstd;resolution:=optional,
com.ibm.security.krb5*;resolution:=optional,
@@ -98,6 +99,7 @@
org.xerial.snappy*,
net.jpountz*,
com.fasterxml.jackson*,
+ org.jose4j*,
kafka
</Private-Package>
<_dsannotations>*</_dsannotations>
diff --git a/collector/kafka/pom.xml b/collector/kafka/pom.xml
index b615bbf..26a4654 100644
--- a/collector/kafka/pom.xml
+++ b/collector/kafka/pom.xml
@@ -71,6 +71,7 @@
!org.xerial.snappy*,
!com.fasterxml.jackson*,
!net.jpountz*,
+ !org.jose4j*,
!kafka;
com.github.luben.zstd;resolution:=optional,
com.ibm.security.krb5*;resolution:=optional,
@@ -84,6 +85,7 @@
org.xerial.snappy*,
com.fasterxml.jackson*,
net.jpountz*,
+ org.jose4j*,
kafka
</Private-Package>
<_dsannotations>*</_dsannotations>
diff --git a/pom.xml b/pom.xml
index 44590ad..9b9fedb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<cassandra.driver.version>4.9.0</cassandra.driver.version>
<glassfish-json.version>1.1.4</glassfish-json.version>
<json-api.version>1.1.4</json-api.version>
- <kafka.version>2.8.0</kafka.version>
+ <kafka.version>3.1.0</kafka.version>
<karaf.version>4.2.15</karaf.version>
<kibana.version>3.1.1</kibana.version>
<kibana4.version>4.1.2</kibana4.version>
@@ -135,24 +135,19 @@
<version>${karaf.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.4</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -162,7 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.3</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -179,7 +174,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -211,6 +206,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.9.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -219,6 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.7.0</version>
<executions>
<execution>
<goals>
@@ -235,6 +232,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>5.1.4</version>
<inherited>true</inherited>
<extensions>true</extensions>
<configuration>