summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManoop Talasila <talasila@research.att.com>2019-02-07 21:37:37 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-07 21:37:37 +0000
commit7b740b078f8fb593c2615e8b6689d30ea46a0c86 (patch)
tree28eebe17ca8d129520f437ad3af6c7bfcbe821ef
parente8b5b88d6cbe36d62fad93ca696a09e06db0942a (diff)
parentb3922f7c97a11798a5268c2f996214060ac4f8bb (diff)
Merge "Remove dupe deps to silence maven warnings"2.0.5
-rw-r--r--ecomp-sdk/.gitignore5
-rw-r--r--ecomp-sdk/epsdk-app-os/pom.xml38
-rw-r--r--ecomp-sdk/epsdk-app-overlay/pom.xml10
-rw-r--r--ecomp-sdk/epsdk-core/pom.xml10
-rw-r--r--ecomp-sdk/epsdk-fw/pom.xml14
-rw-r--r--ecomp-sdk/epsdk-logger/pom.xml4
-rw-r--r--ecomp-sdk/epsdk-music/pom.xml5
7 files changed, 24 insertions, 62 deletions
diff --git a/ecomp-sdk/.gitignore b/ecomp-sdk/.gitignore
new file mode 100644
index 00000000..aa0c881b
--- /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 01ef6c34..aebc1da6 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -136,6 +136,21 @@
<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>
<goals>
@@ -211,29 +226,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 a031711e..42babe03 100644
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -54,16 +54,6 @@
</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>
</dependency>
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index da320242..2b2c4430 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -210,16 +210,6 @@
</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>
</dependency>
diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml
index 151a01ef..cc9b66af 100644
--- 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 4d07982c..a827dbba 100644
--- 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 6dc20dcd..b85f32d9 100644
--- 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>