summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk
diff options
context:
space:
mode:
authorst782s <statta@research.att.com>2018-03-22 18:29:59 -0400
committerst782s <statta@research.att.com>2018-03-22 18:29:59 -0400
commit42ca7b4e0dbc53b6a1edfc04bcb5020fc4a1d683 (patch)
tree11e67cebcb84b4bbc6ec67a1d09cd39f8858733a /ecomp-sdk
parent17891f3aac1fa48f3cc1b2b858024d4edbd1f38c (diff)
Music Jar dependency
Issue-ID: PORTAL-210 Modified POM to include epsdk-music-jar with dependency Change-Id: I2b5fd64d40be3ebb95dcefae82bbd877c0c4ad2d Signed-off-by: st782s <statta@research.att.com>
Diffstat (limited to 'ecomp-sdk')
-rw-r--r--ecomp-sdk/epsdk-app-os/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/resources/cache.ccf6
-rw-r--r--ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar (renamed from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/2.4.4/core-2.4.4.jar)bin132593 -> 132593 bytes
-rw-r--r--ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml (renamed from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/maven-metadata-local.xml)0
-rw-r--r--ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar (renamed from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar)bin113653669 -> 113653669 bytes
-rw-r--r--ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/maven-metadata-local.xml (renamed from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/maven-metadata-local.xml)0
-rw-r--r--ecomp-sdk/epsdk-music/pom.xml23
7 files changed, 26 insertions, 5 deletions
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 496f3e3e..749e5ec9 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -243,11 +243,11 @@
<artifactId>epsdk-workflow</artifactId>
<version>${epsdk.version}</version>
</dependency>
- <!-- Music -->
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-music</artifactId>
<version>${epsdk.version}</version>
+ <classifier>jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/resources/cache.ccf b/ecomp-sdk/epsdk-app-overlay/src/main/resources/cache.ccf
index c2653c88..5c1296ae 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/resources/cache.ccf
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/resources/cache.ccf
@@ -1,8 +1,8 @@
# DEFAULT CACHE REGION
jcs.default=DC
-jcs.default.cacheattributes=org.apache.commons.commons.jcs.engine.CompositeCacheAttributes
+jcs.default.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes
jcs.default.cacheattributes.MaxObjects=1000
-jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.commons.jcs.engine.memory.lru.LRUMemoryCache
+jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=true
jcs.default.elementattributes.IsSpool=true
@@ -13,7 +13,7 @@ jcs.default.elementattributes.IsSpool=true
#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
#jcs.default.cacheattributes.MaxSpoolPerRun=500
-#jcs.default.elementattributes=org.apache.commons.commons.jcs.engine.ElementAttributes
+#jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
#jcs.default.elementattributes.IsEternal=false
diff --git a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/2.4.4/core-2.4.4.jar b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar
index c2dd2dba..c2dd2dba 100644
--- a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/2.4.4/core-2.4.4.jar
+++ b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar
Binary files differ
diff --git a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/maven-metadata-local.xml b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml
index 01c2b2bf..01c2b2bf 100644
--- a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/maven-metadata-local.xml
+++ b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/maven-metadata-local.xml
diff --git a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar
index 8c5a5e04..8c5a5e04 100644
--- a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar
+++ b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar
Binary files differ
diff --git a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/maven-metadata-local.xml b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/maven-metadata-local.xml
index 695d90ac..695d90ac 100644
--- a/ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/maven-metadata-local.xml
+++ b/ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/maven-metadata-local.xml
diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 89dea57f..3b188176 100644
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -27,7 +27,7 @@
<repositories>
<repository>
<id>resources</id>
- <url>file:${project.basedir}/src/main/resources</url>
+ <url>file:${project.basedir}/dependencies</url>
</repository>
</repositories>
<dependencies>
@@ -185,6 +185,27 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- bind to the packaging phase -->
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>