From b1b9c418690c09e4ce647cead99afb10a989420c Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Sun, 7 Apr 2019 19:01:07 -0400 Subject: 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) --- aai-resources/pom.xml | 4 ++-- aai-resources/src/main/resources/application.properties | 1 + aai-resources/src/test/java/org/onap/aai/AAISetup.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 42c1832..ffc10e0 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -36,8 +36,8 @@ org.onap.aai.ResourcesApp 1.0.1 - 1.4.1 - 1.4.1 + 1.4.2 + 1.4.2 1.0.2 1.5.19.RELEASE diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index faf07df..517c650 100644 --- 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 --- 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, -- cgit 1.2.3-korg