X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=51c12f9042606397d901a7dfd6605c3468bc2f64;hb=47b7c0e7d4c1ecc48df63c8e18ac06e6278a92cd;hp=d547f2098d1b804b65dd82831a6e72fff6cc03ac;hpb=83cd45492799f43ab35fa03113f76cf417734036;p=music.git

diff --git a/pom.xml b/pom.xml
index d547f209..51c12f90 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,376 +1,140 @@
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
  ============LICENSE_START==========================================
  org.onap.music
  ===================================================================
   Copyright (c) 2017 AT&T Intellectual Property
+ ===================================================================
+  Modifications Copyright (c) 2019 IBM.
  ===================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
- 
+
      http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- 
+
  ============LICENSE_END=============================================
  ====================================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.onap.music</groupId>
-	<artifactId>MUSIC</artifactId>
-	<packaging>war</packaging>
-	<version>2.4.4</version>
-	<description>
-          	This is the MUSIC REST interface, packaged as a war file.
-          </description>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jersey1.version>1.9</jersey1.version>
-		<jersey2.version>2.26</jersey2.version>
-		<jaxrs.version>2.0.1</jaxrs.version>
-		<cassandra.version>3.0.0</cassandra.version>
-		<zookeeper.version>3.4.6</zookeeper.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-                <!-- ONAP Nexus -->
-                <nexusproxy>https://nexus.onap.org</nexusproxy>
-                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-                <sitePath>/content/sites/site/org/openecomp/music/${project.version}</sitePath>
-                <!-- SONAR -->
-                <sonar.language>java</sonar.language>
-                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-                <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-                <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-                <sonar.projectVersion>${project.version}</sonar.projectVersion>
-
-	</properties>
-	<repositories>
-		<repository>
-			<id>maven2-repository.java.net</id>
-			<name>Java.net Repository for Maven</name>
-			<url>http://download.java.net/maven/2/</url>
-			<layout>default</layout>
-		</repository>
-                <repository>
-                        <id>ecomp-snapshots</id>
-                        <name>Snapshot Repository</name>
-                        <url>${nexusproxy}/${snapshotNexusPath}</url>
-                </repository>
-                <repository>
-                        <id>ecomp-staging</id>
-                        <name>Staging Repository</name>
-                        <url>${nexusproxy}/${stagingNexusPath}</url>
-                </repository>
-	</repositories>
-        <distributionManagement>
-                <repository>
-                        <id>ecomp-releases</id>
-                        <name>Release Repository</name>
-                        <url>${nexusproxy}/${releaseNexusPath}</url>
-                </repository>
-                <snapshotRepository>
-                        <id>ecomp-snapshots</id>
-                        <name>Snapshot Repository</name>
-                        <url>${nexusproxy}/${snapshotNexusPath}</url>
-                </snapshotRepository>
-                        <!-- added for javadoc -->
-                        <site>
-                            <id>ecomp-site</id>
-                            <url>dav:${nexusproxy}${sitePath}</url>
-                        </site>
-        </distributionManagement>
-	<build>
-		<finalName>MUSIC</finalName>
-		<sourceDirectory>src/main/java</sourceDirectory>
-		<outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory>
-		<testSourceDirectory>src/test/java</testSourceDirectory>
-		<testOutputDirectory>target/test-classes</testOutputDirectory>
-		<defaultGoal>validate</defaultGoal>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<plugins>
-                        <plugin>
-                                <groupId>org.sonatype.plugins</groupId>
-                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                                <version>1.6.7</version>
-                                <extensions>true</extensions>
-                                <configuration>
-                                        <nexusUrl>${nexusproxy}</nexusUrl>
-                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                        <serverId>ecomp-staging</serverId>
-                                </configuration>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-site-plugin</artifactId>
-                                <version>3.6</version>
-                                <dependencies>
-                                        <dependency>
-                                                <groupId>org.apache.maven.wagon</groupId>
-                                                <artifactId>wagon-webdav-jackrabbit</artifactId>
-                                                <version>2.10</version>
-                                        </dependency>
-                                </dependencies>
-                        </plugin>
-			<plugin>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.9</version>
-				<configuration>
-					<additionalProjectnatures>
-						<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
-					</additionalProjectnatures>
-					<additionalBuildcommands>
-						<buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
-					</additionalBuildcommands>
-					<downloadSources>true</downloadSources>
-					<downloadJavadocs>true</downloadJavadocs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<warSourceDirectory>WebContent</warSourceDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
-				<executions>
-					<execution>
-						<id>make-a-jar</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<excludes>
-								<exclude>**/*.xml</exclude>
-								<exclude>**/*.properties</exclude>
-								<exclude>**/Sample*</exclude>
-							</excludes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>2.4</version>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>install-file</goal>
-						</goals>
-						<configuration>
-							<packaging>jar</packaging>
-							<artifactId>${project.artifactId}</artifactId>
-							<groupId>${project.groupId}</groupId>
-							<version>${project.version}</version>
-							<file>${project.build.directory}/${project.artifactId}.jar</file>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-                        <!-- Sonar Plugin for Sonar Scans -->
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>sonar-maven-plugin</artifactId>
-                            <version>3.2</version>
-                        </plugin>
-                <plugin>
-			<groupId>org.jacoco</groupId>
-			<artifactId>jacoco-maven-plugin</artifactId>
-			<version>0.7.7.201606060606</version>
-			<configuration>
-				<dumpOnExit>true</dumpOnExit>
-				<includes>
-					<include>org.openecomp.*</include>
-				</includes>
-			</configuration>
-			<executions>
-				<execution>
-					<id>jacoco-initialize-unit-tests</id>
-					<goals>
-						<goal>prepare-agent</goal>
-					</goals>
-					<configuration>
-						<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-						<!-- <append>true</append> -->
-					</configuration>
-				</execution>
-			</executions>
-	         </plugin>
-                 <!-- Maven surefire plugin for testing -->
-                 <plugin>
-                     <artifactId>maven-surefire-plugin</artifactId>
-                     <version>2.17</version>
-                 </plugin>
-	    </plugins>
-	</build>
-
-	<dependencies>
-		  
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>1.1.3</version>
-
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.1.3</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.datastax.cassandra</groupId>
-			<artifactId>cassandra-driver-core</artifactId>
-			<version>${cassandra.version}</version>
-		</dependency>
-		 <dependency> 
-		        <groupId>org.cassandraunit</groupId> 
-		        <artifactId>cassandra-unit</artifactId> 
-			    <version>3.3.0.1</version> 
-		</dependency> 
-		<dependency>
-			<groupId>org.apache.zookeeper</groupId>
-			<artifactId>zookeeper</artifactId>
-			<version>${zookeeper.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>${jersey1.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-server</artifactId>
-			<version>${jersey1.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-json</artifactId>
-			<version>${jersey1.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-model</artifactId>
-			<version>3.3.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-jcs-core</artifactId>
-			<version>2.2</version>
-		</dependency>
-
-		<dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>javax.servlet-api</artifactId>
-		    <version>3.0.1</version>
-		    <scope>provided</scope>
-		</dependency>
-		<dependency>
-		    <groupId>commons-codec</groupId>
-		    <artifactId>commons-codec</artifactId>
-		    <version>1.11</version>
-		</dependency>
-
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.9.0</version>
-		</dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.onap.music</groupId>
+    <artifactId>MUSIC</artifactId>
+    <packaging>pom</packaging>
+    <version>3.2.37-SNAPSHOT</version>
+    <description>
+            This is the MUSIC project.
+    </description>
 
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>2.0.0</version>
+        <relativePath/>
+    </parent>
 
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-jersey-jaxrs</artifactId>
-			<version>1.5.0</version>
-		</dependency>
-    <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>19.0</version>
-        </dependency>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <!--nexus -->
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+        <sitePath>/content/sites/site/org/onap/music/${project.version}</sitePath>
+        <!--maven -->
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format>
+        <!--skip checkstyle -->
+        <maven.check.skip>false</maven.check.skip>
+        <!--docker -->
+        <docker.tag>${project.version}-${timestamp}</docker.tag>
+        <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- Default Sonar configuration -->
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+    </properties>
 
-    <dependency>
-    	<groupId>com.att.eelf</groupId>
-    	<artifactId>eelf-core</artifactId>
-    	<version>1.0.0</version>
-    </dependency>
-	</dependencies>
+    <repositories>
+        <repository>
+            <id>onap-releases</id>
+            <name>ONAP - Release Repository</name>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+        </repository>
+        <repository>
+            <id>onap-staging</id>
+            <name>ONAP - Staging Repository</name>
+            <url>${nexusproxy}/${stagingNexusPath}</url>
+        </repository>
+        <repository>
+            <id>onap-snapshots</id>
+            <name>ONAP - Snapshot Repository</name>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+        </repository>
+        <repository>
+            <id>onap-public</id>
+            <name>ONAP public Repository</name>
+            <url>${nexusproxy}/content/groups/public</url>
+        </repository>
+    </repositories>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
-				<configuration>
-					<author>true</author>
-					<breakiterator>true</breakiterator>
-					<version>true</version>
-					<links>
-						<link>https://docs.oracle.com/javase/7/docs/api/</link>
-						<link>https://tomcat.apache.org/tomcat-7.0-doc/jspapi/</link>
-						<link>http://docs.oracle.com/javaee/7/api/</link>
-					</links>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <configuration>
+                    <author>true</author>
+                    <breakiterator>true</breakiterator>
+                    <version>true</version>
+                    <links>
+                        <link>https://docs.oracle.com/javase/7/docs/api/</link>
+                        <link>https://tomcat.apache.org/tomcat-7.0-doc/jspapi/</link>
+                        <link>http://docs.oracle.com/javaee/7/api/</link>
+                    </links>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>Release Repository</name>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>Snapshot Repository</name>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <!-- added for javadoc -->
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
+    <modules>
+        <module>music-core</module>
+        <module>music-rest</module>
+    </modules>
 </project>