diff options
| author |   Sneha Dantkale <Sneha.dantkale@amdocs.com> | 2020-02-14 19:15:02 +0530 |
|---|---|---|
| committer |   Forsyth, James (jf2512) <jf2512@att.com> | 2020-02-14 17:05:45 -0500 |
| commit | 48960e6033145667366bbcd2f8ad1ae44c2fd260 (patch) | |
| tree | e75e7d852ee672412422c4fae2689c804174796b /aai-schema-ingest | |
| parent | 54290b7443eb6f15c271031a6eef2f3e51c2f261 (diff) | |
[AAI-2528] | Update to spring-boot 2.1.6.RELEASE
Issue-ID: AAI-2528
Change-Id: I87756450c12538af3f21e4affa24ef76724d232c
Signed-off-by: Sneha Dantkale <Sneha.dantkale@amdocs.com>
Change-Id: I9437899ba1c7f2aec816a8076c954b080f9512fb
Signed-off-by: Sneha Dantkale <Sneha.dantkale@amdocs.com>
Change-Id: If3ad26f98c815e4872320b2652cf6c2e0b675de0
Signed-off-by: Sneha Dantkale <Sneha.dantkale@amdocs.com>
Diffstat (limited to 'aai-schema-ingest')
3 files changed, 4 insertions, 2 deletions
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index d5e20ea6..1717ad41 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> + <version>1.6.6-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-schema-ingest</artifactId> diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java index cdd87492..245dce97 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java @@ -44,7 +44,7 @@ public class SchemaServiceConfiguration { return schemaVersionsBean().getSchemaVersions(); } - @Bean(name = "schemaVersions") + @Bean(name = "schemaVersions2") public SchemaVersions schemaVersions() { return schemaServiceVersions(); } diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java index af94765f..b7688472 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java @@ -27,10 +27,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:forWiringTests/testUsingPropFileContext.xml"}) +@TestPropertySource(locations="classpath:forWiringTests/schema-ingest-for-xml-test.properties") public class SchemaLocationsBeanXMLSetterWithPropFileTest { @Autowired SchemaLocationsBean bean; |