Merge "Hibernate db fix"

[portal.git] / ecomp-portal-BE-os / pom.xml

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index ed42c06..ad9a992 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>2.2.0</version>
+               <version>2.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>portal-be-os</artifactId>
@@ -621,6 +621,10 @@
                                        <groupId>org.codehaus.jackson</groupId>
                                        <artifactId>jackson-mapper-asl</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>com.nimbusds</groupId>
+                                       <artifactId>nimbus-jose-jwt</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 <!--           <dependency>
@@ -656,14 +660,25 @@
                        <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>
+                       
+                       <exclusions> 
+                               <exclusion> 
+                                         <groupId>com.sun.jersey</groupId> 
+                                 <artifactId>jersey-client</artifactId> 
+                               </exclusion> 
+                               <exclusion> 
+                                        <groupId>com.sun.jersey</groupId> 
+                                <artifactId>jersey-server</artifactId> 
+                               </exclusion> 
+                               <exclusion> 
+                                        <groupId>com.sun.jersey</groupId> 
+                                <artifactId>jersey-json</artifactId> 
+                               </exclusion><exclusion> 
+                                       <groupId>com.sun.jersey</groupId> 
+                               <artifactId>jersey-servlet</artifactId> 
+                               </exclusion> 
+                       </exclusions> 
+               </dependency> 
        </dependencies>
 
        <reporting>