summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/env/pom.xml181
-rw-r--r--misc/log4j/pom.xml174
-rw-r--r--misc/pom.xml182
-rw-r--r--misc/rosetta/pom.xml78
-rw-r--r--misc/xgen/pom.xml168
5 files changed, 386 insertions, 397 deletions
diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index 0a8309da..37020365 100644
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -68,7 +68,7 @@
</roles>
</developer>
</developers>
-
+
<properties>
<jacocoVersion>0.7.6.201602180812</jacocoVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -76,106 +76,103 @@
<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
<enforcer.skip>true</enforcer.skip>
-
+
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
</properties>
-
+
<build>
<plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
<plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
<!-- Jacoco -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <!-- Override OParent version -->
- <version>${jacocoVersion}</version>
- <executions>
- <!-- disable jacoco executions from oparent -->
- <execution>
- <id>pre-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>pre-integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-integration-test</id>
- <phase>none</phase>
- </execution>
- <!-- Order matters -->
- <execution>
- <id>portal-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <!-- offline instrumentation for PowerMock -->
- <execution>
- <id>portal-offline-instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-restore-instrumented-classes</id>
- <phase>test</phase>
- <goals>
- <goal>restore-instrumented-classes</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
- </build>
-
+</build>
+
<dependencies>
<dependency>
<groupId>log4j</groupId>
@@ -183,8 +180,8 @@
<scope>compile</scope> <!-- Provides scope only, in case other users prefer another Logging Implementation -->
</dependency>
</dependencies>
-
-
+
+
<distributionManagement>
<repository>
<id>ecomp-releases</id>
diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index 98df9d0d..b7f19602 100644
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -68,7 +68,7 @@
</roles>
</developer>
</developers>
-
+
<properties>
<jacocoVersion>0.7.6.201602180812</jacocoVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -76,14 +76,14 @@
<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
<enforcer.skip>true</enforcer.skip>
-
+
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
@@ -104,92 +104,90 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>
- <!-- Jacoco -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <!-- Override OParent version -->
- <version>${jacocoVersion}</version>
- <executions>
- <!-- disable jacoco executions from oparent -->
- <execution>
- <id>pre-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>pre-integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-integration-test</id>
- <phase>none</phase>
- </execution>
- <!-- Order matters -->
- <execution>
- <id>portal-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <!-- offline instrumentation for PowerMock -->
- <execution>
- <id>portal-offline-instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-restore-instrumented-classes</id>
- <phase>test</phase>
- <goals>
- <goal>restore-instrumented-classes</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+ <!-- Jacoco -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/misc/pom.xml b/misc/pom.xml
index d5773146..fc27550f 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -27,8 +27,8 @@
<name>AAF Misc Parent</name>
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <parent>
+
+ <parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<version>1.1.0</version>
@@ -41,7 +41,7 @@
<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
<enforcer.skip>true</enforcer.skip>
-
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powermock.version>1.5.1</powermock.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -51,7 +51,7 @@
<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
</properties>
-
+
<developers>
<developer>
@@ -114,7 +114,7 @@
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -129,7 +129,7 @@
<outputDirectory>target</outputDirectory>
</configuration>
</plugin>
-
+
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
@@ -141,92 +141,90 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>
- <!-- Jacoco -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <!-- Override OParent version -->
- <version>${jacocoVersion}</version>
- <executions>
- <!-- disable jacoco executions from oparent -->
- <execution>
- <id>pre-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>pre-integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-integration-test</id>
- <phase>none</phase>
- </execution>
- <!-- Order matters -->
- <execution>
- <id>portal-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <!-- offline instrumentation for PowerMock -->
- <execution>
- <id>portal-offline-instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-restore-instrumented-classes</id>
- <phase>test</phase>
- <goals>
- <goal>restore-instrumented-classes</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+ <!-- Jacoco -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -252,7 +250,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<distributionManagement>
<repository>
<id>ecomp-releases</id>
diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index 8178a75b..5bebf561 100644
--- a/misc/rosetta/pom.xml
+++ b/misc/rosetta/pom.xml
@@ -76,14 +76,14 @@
<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
<enforcer.skip>true</enforcer.skip>
-
+
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
@@ -119,69 +119,67 @@
<stagingProfileId>176c31dfe190a</stagingProfileId>
<serverId>ecomp-staging</serverId>
</configuration>
- </plugin>
+ </plugin>
<plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>
- <!-- Jacoco -->
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+ <!-- Jacoco -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <!-- Override OParent version -->
- <version>${jacocoVersion}</version>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ </excludes>
+ </configuration>
<executions>
- <!-- disable jacoco executions from oparent -->
<execution>
<id>pre-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>pre-integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-integration-test</id>
- <phase>none</phase>
- </execution>
- <!-- Order matters -->
- <execution>
- <id>portal-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
</configuration>
</execution>
- <!-- offline instrumentation for PowerMock -->
<execution>
- <id>portal-offline-instrument</id>
+ <id>post-unit-test</id>
+ <phase>test</phase>
<goals>
- <goal>instrument</goal>
+ <goal>report</goal>
</goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
</execution>
<execution>
- <id>portal-restore-instrumented-classes</id>
- <phase>test</phase>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
<goals>
- <goal>restore-instrumented-classes</goal>
+ <goal>prepare-agent</goal>
</goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
</execution>
<execution>
- <id>portal-post-unit-test</id>
- <phase>test</phase>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
</configuration>
</execution>
</executions>
@@ -216,5 +214,5 @@
<url>dav:${nexusproxy}${sitePath}</url>
</site>
</distributionManagement>
-
+
</project>
diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index a3bceb10..08b4e1a4 100644
--- a/misc/xgen/pom.xml
+++ b/misc/xgen/pom.xml
@@ -94,94 +94,92 @@
<build>
<plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
<plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>
-
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+
<!-- Jacoco -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <!-- Override OParent version -->
- <version>${jacocoVersion}</version>
- <executions>
- <!-- disable jacoco executions from oparent -->
- <execution>
- <id>pre-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>pre-integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>post-integration-test</id>
- <phase>none</phase>
- </execution>
- <!-- Order matters -->
- <execution>
- <id>portal-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <!-- offline instrumentation for PowerMock -->
- <execution>
- <id>portal-offline-instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-restore-instrumented-classes</id>
- <phase>test</phase>
- <goals>
- <goal>restore-instrumented-classes</goal>
- </goals>
- </execution>
- <execution>
- <id>portal-post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>