Merge "Update oparent and fix nexusiq deps"

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
index 96c6344..b5b878a 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 @Configuration
-@PropertySource("classpath:schemaIngest.properties")
+@PropertySource(value = "classpath:schemaIngest.properties", ignoreResourceNotFound=true)
 @PropertySource(value = "file:${schemaIngestPropLoc}", ignoreResourceNotFound=true)
 public class SchemaLocationsBean {
        /*