From: Dan Timoney <dtimoney@att.com>
Date: Wed, 25 Aug 2021 21:04:12 +0000 (-0400)
Subject: Use version 2.1.8 of parent
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fhonolulu;p=sdnc%2Fapps.git

Use version 2.1.8 of parent

Use version 2.1.8 of parent in order to use APL-licensed version
of liquibase

Issue-ID: CCSDK-3423
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ib98a142646517b03df0dd17aa62df5a166fa9fe4
---

diff --git a/ms/gra/gra-app/pom.xml b/ms/gra/gra-app/pom.xml
index 5ed517c..a7b7976 100644
--- a/ms/gra/gra-app/pom.xml
+++ b/ms/gra/gra-app/pom.xml
@@ -158,7 +158,6 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>4.3.0</version>
         </dependency>
 
         <!-- this jersey jar is needed for rest api call node to function properly -->
diff --git a/ms/gra/gra-app/src/test/resources/application.properties b/ms/gra/gra-app/src/test/resources/application.properties
index 04dd625..f0f87fb 100644
--- a/ms/gra/gra-app/src/test/resources/application.properties
+++ b/ms/gra/gra-app/src/test/resources/application.properties
@@ -19,5 +19,6 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 #spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 spring.jpa.database=derby
+spring.liquibase.change-log=classpath:/db/changelog/db.changelog-test.yaml
 serviceLogicProperties=src/test/resources/svclogic.properties
 serviceLogicDirectory=target/svclogic/graphs/generic-resource-api
diff --git a/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml b/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-test.yaml
similarity index 100%
rename from ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml
rename to ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-test.yaml
diff --git a/ms/gra/pom.xml b/ms/gra/pom.xml
index 8a421db..849eed8 100644
--- a/ms/gra/pom.xml
+++ b/ms/gra/pom.xml
@@ -18,7 +18,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,10 +36,10 @@
     
     <properties>
         <aaf.cadi.version>2.1.21</aaf.cadi.version>
-        <ccsdk.apps.version>1.2.0-SNAPSHOT</ccsdk.apps.version>
+        <ccsdk.apps.version>1.1.2-SNAPSHOT</ccsdk.apps.version>
         <ccsdk.docker.version>1.1-STAGING-latest</ccsdk.docker.version>
-        <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version>
-        <sdnc.oam.version>2.2.0-SNAPSHOT</sdnc.oam.version>
+        <sdnc.northbound.version>2.1.5</sdnc.northbound.version>
+        <sdnc.oam.version>2.1.6</sdnc.oam.version>
         <gratest.mysql.database>testdb</gratest.mysql.database>
         <gratest.mysql.root.password>itsASecret</gratest.mysql.root.password>
         <gratest.mysql.user>testdb</gratest.mysql.user>
diff --git a/ms/pom.xml b/ms/pom.xml
index 059c531..bb66b54 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -18,7 +18,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index c8f6747..c1d2c44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.8</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml
index 176e71a..002daf4 100644
--- a/pomba/network-discovery-api/pom.xml
+++ b/pomba/network-discovery-api/pom.xml
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index 8805c5e..f7c8333 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pomba/pom.xml b/pomba/pom.xml
index dcf7643..0753544 100644
--- a/pomba/pom.xml
+++ b/pomba/pom.xml
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml
index d480119..8b871fb 100644
--- a/pomba/service-decomposition/pom.xml
+++ b/pomba/service-decomposition/pom.xml
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>