summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2019-04-09 21:04:30 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-09 21:04:30 +0000
commitff3d7893be5cbc83eb1cd3ea2e85b309d799a7fd (patch)
treec63a28a273c875419a92414c571cb3baf688dd09
parentfc5f58e1652c556b608464b3910e50f0db0e8125 (diff)
parentb1b9c418690c09e4ce647cead99afb10a989420c (diff)
Merge "Update resources to use schema ingest changes"
-rw-r--r--aai-resources/pom.xml4
-rw-r--r--aai-resources/src/main/resources/application.properties1
-rw-r--r--aai-resources/src/test/java/org/onap/aai/AAISetup.java4
3 files changed, 5 insertions, 4 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index e0b7e1d..320b6ee 100644
--- 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.20.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
--- 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,