Upversion to oparent 2.0.0

Issue-ID: AAI-2496
Change-Id: I469f9e911212512ee0cff4df68c674af3c67c872
Signed-off-by: Jimmy Forsyth <jf2512@att.com>

diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml
index 210aa2c..6bbed7e 100644 (file)
--- a/elasticsearch-sg/pom.xml
+++ b/elasticsearch-sg/pom.xml
@@ -81,24 +81,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.8.2</version>
-                               <executions>
-                                       <execution>
-                                               <id>default-deploy</id>
-                                               <phase>none</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
                        </plugin>
                </plugins>
        </build>

diff --git a/pom.xml b/pom.xml
index ec5e75e..260edd3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,11 @@
 <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/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-
+       <parent>
+          <groupId>org.onap.oparent</groupId>
+          <artifactId>oparent</artifactId>
+          <version>2.0.0</version>
+       </parent>
        <groupId>org.onap.aai</groupId>
        <artifactId>search-data-service</artifactId>
        <name>aai-search-data-service aggregate pom</name>
@@ -50,15 +54,8 @@
                                </configuration>
                        </plugin>
                        <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-deploy-plugin</artifactId>
                        </plugin>
                </plugins>
        </build>

diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index a61232e..71fe188 100644 (file)
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -303,18 +303,6 @@
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
-                       </plugin>
-
             <!-- This plugin is used to generate Java POJO's from json format schema
                 file. -->
                        <plugin>
@@ -398,13 +386,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.8.2</version>
-                               <executions>
-                                       <execution>
-                                               <id>default-deploy</id>
-                                               <phase>none</phase>
-                                       </execution>
-                               </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>