diff options
| -rw-r--r-- | mod/runtimeapi/Changelog.md | 3 | ||||
| -rw-r--r-- | mod/runtimeapi/pom.xml | 205 | ||||
| -rw-r--r-- | mod/runtimeapi/runtime-core/pom.xml | 19 | ||||
| -rw-r--r-- | mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java | 5 | ||||
| -rw-r--r-- | mod/runtimeapi/runtime-web/pom.xml | 272 |
5 files changed, 253 insertions, 251 deletions
diff --git a/mod/runtimeapi/Changelog.md b/mod/runtimeapi/Changelog.md index 3dd643c..597eda4 100644 --- a/mod/runtimeapi/Changelog.md +++ b/mod/runtimeapi/Changelog.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.2.4] - 2022-02-10 + - [DCAEGEN2-3077][DCAEGEN2-3028] Address NFE issue due to integer type restriction + ## [1.2.3] - Update BPGenerator 1.7.3 - Update default k8splugin import diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml index 11e5580..0cb4ba3 100644 --- a/mod/runtimeapi/pom.xml +++ b/mod/runtimeapi/pom.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= -Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. -================================================================================ -Modifications Copyright (c) 2020 Nokia +Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved. +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,107 +18,107 @@ 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> - <packaging>pom</packaging> - <modules> - <module>runtime-core</module> - <module>runtime-web</module> - </modules> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> - </parent> - <groupId>org.onap.dcaegen2.platform.mod</groupId> - <artifactId>runtimeapi</artifactId> - <version>1.2.3</version> - <name>dcaegen2-platform-mod-runtimeapi</name> - <description>MOD Runtime API</description> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> - <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> - </properties> - <profiles> - <profile> - <id>java11</id> - <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - <maven.compiler.release>11</maven.compiler.release> - </properties> - <activation> - <property> - <name>m2e.version</name> - </property> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - <profile> - <id>java8</id> - <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - </properties> - </profile> - </profiles> + 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> + <packaging>pom</packaging> + <modules> + <module>runtime-core</module> + <module>runtime-web</module> + </modules> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.onap.dcaegen2.platform.mod</groupId> + <artifactId>runtimeapi</artifactId> + <version>1.2.4</version> + <name>dcaegen2-platform-mod-runtimeapi</name> + <description>MOD Runtime API</description> + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + </sonar.coverage.jacoco.xmlReportPaths> + </properties> + <profiles> + <profile> + <id>java11</id> + <properties> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.release>11</maven.compiler.release> + </properties> + <activation> + <property> + <name>m2e.version</name> + </property> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>java8</id> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + </profile> + </profiles> - <build> - <plugins> - <!-- support sonar in multi-module project --> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.6.0.1398</version> - </plugin> + <build> + <plugins> + <!-- support sonar in multi-module project --> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.6.0.1398</version> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> - <executions> - <execution> - <id>enforce-no-snapshots</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireReleaseDeps> - <message>No Snapshots Allowed!</message> - </requireReleaseDeps> - </rules> - <fail>false</fail> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.4.1</version> + <executions> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <message>No Snapshots Allowed!</message> + </requireReleaseDeps> + </rules> + <fail>false</fail> + </configuration> + </execution> + </executions> + </plugin> - </plugins> - </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>2.1.7.RELEASE</version> - <type>pom</type> - <scope>import</scope> - <exclusions> - <exclusion> - <groupId>org.springframework.plugin</groupId> - <artifactId>spring-plugin-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.plugin</groupId> - <artifactId>spring-plugin-core</artifactId> - <version>2.0.0.RELEASE</version> - </dependency> - </dependencies> - </dependencyManagement> + </plugins> + </build> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>2.1.7.RELEASE</version> + <type>pom</type> + <scope>import</scope> + <exclusions> + <exclusion> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-core</artifactId> + <version>2.0.0.RELEASE</version> + </dependency> + </dependencies> + </dependencyManagement> </project> diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml index 5514cc9..798eb1b 100644 --- a/mod/runtimeapi/runtime-core/pom.xml +++ b/mod/runtimeapi/runtime-core/pom.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= -Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. -================================================================================ -Modifications Copyright (c) 2020 Nokia +Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved. +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. @@ -25,12 +24,12 @@ limitations under the License. <parent> <artifactId>runtimeapi</artifactId> <groupId>org.onap.dcaegen2.platform.mod</groupId> - <version>1.2.3</version> + <version>1.2.4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>runtime-core</artifactId> - <version>1.2.3</version> + <version>1.2.4</version> <dependencies> <dependency> @@ -48,11 +47,11 @@ limitations under the License. <artifactId>blueprint-generator-onap</artifactId> <version>1.7.3</version> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20190722</version> - </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20190722</version> + </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java index 7154cae..d564550 100644 --- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java +++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019,2022 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,8 @@ public class FlowGraphParser { } private static int createBlueprintVersion() { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmm").withZone(ZoneId.of("UTC")); + // Removed year from the text to fix invalid integer issue (DCAEGEN2-3028) + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMddHHmm").withZone(ZoneId.of("UTC")); Instant instant = Instant.now(); String timestamp = formatter.format(instant); return Integer.parseInt(timestamp); diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml index 8b70ea4..b47c0d0 100644 --- a/mod/runtimeapi/runtime-web/pom.xml +++ b/mod/runtimeapi/runtime-web/pom.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= -Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. -================================================================================ -Modifications Copyright (c) 2020 Nokia +Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved. +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,140 +18,141 @@ 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.2.3</version> - </parent> - <artifactId>runtime-web</artifactId> - <version>1.2.3-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.2.3</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.2.4</version> + </parent> + <artifactId>runtime-web</artifactId> + <version>1.2.4-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.2.4</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.json</groupId> - <artifactId>json</artifactId> - <version>20190722</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.json</groupId> + <artifactId>json</artifactId> + <version>20190722</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>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>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> |