diff options
| author |   Igor Dysko <igor1.dysko@orange.com> | 2020-06-27 23:42:28 +0200 |
|---|---|---|
| committer | Igor Dysko <igor1.dysko@orange.com> | 2020-07-06 14:46:52 +0200 |
| commit | 37a8cab63cef498490f50c0b0262bf0696cabf85 (patch) | |
| tree | c09ac4528d76546ea21d3ddaa70e06fb0f07dcf2 /aai-schema-gen | |
| parent | 95dadba8706ede75a0b39127b40b6430031fa1d3 (diff) | |
Update to spring boot 2
Update of code and dependencies, no changes in functionality
Issue-ID: AAI-2529
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: Ia43601c2990a67c0e8afefa1d54c53d7e606b886
Diffstat (limited to 'aai-schema-gen')
| -rw-r--r-- | aai-schema-gen/pom.xml | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml index 54fe4c4..3580a71 100644 --- a/aai-schema-gen/pom.xml +++ b/aai-schema-gen/pom.xml @@ -49,7 +49,7 @@ <schema.version.edge.label.start>v12</schema.version.edge.label.start> <schema.version.api.default>v19</schema.version.api.default> <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20</schema.version.list> - <springframework.version>4.3.18.RELEASE</springframework.version> + <!-- End of Default ONAP Schema Properties --> </properties> <profiles> @@ -70,7 +70,6 @@ <schema.version.api.default>v15</schema.version.api.default> <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19</schema.version.list> <gendoc.version>v16</gendoc.version> - <springframework.version>4.3.18.RELEASE</springframework.version> </properties> </profile> <!-- End of ONAP profile --> @@ -601,43 +600,32 @@ </profile> </profiles> - <dependencyManagement> - <dependencies> + <dependencies> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>${springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>${springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>${springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>${springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>${springframework.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>${springframework.version}</version> <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -655,6 +643,28 @@ <artifactId>aai-schema-ingest</artifactId> <version>1.4.0</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.freemarker</groupId> |