Code Review
/
multicloud
/
framework.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update css file name in conf.py
[multicloud/framework.git]
/
artifactbroker
/
pom.xml
diff --git
a/artifactbroker/pom.xml
b/artifactbroker/pom.xml
index
6373a31
..
67be674
100644
(file)
--- a/
artifactbroker/pom.xml
+++ b/
artifactbroker/pom.xml
@@
-12,18
+12,17
@@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-->
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-->
-<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">
+
+<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">
<parent>
<groupId>org.onap.multicloud.framework</groupId>
<artifactId>multicloud-framework</artifactId>
<parent>
<groupId>org.onap.multicloud.framework</groupId>
<artifactId>multicloud-framework</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath />
+ <version>1.5.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.onap.multicloud.framework</groupId>
<artifactId>multicloud-framework-artifactbroker</artifactId>
<artifactId>multicloud-framework-artifactbroker</artifactId>
- <version>1.
3.0
-SNAPSHOT</version>
+ <version>1.
5.2
-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-framework-artifactbroker</name>
<description>artifact broker</description>
<packaging>pom</packaging>
<name>multicloud-framework-artifactbroker</name>
<description>artifact broker</description>
@@
-34,8
+33,12
@@
<nexusproxy>https://nexus.onap.org</nexusproxy>
<version.logback>1.2.3</version.logback>
<policy.common.version>1.3.4</policy.common.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<version.logback>1.2.3</version.logback>
<policy.common.version>1.3.4</policy.common.version>
+ <policy.engine.version>1.3.5</policy.engine.version>
+ <sonar.language>java</sonar.language>
+ <sonar.coverage.jacoco.xmlReportPaths>
+ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+ </sonar.coverage.jacoco.xmlReportPaths>
</properties>
</properties>
-
<modules>
<module>model</module>
<module>main</module>
<modules>
<module>model</module>
<module>main</module>
@@
-86,13
+89,11
@@
<artifactId>capabilities</artifactId>
<version>${policy.common.version}</version>
</dependency>
<artifactId>capabilities</artifactId>
<version>${policy.common.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.8</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.json/json -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@
-129,7
+130,6
@@
<version>2.8.4</version>
</dependency>
</dependencies>
<version>2.8.4</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
@@
-142,7
+142,7
@@
<goal>prepare-agent</goal>
</goals>
<configuration>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <destFile>${sonar.
jacoco.reportPath
}</destFile>
+ <destFile>${sonar.
coverage.jacoco.xmlReportPaths
}</destFile>
<append>true</append>
</configuration>
</execution>
<append>true</append>
</configuration>
</execution>
@@
-153,7
+153,7
@@
<goal>report</goal>
</goals>
<configuration>
<goal>report</goal>
</goals>
<configuration>
- <dataFile>${sonar.
jacoco.reportPath
}</dataFile>
+ <dataFile>${sonar.
coverage.jacoco.xmlReportPaths
}</dataFile>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
@@
-168,11
+168,7
@@
</goals>
<phase>process-sources</phase>
<configuration>
</goals>
<phase>process-sources</phase>
<configuration>
- <!-- Use Google Java Style Guide:
- https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
@@
-181,7
+177,7
@@
</excludes>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
</excludes>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
- <violationSeverity>
warning
</violationSeverity>
+ <violationSeverity>
error
</violationSeverity>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
@@
-202,8
+198,6
@@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<configuration>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<configuration>
- <!-- Note: This exclusion list should match <sonar.exclusions> property
- above -->
<excludes>
<exclude>**/gen/**</exclude>
<exclude>**/generated-sources/**</exclude>
<excludes>
<exclude>**/gen/**</exclude>
<exclude>**/generated-sources/**</exclude>
@@
-212,19
+206,15
@@
</excludes>
</configuration>
<executions>
</excludes>
</configuration>
<executions>
- <!-- Prepares the property pointing to the JaCoCo runtime agent which
- is passed as VM argument when Maven the Surefire plugin is executed. -->
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <destFile>${sonar.
jacoco.reportPath
}</destFile>
+ <destFile>${sonar.
coverage.jacoco.xmlReportPaths
}</destFile>
</configuration>
</execution>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for unit tests is created
- after unit tests have been run. -->
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
@@
-232,7
+222,7
@@
<goal>report</goal>
</goals>
<configuration>
<goal>report</goal>
</goals>
<configuration>
- <dataFile>${sonar.
jacoco.reportPath
}</dataFile>
+ <dataFile>${sonar.
coverage.jacoco.xmlReportPaths
}</dataFile>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
@@
-241,4
+231,3
@@
</pluginManagement>
</build>
</project>
</pluginManagement>
</build>
</project>
-</project>