Merge "Hibernate db fix"

[portal.git] / ecomp-portal-widget-ms / pom.xml

diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml
index 03e8942..d8b3330 100644 (file)
--- a/ecomp-portal-widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/pom.xml
@@ -6,64 +6,32 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>1.3.0</version>
+               <version>2.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>widget-ms-parent</artifactId>
        <packaging>pom</packaging>
 
-       <modules>
-               <module>common-widgets</module>
-               <!-- The widget-ms module uses Spring; it cannot name this parent. -->
-               <module>widget-ms</module>
-       </modules>
+        <modules>
+                <!-- Child modules do NOT name this parent. -->
+                <!-- Defined for build convenience only! -->
+                <!-- This POM names only ONAP projects -->      
+                <module>common-widgets</module>
+                <module>widget-ms</module>     
+        </modules>
 
-       <build>
-               <plugins>
-                       <!-- No deployment step for this project -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.8</version>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                               <inherited>True</inherited>
-                               <executions>
-                                       <!-- Unit-Tests -->
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>report</id>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+     <build>
+        <plugins>
+               <!-- No deployment step for this project -->
+               <plugin>
+                       <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-deploy-plugin</artifactId>
+                       <version>2.8</version>
+                       <configuration>
+                               <skip>true</skip>
+                       </configuration>
+               </plugin>
+        </plugins>
+     </build>
 
 </project>