Remove dupe deps to silence maven warnings

Issue-ID: PORTAL-502
Change-Id: Iec64281825405edb4ca404aa6275d90fc7d73613
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

diff --git a/ecomp-sdk/.gitignore b/ecomp-sdk/.gitignore
new file mode 100644 (file)
index 0000000..aa0c881
--- /dev/null
+++ b/ecomp-sdk/.gitignore
@@ -0,0 +1,5 @@
+/target
+/bin/
+/.settings/
+.project
+.classpath

diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index e16b78d..a91be25 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -135,6 +135,21 @@
                                <artifactId>maven-resources-plugin</artifactId>
                                <version>2.5</version>
                                <executions>
+                                       <execution>
+                                               <id>copy-angular-final-step2</id>
+                                               <phase>prepare-package</phase>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>${basedir}/target/epsdk-app-os/app</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>${basedir}/ngapp/dist</directory>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>                            
                                        <execution>
                                                <id>copy-angularjs-step1</id>
                                                <phase>process-resources</phase>
@@ -195,29 +210,6 @@
 
                 </executions>
             </plugin>                  
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.5</version>
-                               <executions>
-                               
-                                       <execution>
-                                               <id>copy-angular-final-step2</id>
-                                               <phase>prepare-package</phase>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/epsdk-app-os/app</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>${basedir}/ngapp/dist</directory>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>                            
-                               
-                               </executions>
-                       </plugin>
                        
                        <!--                    
                        <plugin>

diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml
index a031711..42babe0 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -53,16 +53,6 @@
                <version>1.2.5</version>
                </dependency>
                <dependency>
-               <groupId>org.apache.taglibs</groupId>
-               <artifactId>taglibs-standard-spec</artifactId>
-               <version>1.2.5</version>
-               </dependency>
-               <dependency>
-               <groupId>org.apache.taglibs</groupId>
-               <artifactId>taglibs-standard-impl</artifactId>
-               <version>1.2.5</version>
-               </dependency>
-               <dependency>
                <groupId>org.apache.taglibs</groupId>
                        <artifactId>taglibs-standard-jstlel</artifactId>
                <version>1.2.5</version>

diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index da32024..2b2c443 100644 (file)
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -208,16 +208,6 @@
                        <artifactId>taglibs-standard-impl</artifactId>
                        <version>1.2.5</version>
                </dependency>
-               <dependency>
-                       <groupId>org.apache.taglibs</groupId>
-                       <artifactId>taglibs-standard-spec</artifactId>
-                       <version>1.2.5</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.taglibs</groupId>
-                       <artifactId>taglibs-standard-impl</artifactId>
-                       <version>1.2.5</version>
-               </dependency>
                <dependency>
                        <groupId>org.apache.taglibs</groupId>
                        <artifactId>taglibs-standard-jstlel</artifactId>

diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml
index 151a01e..cc9b66a 100644 (file)
--- a/ecomp-sdk/epsdk-fw/pom.xml
+++ b/ecomp-sdk/epsdk-fw/pom.xml
@@ -18,7 +18,7 @@
        <!-- properties are inherited from parent -->
        <properties>
                <resteasy.version>3.0.18.Final</resteasy.version>
-               <powermock.version>1.6.4</powermock.version>
+               <powermock.version>1.7.4</powermock.version>
        </properties>
        <!-- repositories are inherited from parent -->
        <repositories>
@@ -158,18 +158,6 @@
                                </exclusion> 
                        </exclusions>
                </dependency>
-               <dependency>
-                 <groupId>org.powermock</groupId>
-             <artifactId>powermock-module-junit4</artifactId>
-             <version>1.7.4</version>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>org.powermock</groupId>
-             <artifactId>powermock-api-mockito</artifactId>
-             <version>1.7.4</version>
-             <scope>test</scope>
-           </dependency>
                <!-- Test scaffold -->
                <dependency>
                        <groupId>org.slf4j</groupId>

diff --git a/ecomp-sdk/epsdk-logger/pom.xml b/ecomp-sdk/epsdk-logger/pom.xml
index 4d07982..a827dbb 100644 (file)
--- a/ecomp-sdk/epsdk-logger/pom.xml
+++ b/ecomp-sdk/epsdk-logger/pom.xml
@@ -10,6 +10,8 @@
   <groupId>org.onap.portal.sdk</groupId>
   <artifactId>epsdk-logger</artifactId>
   <version>2.5.0</version>
+
+        <name>ONAP Portal SDK Logger</name>
   
   <dependencies>
        <dependency>
@@ -23,4 +25,4 @@
                        <version>3.1.0</version>
                </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 6dc20dc..b85f32d 100644 (file)
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -31,11 +31,6 @@
                        <version>4.12</version>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>com.att.eelf</groupId>
-                       <artifactId>eelf-core</artifactId>
-                       <version>1.0.0</version>
-               </dependency>
                <!-- Spring -->
                <dependency>
                        <groupId>org.springframework</groupId>