summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorst782s <statta@research.att.com>2018-04-30 16:03:12 -0400
committerst782s <statta@research.att.com>2018-04-30 16:03:12 -0400
commit675d5f647f0579d1870d72f1f7a1e2757b08d031 (patch)
tree93b6448a1393b60f7edf039e20c47638abc3d15a
parent627a4a8c29263748c914f04e5f3ed82c351f2cf8 (diff)
Release staging 2.2.0v2.2.0
Issue-ID: PORTAL-250 Change-Id: I445ed101dd40b4ab347d786bc07035ba862d7d6e Signed-off-by: st782s <statta@research.att.com>
-rw-r--r--ecomp-sdk/epsdk-analytics/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-app-common/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-app-os/README.md4
-rw-r--r--ecomp-sdk/epsdk-app-os/pom.xml10
-rw-r--r--ecomp-sdk/epsdk-app-overlay/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-core/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-fw/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.2/core-2.4.4.2.jarbin22223459 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml12
-rw-r--r--ecomp-sdk/epsdk-music/pom.xml16
-rw-r--r--ecomp-sdk/epsdk-workflow/pom.xml2
-rw-r--r--ecomp-sdk/pom.xml2
12 files changed, 16 insertions, 40 deletions
diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml
index 2b79d543..57ff2803 100644
--- a/ecomp-sdk/epsdk-analytics/pom.xml
+++ b/ecomp-sdk/epsdk-analytics/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml
index f31aa797..81df08d5 100644
--- a/ecomp-sdk/epsdk-app-common/pom.xml
+++ b/ecomp-sdk/epsdk-app-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index fc06e4a3..6a94530e 100644
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -16,8 +16,8 @@ Version 2.2.0
- PORTAL 136 Junits for SDK
- PORTAL 87 hibernate mapping in epsdk-overlay forces use of analytics dependency jar
- PORTAL 155 Review security issues: portal
-- PORTAL-202 Remove files that have GPL or other license issues
-
+- PORTAL 202 Remove files that have GPL or other license issues
+- PORTAL 210 Music library update
Version 2.1.0
- PORTAL 161 Refer epsdk-app-common
- PORTAL 160 Refer epsdk-app-common
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index d904d68f..9d9d5a41 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -10,7 +10,8 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0
+ </version>
</parent>
<!-- GroupId is inherited from parent -->
@@ -247,13 +248,6 @@
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-music</artifactId>
<version>${epsdk.version}</version>
- <classifier>jar-with-dependencies</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.onap.music</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml
index 53147a81..a6a3cdd9 100644
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 1bdb1490..20287d07 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml
index 55f68744..96ed2580 100644
--- a/ecomp-sdk/epsdk-fw/pom.xml
+++ b/ecomp-sdk/epsdk-fw/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.2/core-2.4.4.2.jar b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.2/core-2.4.4.2.jar
deleted file mode 100644
index d4463386..00000000
--- a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4.2/core-2.4.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml
deleted file mode 100644
index 2d8fd035..00000000
--- a/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.onap.music</groupId>
- <artifactId>core</artifactId>
- <versioning>
- <release>2.4.4.2</release>
- <versions>
- <version>2.4.4.2</version>
- </versions>
- <lastUpdated>20180302803455</lastUpdated>
- </versioning>
-</metadata>
diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 6429518f..ef0d9000 100644
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-music</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
<packaging>jar</packaging>
<name>ONAP Portal SDK Music</name>
@@ -24,12 +24,6 @@
<cassandra.version>3.0.0</cassandra.version>
<zookeeper.version>3.4.6</zookeeper.version>
</properties>
- <repositories>
- <repository>
- <id>resources</id>
- <url>file:${project.basedir}/dependencies</url>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -123,9 +117,9 @@
<!-- Music -->
<dependency>
<groupId>org.onap.music</groupId>
- <artifactId>core</artifactId>
- <version>2.4.4.2</version>
- </dependency>
+ <artifactId>MUSIC</artifactId>
+ <version>2.5.3</version>
+ </dependency>
<!-- Mapper -->
<dependency>
diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml
index 0a817850..5cdb38d7 100644
--- a/ecomp-sdk/epsdk-workflow/pom.xml
+++ b/ecomp-sdk/epsdk-workflow/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index e3db8a97..b9fe730a 100644
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -14,7 +14,7 @@
<!-- Portal SDK Maven parent project -->
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
<packaging>pom</packaging>
<name>portal-sdk</name>
<url>https://wiki.onap.org/display/DW/Portal</url>