diff options
| -rw-r--r-- | components/parent/pom.xml | 2 | ||||
| -rw-r--r-- | components/pom.xml | 3 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/functions/pom.xml | 4 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/modules/pom.xml | 2 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/pom.xml | 6 | ||||
| -rw-r--r-- | ms/controllerblueprints/pom.xml | 1 | ||||
| -rw-r--r-- | ms/neng/pom.xml | 1 | ||||
| -rw-r--r-- | ms/pom.xml | 10 | ||||
| -rw-r--r-- | ms/vlantag-api/pom.xml | 2 | ||||
| -rw-r--r-- | ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java | 5 | ||||
| -rwxr-xr-x | pom.xml | 30 |
11 files changed, 46 insertions, 20 deletions
diff --git a/components/parent/pom.xml b/components/parent/pom.xml index 1330279e..2307a0dc 100644 --- a/components/parent/pom.xml +++ b/components/parent/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.onap.ccsdk.apps.components</groupId> <artifactId>parent</artifactId> - <name>App Components Parent</name> + <name>Components Parent</name> <packaging>pom</packaging> <properties> <spring.boot.version>2.1.1.RELEASE</spring.boot.version> diff --git a/components/pom.xml b/components/pom.xml index 181a7810..6a2aa31d 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -23,9 +23,8 @@ <version>0.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.ccsdk.apps</groupId> <artifactId>components</artifactId> - <name>App Components Root</name> + <name>Components Root</name> <packaging>pom</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index e4f8c844..6a560be2 100644 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -27,8 +27,8 @@ <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <artifactId>functions</artifactId> - <name>Blueprints Processor Functions POM</name> - <description>Blueprints Processor Functions POM</description> + <name>Blueprints Processor Functions</name> + <description>Blueprints Processor Functions</description> <modules> <module>resource-resolution</module> <module>python-executor</module> diff --git a/ms/blueprintsprocessor/modules/pom.xml b/ms/blueprintsprocessor/modules/pom.xml index 0230cd7e..f0de54f5 100644 --- a/ms/blueprintsprocessor/modules/pom.xml +++ b/ms/blueprintsprocessor/modules/pom.xml @@ -28,7 +28,7 @@ <artifactId>modules</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Modules POM</name> + <name>Blueprints Processor Modules</name> <description>Blueprints Processor Modules</description> <modules> diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml index 4e119b77..c6840b4a 100644 --- a/ms/blueprintsprocessor/pom.xml +++ b/ms/blueprintsprocessor/pom.xml @@ -20,13 +20,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.apps</groupId> - <artifactId>ccsdk-apps</artifactId> + <artifactId>ccsdk-apps-ms</artifactId> <version>0.4.0-SNAPSHOT</version> </parent> <artifactId>blueprintsprocessor</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor POM</name> - <description>Blueprints Processor POM</description> + <name>Blueprints Processor Root</name> + <description>Blueprints Processor Root</description> <properties> <service.name>BlueprintsProcessor</service.name> diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml index 4517f3f3..aeff4db9 100644 --- a/ms/controllerblueprints/pom.xml +++ b/ms/controllerblueprints/pom.xml @@ -23,7 +23,6 @@ <version>0.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.ccsdk.apps</groupId> <artifactId>controllerblueprints</artifactId> <name>Controller Blueprints Root</name> <version>0.4.0-SNAPSHOT</version> diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index b212ebeb..16681591 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -25,6 +25,7 @@ <groupId>org.onap.ccsdk.apps</groupId> <artifactId>ccsdk-apps-ms-neng</artifactId> <version>0.4.0-SNAPSHOT</version> + <name>Naming Generation</name> <properties> <swagger.directory>${basedir}/target/classes/META-INF/resources/swagger</swagger.directory> @@ -24,18 +24,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.apps</groupId> + <artifactId>ccsdk-apps</artifactId> + <version>0.4.0-SNAPSHOT</version> </parent> - <groupId>org.onap.ccsdk.apps</groupId> <artifactId>ccsdk-apps-ms</artifactId> <version>0.4.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-apps-ms</name> + <name>Micro-services Root</name> <description>Micro-services</description> <modules> diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml index de5e97a7..402772ac 100644 --- a/ms/vlantag-api/pom.xml +++ b/ms/vlantag-api/pom.xml @@ -9,7 +9,7 @@ <version>0.4.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>vlantag-api</name> + <name>Vlantag API</name> <description>Vlantag Api Service for Vlantag management of VNFs</description> <properties> diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java index 93f8a21e..abc18c5f 100644 --- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java +++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java @@ -1,6 +1,6 @@ /*******************************************************************************
* Copyright © 2017-2018 AT&T Intellectual Property.
- *
+ * Modifications Copyright (C) 2018 IBM.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -192,7 +192,7 @@ public class VlantagApiServiceImpl implements VlantagApiService { * so it will ignore the current range min-max in the policy. Persist in the DB
* if available else Fail.
*/
- if (element.getOverwrite() != null && element.getOverwrite().equalsIgnoreCase("TRUE")) {
+ if (element.getOverwrite() != null && "TRUE".equalsIgnoreCase(element.getOverwrite())) {
Range range = new Range();
range.min = Integer.parseInt(resourceValue);
rangeList.add(range);
@@ -223,6 +223,7 @@ public class VlantagApiServiceImpl implements VlantagApiService { return resourceValues[i].trim();
}
} catch (IndexOutOfBoundsException e) {
+ log.error("Exception : " + e.getMessage(), e);
throw new VlantagApiException("No Matching Resource Value found from Recipe : \""
+ model.getResourceResolutionRecipe() + "\" for Vlantag Name : " + element.getVlantagName());
}
@@ -21,18 +21,45 @@ <name>ONAP</name> </organization> + <properties> + <!--Don't set any language to let sonar enable multi-language support--> + <sonar.language/> + <!--Provide src/main as source path so both src/main/java and src/main/kotlin are scanned--> + <sonar.sources>src/main</sonar.sources> + <!--Provide src/test as source path for test so both src/test/java and src/test/kotlin are scanned--> + <sonar.tests>src/test</sonar.tests> + <!--Only include java and kt files to the scan--> + <sonar.inclusions>**/*.java,**/*.kt</sonar.inclusions> + <!--Specify path to load jacoco XLM report, as Sonar can't load Kotlin coverage from binary report. + Note: coverage for now is invalid and is failing to load because of: + "Cannot import coverage information for file '{file}', coverage data is invalid." + see https://github.com/jacoco/jacoco/issues/763 + That issue has been fixed in 0.8.3 but haven't yet been release. --> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + </properties> + <modules> <module>components</module> <module>ms</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <!--Change version to 0.8.3 when released--> + <version>${jacoco.version}</version> + </plugin> + </plugins> + </build> + <scm> <connection>scm:git:ssh://git@${onap.git.host}/apps.git</connection> <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/apps.git</developerConnection> <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/apps/browse</url> </scm> - <profiles> <profile> <id>blackduck</id> @@ -71,4 +98,5 @@ </profile> </profiles> + </project> |