From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 30 Aug 2017 18:46:54 +0000 (+0000)
Subject: Merge "Change of versioning strategy"
X-Git-Tag: v0.1.1~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d7a98ca88b25989f45018f3411f2f0210e51df42;hp=-c;p=oparent.git

Merge "Change of versioning strategy"
---

d7a98ca88b25989f45018f3411f2f0210e51df42
diff --combined pom.xml
index d45dbd6,d093238..05bf820
--- a/pom.xml
+++ b/pom.xml
@@@ -35,7 -35,6 +35,6 @@@
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
      <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-     <versions.plugin.phase>none</versions.plugin.phase>
      <!-- sitePath may be overridden in the inheriting POM if desired -->
      <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
    </properties>
@@@ -99,32 -98,12 +98,15 @@@
                    <requireReleaseDeps>
                      <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
                      <onlyWhenRelease>true</onlyWhenRelease>
 +                    <excludes>
 +                      <exclude>org.onap.oparent:*</exclude>
 +                    </excludes>
                    </requireReleaseDeps>
                  </rules>
                </configuration>
              </execution>
            </executions>
          </plugin>
-         <plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>versions-maven-plugin</artifactId>
-           <version>2.4</version>
-           <executions>
-             <execution>
-               <id>check-dependencies-version</id>
-               <phase>${versions.plugin.phase}</phase>
-               <goals>
-                 <goal>display-dependency-updates</goal>
-               </goals>
-               <configuration>
-                 <rulesUri>https://git.onap.org/oparent/plain/versions/src/main/resources/onap-versions/ruleset.xml</rulesUri>
-               </configuration>
-             </execution>
-           </executions>
-         </plugin>
        </plugins>
      </pluginManagement>
      <plugins>
@@@ -144,10 -123,6 +126,6 @@@
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-enforcer-plugin</artifactId>
        </plugin>
-       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>versions-maven-plugin</artifactId>
-       </plugin>
      </plugins>
    </build>
  </project>