Update to spring boot 2guilin

Update of dependencies and source code to spring boot 2

Issue-ID: AAI-3106
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: Ie12c330af37d3cc841913c22a3703bcc3ae8a5d5

4 files changed, 8 insertions, 34 deletions

diff --git a/src/test/resources/data-dictionary/test-data-dictionary-beans.xml b/src/test/resources/data-dictionary/test-data-dictionary-beans.xml
index 78a92f1..4bbb1af 100644
--- a/src/test/resources/data-dictionary/test-data-dictionary-beans.xml
+++ b/src/test/resources/data-dictionary/test-data-dictionary-beans.xml
@@ -18,7 +18,7 @@
         classpath:aai-environment.properties,
         classpath:data-dictionary/validation-service.properties,
         classpath:data-dictionary/validation-service-auth.properties,
-        classpath:data-dictionary/schemaIngest.properties,
+        classpath:schema-ingest.properties,
         classpath:data-dictionary/rule-indexing.properties"
 		ignore-unresolvable="true" />
 
diff --git a/src/test/resources/oxm-reader/oxm-reader-beans.xml b/src/test/resources/oxm-reader/oxm-reader-beans.xml
index 93a2ff7..a85c081 100644
--- a/src/test/resources/oxm-reader/oxm-reader-beans.xml
+++ b/src/test/resources/oxm-reader/oxm-reader-beans.xml
@@ -7,7 +7,7 @@
 
     <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean" />
 
-    <bean id="schemaVersionsBean" class="org.onap.aai.setup.SchemaVersions" />
+    <bean id="schemaConfigVersionsBean" class="org.onap.aai.setup.SchemaConfigVersions" />
 
     <bean id="configTranslator" class="org.onap.aai.setup.AAIConfigTranslator" />
 
diff --git a/src/test/resources/oxm-reader/schemaIngest.properties b/src/test/resources/oxm-reader/schemaIngest.properties
deleted file mode 100644
index 34c8796..0000000
--- a/src/test/resources/oxm-reader/schemaIngest.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# Properties for the org.onap.aai.setup.SchemaLocationsBean
-# Schema related attributes for the oxm and edges
-# Any additional schema related attributes should start with prefix schema
-schema.configuration.location=N/A
-schema.nodes.location=src/test/resources/oxm-reader/single/oxm
-schema.edges.location=src/test/resources/oxm-reader/single/dbedgerules
-
-# Schema Version Related Attributes
-
-# Lists all of the versions in the schema
-schema.version.list=v8,v9,v10
-# Specifies from which version should the depth parameter to default to zero
-schema.version.depth.start=v9
-# Specifies from which version should the related link be displayed in response payload
-schema.version.related.link.start=v10
-# Specifies from which version should the client see only the uri excluding host info
-# Before this version server base will also be included
-schema.version.app.root.start=v10
-# Specifies from which version should the namespace be changed
-schema.version.namespace.change.start=v10
-# Specifies from which version should the client start seeing the edge label in payload
-schema.version.edge.label.start=v10
-# Specifies the version that the application should default to
-schema.version.api.default=v9
-
-schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
-schema.service.nodes.endpoint=nodes?version=
-schema.service.edges.endpoint=edgerules?version=
-schema.service.versions.endpoint=versions
-
-schema.service.ssl.key-store=
-schema.service.ssl.trust-store=
\ No newline at end of file
diff --git a/src/test/resources/data-dictionary/schemaIngest.properties b/src/test/resources/schema-ingest.properties
index 317f478..bdde478 100644
--- a/src/test/resources/data-dictionary/schemaIngest.properties
+++ b/src/test/resources/schema-ingest.properties
@@ -39,4 +39,10 @@ schema.version.edge.label.start=v10
 # Specifies the version that the application should default to
 schema.version.api.default=v9
 
+schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
+schema.service.nodes.endpoint=nodes?version=
+schema.service.edges.endpoint=edgerules?version=
+schema.service.versions.endpoint=versions
 
+schema.service.ssl.key-store=
+schema.service.ssl.trust-store=
\ No newline at end of file