Remove oParent and sonar.java.binaries.

[portal.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d8b727d..3f46cef 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,16 +3,16 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
-       <parent>
+       <!--<parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
                <version>0.1.1</version>
                <relativePath />
-       </parent>
-       
+       </parent>-->
+
        <groupId>org.onap.portal</groupId>
        <artifactId>onap-portal-parent</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.3.0</version>
        <packaging>pom</packaging>
        <name>portal</name>
 
@@ -32,7 +32,7 @@
                <hibernate.version>4.3.11.Final</hibernate.version>
                <fasterxml.version>2.7.4</fasterxml.version>
                <eelf.version>1.0.0</eelf.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <encoding>UTF-8</encoding>
                <sonar.language>java</sonar.language>
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -46,12 +46,12 @@
                <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
                <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-               <sonar.java.binaries>.</sonar.java.binaries>
+               <!--<sonar.java.binaries>.</sonar.java.binaries>-->
        </properties>
 
-       <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml files
-               among all developers.  Also use values (not properties) so oparent can be resolved.
-    -->
+       <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
+               files among all developers. Also use values (not properties) so oparent can 
+               be resolved. -->
        <repositories>
                <repository>
                        <id>onap-releases</id>
@@ -74,8 +74,8 @@
                </repository>
        </repositories>
 
-       <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml files
-               among all developers.  -->
+       <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
+               files among all developers. -->
        <pluginRepositories>
                <pluginRepository>
                        <id>onap-plugin-release</id>
@@ -117,6 +117,31 @@
        <build>
                <pluginManagement>
                        <plugins>
+                               <!-- Silence Eclipse m2e warnings -->
+                               <plugin>
+                                       <groupId>org.eclipse.m2e</groupId>
+                                       <artifactId>lifecycle-mapping</artifactId>
+                                       <version>1.0.0</version>
+                                       <configuration>
+                                               <lifecycleMappingMetadata>
+                                                       <pluginExecutions>
+                                                               <pluginExecution>
+                                                                       <pluginExecutionFilter>
+                                                                               <groupId>org.apache.maven.plugins</groupId>
+                                                                               <artifactId>maven-checkstyle-plugin</artifactId>
+                                                                               <versionRange>2.17,)</versionRange>
+                                                                               <goals>
+                                                                                       <goal>check</goal>
+                                                                               </goals>
+                                                                       </pluginExecutionFilter>
+                                                                       <action>
+                                                                               <ignore />
+                                                                       </action>
+                                                               </pluginExecution>
+                                                       </pluginExecutions>
+                                               </lifecycleMappingMetadata>
+                                       </configuration>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>3.1</version>
@@ -146,9 +171,10 @@
        </build>
 
        <distributionManagement>
+               <!-- oparent.version defines snapshot and release repositories -->
                <site>
                        <id>ecomp-site</id>
-                       <url>dav:https://nexus.onap.org/content/sites/site/org/onap/portal/${project.version}</url>
+                       <url>dav:https://nexus.onap.org/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url>
                </site>
        </distributionManagement>