Merge "Add default path for mvn settings file"

[sdnc/oam.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 30dbc4d..81142b3 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,14 @@
        <parent>
                <groupId>org.openecomp.sdnc.core</groupId>
                <artifactId>root</artifactId>
-               <version>1.0.0</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.sdnc.oam</groupId>
        <artifactId>sdnc-oam</artifactId>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>SDN-C OAM</name>
        <url>https://wiki.openecomp.org</url>
@@ -78,31 +79,6 @@
                        </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>
@@ -122,6 +98,17 @@
                                        <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>
+                                       <nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
+                                       <stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
+                                       <serverId>${openecomp.nexus.staging.server-id}</serverId>
+                               </configuration>
+                       </plugin>
                </plugins>
 
        </build>
@@ -133,7 +120,6 @@
        <organization>
                <name>AT&amp;T</name>
        </organization>
-       <version>1.0.0</version>
 
 
 </project>