Merge "fix maven local build issue"

[sdnc/northbound.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index be03e93..226eb51 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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>
+               <version>1.1.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -28,57 +29,95 @@
 
                <developerConnection>scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-northbound.git</developerConnection>
                <url>${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-northbound/browse</url>
-  </scm>
+       </scm>
 
        <ciManagement>
                <system>Jenkins</system>
                <url>https://jenkins.openecomp.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>
-        </site>
-    </distributionManagement>
+       <distributionManagement>
+               <site>
+                       <id>sdnc-javadoc</id>
+                       <url>dav:https://${openecomp.nexus.host}:${openecomp.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
+               </site>
+       </distributionManagement>
+       <profiles>
+               <profile>
+                       <id>blackduck</id>
+                       <activation>
+                               <property>
+                                       <name>blackduck-scan</name>
+                               </property>
+                       </activation>
+                       <build>
+                               <pluginManagement>
+                                       <plugins>
+                                               <plugin>
+                                                       <groupId>com.blackducksoftware.integration</groupId>
+                                                       <artifactId>hub-maven-plugin</artifactId>
+                                                       <version>1.4.0</version>
+                                                       <inherited>false</inherited>
+                                                       <configuration>
+                                                               <hubProjectName>${project.name}</hubProjectName>
+                                                               <outputDirectory>${project.basedir}</outputDirectory>
+                                                       </configuration>
+                                                       <executions>
+                                                               <execution>
+                                                                       <id>create-bdio-file</id>
+                                                                       <phase>package</phase>
+                                                                       <goals>
+                                                                               <goal>createHubOutput</goal>
+                                                                       </goals>
+                                                               </execution>
+                                                       </executions>
+                                               </plugin>
+                                       </plugins>
+
+                               </pluginManagement>
+
+                       </build>
+
+               </profile>
+
+       </profiles>
 
        <build>
                <plugins>
-                       <!-- Blackduck plugin breaks release build 
                        <plugin>
-                               <groupId>com.blackducksoftware.integration</groupId>
-                               <artifactId>hub-maven-plugin</artifactId>
-                               <version>1.4.0</version>
-                               <inherited>false</inherited>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.17</version>
+                               <configuration>
+                                       <skipTests>true</skipTests>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
                                <configuration>
-                                       <hubProjectName>${project.name}</hubProjectName>
-                                       <outputDirectory>${project.basedir}</outputDirectory>
+                                       <nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
+                                       <stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
+                                       <serverId>${openecomp.nexus.staging.server-id}</serverId>
                                </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>create-bdio-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>createHubOutput</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
                        </plugin>
-                        -->
                </plugins>
 
        </build>
        <modules>
                <module>asdcApi</module>
                <module>dataChange</module>
+               <module>dmaap-listener</module>
                <module>ueb-listener</module>
                <module>vnfapi</module>
                <module>vnftools</module>
-  </modules>
+       </modules>
        <organization>
                <name>AT&amp;T</name>
        </organization>
-       <version>1.0.0</version>
+       <version>1.1.1-SNAPSHOT</version>
 
 
 </project>