Tidy up pom config changes

Change-Id: I088f3e0bd537a36cf8682070811f50d4abdee150
Issue-ID: AAI-2401
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>

diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml
index c27ff54..e581748 100644 (file)
--- a/elasticsearch-sg/pom.xml
+++ b/elasticsearch-sg/pom.xml
@@ -79,26 +79,26 @@
                                </configuration>
                        </plugin>
                        <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>
+                               <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>
+                               <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 d3ffb93..0443284 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,33 +40,6 @@
        </properties>
 
        <build>
-       <!-- we don't need to deploy the top level pom project -->
-         <pluginManagement>
-           <plugins>
-               <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>${onap.nexus.url}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
-                    </configuration>
-                </plugin>
-               </plugins>
-             </pluginManagement>
                <plugins>
                        <plugin>
                                <groupId>com.spotify</groupId>

diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index 978b0c5..3ba6fe0 100644 (file)
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -396,15 +396,15 @@
                                </executions>
                        </plugin>
                        <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>
+                               <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>
@@ -430,28 +430,28 @@
                             <!-- <append>true</append> -->
                                                </configuration>
                                        </execution>
-                                        <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
-                            <rules>
+                                       <execution>
+                                               <id>default-check</id>
+                                               <goals>
+                                                       <goal>check</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
+                                                       <rules>
                                 <!--  implementation is needed only for Maven 2  -->
-                                <rule implementation="org.jacoco.maven.RuleConfiguration">
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit implementation="org.jacoco.report.check.Limit">
-                                            <counter>LINE</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>${jacoco.line.coverage.limit}</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
+                                                               <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                                                       <element>BUNDLE</element>
+                                                                       <limits>
+                                                                               <limit implementation="org.jacoco.report.check.Limit">
+                                                                                       <counter>LINE</counter>
+                                                                                       <value>COVEREDRATIO</value>
+                                                                                       <minimum>${jacoco.line.coverage.limit}</minimum>
+                                                                               </limit>
+                                                                       </limits>
+                                                               </rule>
+                                                       </rules>
+                                               </configuration>
+                                       </execution>
                                </executions>
                        </plugin>