Merge "Update to version 2.6.1 of parent pom"
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 8eea86a..fa97927 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -95,7 +95,7 @@
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
@@ -136,10 +136,10 @@
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
@@ -160,11 +160,11 @@
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20201115</version>
- </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20201115</version>
+ </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
@@ -218,6 +218,12 @@
<artifactId>error_prone_annotations</artifactId>
<version>2.19.1</version>
</dependency>
+ <!-- Kafka Dependency -->
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>3.0.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml
index a7ca5cc..6b29e7a 100644
--- a/opendaylight/argon/argon-alpine/pom.xml
+++ b/opendaylight/argon/argon-alpine/pom.xml
@@ -20,7 +20,7 @@
<properties>
<image.name>onap/ccsdk-odl-argon-alpine-image</image.name>
<odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
- <odl.shiro.version>0.16.6</odl.shiro.version>
+ <odl.shiro.version>0.17.8</odl.shiro.version>
</properties>
<build>