Merge "Fix tunnelxconn template value"

[sdnc/oam.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 30dbc4d..c231181 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -3,42 +3,42 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
        <parent>
-               <groupId>org.openecomp.sdnc.core</groupId>
-               <artifactId>root</artifactId>
-               <version>1.0.0</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-carbon-sr1</artifactId>
+               <version>0.1.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
-       <groupId>org.openecomp.sdnc.oam</groupId>
+       <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>sdnc-oam</artifactId>
 
-       <name>SDN-C OAM</name>
-       <url>https://wiki.openecomp.org</url>
+       <name>sdnc-oam</name>
+       <url>https://wiki.onap.org</url>
        <description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description>
 
 
        <issueManagement>
                <system>JIRA</system>
-               <url>https://jira.openecomp.org/</url>
+               <url>https://jira.onap.org/</url>
        </issueManagement>
 
         <scm>
-                <connection>scm:git:ssh://git@${openecomp.git.host}/sdnc-oam.git</connection>
-                <developerConnection>scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-oam.git</developerConnection>
-                <url>${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-oam/browse</url>
+                <connection>scm:git:ssh://git@${onap.git.host}/sdnc-oam.git</connection>
+                <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git</developerConnection>
+                <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse</url>
                <tag>HEAD</tag>
        </scm>
 
        <ciManagement>
                <system>Jenkins</system>
-               <url>https://jenkins.openecomp.org/</url>
+               <url>https://jenkins.onap.org/</url>
        </ciManagement>
 
     <distributionManagement>
         <site>
           <id>sdnc-javadoc</id>
-          <url>dav:https://${openecomp.nexus.host}:${openecomp.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
+          <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
         </site>
     </distributionManagement>
        <profiles>
@@ -50,7 +50,6 @@
                                </property>
                        </activation>
                        <build>
-                               <pluginManagement>
                                        <plugins>
                                                <plugin>
                                                        <groupId>com.blackducksoftware.integration</groupId>
@@ -73,36 +72,10 @@
                                                </plugin>
                                        </plugins>
 
-                               </pluginManagement>
 
                        </build>
 
                </profile>
-               <profile>
-                       <id>staging</id>
-                       <activation>
-                               <property>
-                                       <name>!no-staging</name>
-                               </property>
-                       </activation>
-                       <build>
-                               <pluginManagement>
-                                       <plugins>
-                                               <plugin>
-                                                       <groupId>org.sonatype.plugins</groupId>
-                                                       <artifactId>nexus-staging-maven-plugin</artifactId>
-                                                       <version>1.6.7</version>
-                                                       <extensions>true</extensions>
-                                                       <configuration>
-                                                               <nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
-                                                               <stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
-                                                               <serverId>${openecomp.nexus.staging.server-id}</serverId>
-                                                       </configuration>
-                                               </plugin>
-                                       </plugins>
-                               </pluginManagement>
-                       </build>
-               </profile>
                <profile>
                  <id>docker</id>
                  <modules>
@@ -119,7 +92,18 @@
                                <artifactId>maven-surefire-plugin</artifactId>
                                <version>2.17</version>
                                <configuration>
-                                       <skipTests>true</skipTests>
+                                       <skipTests>false</skipTests>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+                                       <serverId>${onap.nexus.staging.server-id}</serverId>
                                </configuration>
                        </plugin>
                </plugins>
@@ -127,13 +111,14 @@
        </build>
        <modules>
                <module>admportal</module>
+               <module>dgbuilder</module>
                <module>platform-logic</module>
        </modules>
 
        <organization>
                <name>AT&amp;T</name>
        </organization>
-       <version>1.0.0</version>
+       <version>1.2.0-SNAPSHOT</version>
 
 
 </project>