Update resources to use schema ingest changes

for the application to not start if it doesn't
start properly

Issue-ID: AAI-2329
Change-Id: I2f04282c2faf07de46b4dd6ecf7e494d442bcf87
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 42c1832..ffc10e0 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -36,8 +36,8 @@
         <start-class>org.onap.aai.ResourcesApp</start-class>
 
         <aai.schema.version>1.0.1</aai.schema.version>
-        <aai.core.version>1.4.1</aai.core.version>
-        <aai.schema.ingest.version>1.4.1</aai.schema.ingest.version>
+        <aai.core.version>1.4.2</aai.core.version>
+        <aai.schema.ingest.version>1.4.2</aai.schema.ingest.version>
         <hbase.version>1.0.2</hbase.version>
 
         <spring.boot.version>1.5.19.RELEASE</spring.boot.version>

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index faf07df..517c650 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -77,3 +77,4 @@ schema.service.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore
 schema.service.ssl.trust-store=${server.local.startpath}/etc/auth/aai_keystore
 schema.service.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 schema.service.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
+schema.service.versions.override=false

diff --git a/aai-resources/src/test/java/org/onap/aai/AAISetup.java b/aai-resources/src/test/java/org/onap/aai/AAISetup.java
index a93127b..acef23b 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-resources/src/test/java/org/onap/aai/AAISetup.java
@@ -27,6 +27,7 @@ import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
+import org.onap.aai.config.ConfigConfiguration;
 import org.onap.aai.config.SpringContextAware;
 import org.onap.aai.config.IntrospectionConfig;
 import org.onap.aai.introspection.LoaderFactory;
@@ -51,8 +52,7 @@ import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 
 @ContextConfiguration(classes = {
-        SchemaLocationsBean.class,
-        SchemaVersions.class,
+        ConfigConfiguration.class,
         AAIConfigTranslator.class,
         NodeIngestor.class,
         EdgeIngestor.class,