diff options
| author |   Igor Dysko <igor1.dysko@orange.com> | 2020-07-08 12:34:14 +0200 |
|---|---|---|
| committer | Igor Dysko <igor1.dysko@orange.com> | 2020-07-08 12:34:14 +0200 |
| commit | 3e7fc2227bd415322184c77a947183723d834792 (patch) | |
| tree | 68fdf6e49506d7dd6937f20156ad17167a539cc4 | |
| parent | 6aec50e7531735d4cb0e5aae3f1482789f8e463c (diff) | |
Update to spring boot 2
Update of code and dependencies, no changes in functionality
Issue-ID: AAI-2970
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: I5802aaefcf31673263c4078bad2a420391391979
| -rw-r--r-- | pom.xml | 33 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 1 |
2 files changed, 15 insertions, 19 deletions
@@ -5,9 +5,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-parent</artifactId> + <version>1.7.0-SNAPSHOT</version> </parent> <groupId>org.onap.aai.graphgraph</groupId> @@ -23,7 +23,6 @@ <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> <java.version>1.8</java.version> - <spring.boot.version>1.5.22.RELEASE</spring.boot.version> <docker.fabric.version>0.23.0</docker.fabric.version> <docker.registry>docker.io</docker.registry> @@ -33,19 +32,13 @@ <graphgraph.startpath>src/main/resources/</graphgraph.startpath> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>${spring.boot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> + <groupId>javax.jms</groupId> + <artifactId>javax.jms-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> @@ -66,17 +59,20 @@ <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-schema-ingest</artifactId> - <version>1.4.3</version> </dependency> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-core</artifactId> - <version>1.4.3</version> + <exclusions> + <exclusion> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-schema-ingest</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> @@ -92,7 +88,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.2</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId> diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4076e38..35c8e39 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,7 @@ # Schema related attributes for the oxm and edges # Any additional schema related attributes should start with prefix schema spring.application.name=graphgraph +spring.main.allow-bean-definition-overriding=true schema.configuration.location=N/A schema.source.name=onap |