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>

diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 496f3e3..749e5ec 100644 (file)
--- 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 c2653c8..5c1296a 100644 (file)
--- 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
similarity index 100%
rename from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/2.4.4/core-2.4.4.jar
rename to ecomp-sdk/epsdk-music/dependencies/org/onap/music/core/2.4.4/core-2.4.4.jar

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
similarity index 100%
rename from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/core/maven-metadata-local.xml
rename to 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
similarity index 100%
rename from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar
rename to ecomp-sdk/epsdk-music/dependencies/org/onap/music/dependency/2.4.4/dependency-2.4.4.jar

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
similarity index 100%
rename from ecomp-sdk/epsdk-music/src/main/resources/org/onap/music/dependency/maven-metadata-local.xml
rename to 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 89dea57..3b18817 100644 (file)
--- 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>