From b5adc452acf8f5274db3fa9816ab42347a9274fb Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 20 Feb 2020 13:53:41 -0500
Subject: Refactoring parent root poms

Updating protobuf and grpc version

Issue-ID: CCSDK-2107
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I09fa6f600cf74b5d8049d195b67c889af7d9ca9d
---
 springboot/spring-boot-setup/src/main/resources/pom-template.xml | 3 +--
 springboot/springboot1/pom.xml                                   | 3 +--
 springboot/springboot2/pom.xml                                   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'springboot')

diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index e55d097b..7f757751 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -123,7 +123,6 @@
         <grpc.version>1.25.0</grpc.version>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
-        <atomix.version>3.1.5</atomix.version>
         <jersey.version>2.25.1</jersey.version>
         <jersey.client.version>2.25.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
@@ -131,7 +130,7 @@
         <mariadb.connector.version>2.4.4</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <testng.version>6.11</testng.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 066c9dab..2e3e002e 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -123,7 +123,6 @@
         <grpc.version>1.25.0</grpc.version>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
-        <atomix.version>3.1.5</atomix.version>
         <jersey.version>2.25.1</jersey.version>
         <jersey.client.version>2.25.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
@@ -131,7 +130,7 @@
         <mariadb.connector.version>2.4.4</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <testng.version>6.11</testng.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 662b3a9b..312732f8 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -123,7 +123,6 @@
         <grpc.version>1.25.0</grpc.version>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
-        <atomix.version>3.1.5</atomix.version>
         <jersey.version>2.25.1</jersey.version>
         <jersey.client.version>2.25.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
@@ -131,7 +130,7 @@
         <mariadb.connector.version>2.4.4</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <testng.version>6.11</testng.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
-- 
cgit 1.2.3-korg