diff options
| author |   vv770d <vv770d@att.com> | 2022-02-23 17:35:05 +0000 |
|---|---|---|
| committer | Vijay Venkatesh Kumar <vv770d@att.com> | 2022-02-23 23:09:17 +0000 |
| commit | 97d45736bf35452b2358fd5a55acd3b6734c728a (patch) | |
| tree | 586c85a99480ff9e1776070cc4369cad2513b18b | |
| parent | 0fd0e0478f05ebe13754787d951864269f5822ae (diff) | |
[MOD/Runtime] Fix build issues
Change-Id: I2212e4ffe24b8876b7c84d2008671a92ecb6d749
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-3088
Signed-off-by: vv770d <vv770d@att.com>
| -rw-r--r-- | mod/runtimeapi/Changelog.md | 1 | ||||
| -rw-r--r-- | mod/runtimeapi/runtime-web/pom.xml | 264 |
2 files changed, 133 insertions, 132 deletions
diff --git a/mod/runtimeapi/Changelog.md b/mod/runtimeapi/Changelog.md index 9e4f028..b128455 100644 --- a/mod/runtimeapi/Changelog.md +++ b/mod/runtimeapi/Changelog.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [1.3.2] - 2022-01-04 - [DCAEGEN2-3028] Change version format to MMddHHmm (removed YY) - [DCAEGEN2-3008] Update helmgen-core from snapshot to released version +- [DCAEGEN2-3088] Set spring-boot-maven-plugin to 2.6.2 ## [1.3.1] - 2021-10-13 - [DCAEGEN2-2936] Update helmgen-core to 1.0.2 diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml index 3ec589f..af89495 100644 --- a/mod/runtimeapi/runtime-web/pom.xml +++ b/mod/runtimeapi/runtime-web/pom.xml @@ -2,8 +2,7 @@ <!-- ============LICENSE_START======================================================= Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved. -================================================================================ -Modifications Copyright (c) 2020 Nokia +Copyright (c) 2020 Nokia ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,137 +18,138 @@ limitations under the License. ============LICENSE_END========================================================= --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.dcaegen2.platform.mod</groupId> - <artifactId>runtimeapi</artifactId> - <version>1.3.2</version> - </parent> - <artifactId>runtime-web</artifactId> - <version>1.3.2-SNAPSHOT</version> - <packaging>jar</packaging> - <name>runtime-web</name> - <description>MOD Runtime Web Module</description> - <dependencies> - <dependency> - <groupId>org.onap.dcaegen2.platform.mod</groupId> - <artifactId>runtime-core</artifactId> - <version>1.3.2</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>runtimeapi</artifactId> + <version>1.3.2</version> + </parent> + <artifactId>runtime-web</artifactId> + <version>1.3.2-SNAPSHOT</version> + <packaging>jar</packaging> + <name>runtime-web</name> + <description>MOD Runtime Web Module</description> + <dependencies> + <dependency> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>runtime-core</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/com.google.guava/guava --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>28.0-jre</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-boot-starter</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.8</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <scope>runtime</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/com.google.guava/guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>28.0-jre</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-boot-starter</artifactId> + <version>3.0.0</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <version>3.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.8</version> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <verbose>true</verbose> - <pullRegistry>${docker.pull.registry}</pullRegistry> - <pushRegistry>${docker.push.registry}</pushRegistry> - <images> - <image> - <name>onap/${project.groupId}.${project.artifactId}</name> - <registry>${onap.nexus.dockerregistry.daily}</registry> - <build> - <from>openjdk:11-jre-slim</from> - <tags> - <tag>latest</tag> - <tag>${project.version}</tag> - <tag>${project.version}-${maven.build.timestamp}Z</tag> - </tags> - <assembly> - <descriptorRef>artifact</descriptorRef> - </assembly> - <runCmds> - <runCmd>apt-get update && apt-get install -y wget</runCmd> - <runCmd>wget https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz && tar xvf helm-v3.5.4-linux-amd64.tar.gz && mv linux-amd64/helm /usr/local/bin/</runCmd> - <runCmd>groupadd -r dcaemod && useradd -ms /bin/bash dcaemod -g dcaemod && mkdir -p /maven/data && chown -R dcaemod:dcaemod /maven/data</runCmd> - </runCmds> - <workdir>/maven</workdir> - <volumes> - <volume>/tmp</volume> - </volumes> - <ports> - <port>9090</port> - </ports> - <user>dcaemod</user> - <entryPoint> - <exec> - <arg>java</arg> - <arg>-Djava.security.egd=file:/dev/./urandom</arg> - <arg>-jar</arg> - <arg>${project.artifactId}-${project.version}.${project.packaging}</arg> - </exec> - </entryPoint> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>2.6.2</version> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <verbose>true</verbose> + <pullRegistry>${docker.pull.registry}</pullRegistry> + <pushRegistry>${docker.push.registry}</pushRegistry> + <images> + <image> + <name>onap/${project.groupId}.${project.artifactId}</name> + <registry>${onap.nexus.dockerregistry.daily}</registry> + <build> + <from>openjdk:11-jre-slim</from> + <tags> + <tag>latest</tag> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}Z</tag> + </tags> + <assembly> + <descriptorRef>artifact</descriptorRef> + </assembly> + <runCmds> + <runCmd>apt-get update && apt-get install -y wget</runCmd> + <runCmd>wget https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz && tar xvf helm-v3.5.4-linux-amd64.tar.gz && mv linux-amd64/helm /usr/local/bin/</runCmd> + <runCmd>groupadd -r dcaemod && useradd -ms /bin/bash dcaemod -g dcaemod && mkdir -p /maven/data && chown -R dcaemod:dcaemod /maven/data</runCmd> + </runCmds> + <workdir>/maven</workdir> + <volumes> + <volume>/tmp</volume> + </volumes> + <ports> + <port>9090</port> + </ports> + <user>dcaemod</user> + <entryPoint> + <exec> + <arg>java</arg> + <arg>-Djava.security.egd=file:/dev/./urandom</arg> + <arg>-jar</arg> + <arg>${project.artifactId}-${project.version}.${project.packaging}</arg> + </exec> + </entryPoint> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> |