Repair widget-ms problem; adjust sonar in poms

[portal.git] / ecomp-portal-BE-os / pom.xml

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index ab9efd8..473d0ee 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.3.0</version>
        </parent>
 
        <artifactId>ecompportal-be-os</artifactId>
@@ -22,11 +22,6 @@
                <finalName>${project.artifactId}</finalName>
 
                <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>sonar-maven-plugin</artifactId>
-                               <version>3.2</version>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
@@ -39,73 +34,6 @@
                                        </dependency>
                                </dependencies>
                        </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <inherited>True</inherited>
-                               <executions>
-                                       <!-- Unit-Tests -->
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>default-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>default-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <!-- Will see build errors while running the test cases because of dual 
-                                               instrumentation -->
-
-                                       <!-- Integration Tests (Only report goal) -->
-                                       <execution>
-                                               <id>report-integration</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report-integration</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <dataFile>${sonar.jacoco.itReportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
@@ -359,7 +287,6 @@
                        <artifactId>jstl</artifactId>
                        <version>1.2</version>
                </dependency>
-
                <!-- Apache Tiles -->
                <dependency>
                        <groupId>org.apache.tiles</groupId>
@@ -680,6 +607,13 @@
                        <artifactId>aspectjweaver</artifactId>
                        <version>1.8.9</version>
                </dependency>
+               <!-- Jacoco for offline instrumentation -->
+               <dependency>
+                       <groupId>org.jacoco</groupId>
+                       <artifactId>org.jacoco.agent</artifactId>
+                       <version>${jacocoVersion}</version>
+                       <classifier>runtime</classifier>
+               </dependency>
        </dependencies>
 
        <reporting>