aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorsg481n <sg481n@att.com>2017-09-23 03:02:43 +0000
committersg481n <sg481n@att.com>2017-09-23 03:31:45 +0000
commit3d214738cb270d8c4f0919ec26063dc1f123ca9e (patch)
tree9369be1b364f23bf82f100a9490cb452916003bd /pom.xml
parentd9cf4f36f75d676be846dd667c6840f65f1745df (diff)
Update License & modify properties in aaf/cadi
Updated license file & sitepath modified and O-parent latest added to parent pom of aaf/cadi,Javadocs plugin version added & duplicate staging plugin removed. Issue-id: AAF-59 Change-Id: Ia52c18b6c42445e3b858476dcb0b029c681c121e Signed-off-by: sg481n <sg481n@att.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml112
1 files changed, 70 insertions, 42 deletions
diff --git a/pom.xml b/pom.xml
index bd918f2..3d9bcca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,13 @@
<organizationUrl></organizationUrl>
</developer>
</developers>
+
+ <parent>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>0.1.1</version>
+ </parent>
+
<properties>
<skipSigning>true</skipSigning>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,6 +66,13 @@
<!-- jetty-version>7.2.0.v20101020</jetty-version -->
<!-- project.jettyVersion>9.0.3.v20130506</project.jettyVersion -->
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
+ <sonar.language>java</sonar.language>
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -320,18 +334,7 @@
</configuration>
</plugin>
-
-
- <!-- Define the javadoc plugin -->
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <excludePackageNames>org.opendaylight.*</excludePackageNames>
- </configuration>
- </plugin> -->
-
+
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
@@ -361,10 +364,11 @@
<version>2.10</version>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
+ <version>2.10.4</version>
+ <configuration>
<failOnError>false</failOnError>
</configuration>
<executions>
@@ -449,6 +453,58 @@
<serverId>ecomp-staging</serverId>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.7.201606060606</version>
+ <configuration>
+ <dumpOnExit>true</dumpOnExit>
+ <includes>
+ <include>org.onap.aaf.*</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+ <!-- <append>true</append> -->
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+ <!-- <append>true</append> -->
+ </configuration>
+ </execution>
+ <execution>
+ <goals>
+ <goal>merge</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <fileSets>
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+ <directory>${project.build.directory}/coverage-reports</directory>
+ <includes>
+ <include>*.exec</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<distributionManagement>
@@ -467,32 +523,4 @@
<url>dav:${nexusproxy}${sitePath}</url>
</site>
</distributionManagement>
-<pluginRepositories>
- <pluginRepository>
- <id>onap-plugin-snapshots</id>
- <url>https://nexus.onap.org/content/repositories/snapshots/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <repositories>
- <repository>
- <id>central</id>
- <name>Maven 2 repository 2</name>
- <url>http://repo2.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>onap-jar-snapshots</id>
- <url>https://nexus.onap.org/content/repositories/snapshots</url>
- </repository>
- <repository>
- <id>spring-repo</id>
- <name>Spring repo</name>
- <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
- </repository>
- <repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
- </repositories>
</project>