X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=music-core%2Fpom.xml;h=a1fc3a61bc8dc86e52dc30c42b7abd8663ef9149;hb=2fb68aa6fc8e8d15d65c26505b3bd4a278b778ca;hp=687ec743f705da40a4f8808551b98da108a64162;hpb=a7512128b6eb91ac745dc6130a841910e31eb413;p=music.git

diff --git a/music-core/pom.xml b/music-core/pom.xml
index 687ec743..a1fc3a61 100755
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -46,31 +46,6 @@
         <java.version>1.8</java.version>
         <jaxrs.version>2.0.1</jaxrs.version>
         <cassandra.version>3.6.0</cassandra.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>
--->
     </properties>
 
     <repositories>
@@ -118,21 +93,8 @@
             <testResource>
                 <directory>${project.basedir}/src/test/resources</directory>
             </testResource>
-            <!-- <testResource>
-                <directory>${project.basedir}/src/main/resources</directory>
-            </testResource> -->
         </testResources>
         <plugins>
-<!--
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <warSourceDirectory>WebContent</warSourceDirectory>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
--->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -154,8 +116,6 @@
                         </goals>
                         <configuration>
                             <excludes>
-                                <!--<exclude>**/*.xml</exclude>
-                                <exclude>**/*.properties</exclude>-->
                                 <exclude>**/Sample*</exclude>
                             </excludes>
                         </configuration>
@@ -187,20 +147,6 @@
     </build>
 
     <dependencies>
-        <!-- Development -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- /Development -->
         <!-- Logging -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -255,7 +201,8 @@
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-extras</artifactId>
             <version>${cassandra.version}</version>
-        </dependency>        <!-- /Cassandra -->
+        </dependency>
+        <!-- /Cassandra -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-jcs-core</artifactId>
@@ -324,7 +271,6 @@
             <scope>test</scope>
         </dependency>
         <!--  /Testing -->
-
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -354,6 +300,37 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey-jaxrs</artifactId>
             <version>1.5.22</version>
+            <exclusions>
+              <exclusion>
+                <groupId>com.sun.jersey.contribs</groupId>
+                <artifactId>jersey-multipart</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+			<groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-multipart</artifactId>
+            <version>1.19</version>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.0.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -409,11 +386,23 @@
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-client</artifactId>
             <version>2.1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>        
         </dependency>
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-core</artifactId>
             <version>2.1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>