Merge "LoginStrategy.java : Fixed sonar issue"

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

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index ce394ea..fd6a93d 100644 (file)
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>2.2.0</version>
+               <version>2.3.0</version>
        </parent>
 
        <artifactId>portal-be-common</artifactId>
@@ -402,6 +402,16 @@
                        <groupId>com.lowagie</groupId>
                        <artifactId>itext</artifactId>
                        <version>2.0.8</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>bouncycastle</groupId>
+                                       <artifactId>bcprov-jdk14</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>bouncycastle</groupId>
+                                       <artifactId>bcmail-jdk14</artifactId>
+                               </exclusion>
+                       </exclusions>           
                </dependency>
                <!-- Quartz -->
                <dependency>
@@ -615,6 +625,10 @@
                        <groupId>commons-httpclient</groupId>
                        <artifactId>commons-httpclient</artifactId>
                 </exclusion>
+                                <exclusion>
+                               <groupId>org.beanshell</groupId>
+                       <artifactId>bsh-core</artifactId>
+                                </exclusion>
               </exclusions>
         </dependency>
         <dependency>
@@ -637,11 +651,6 @@
                <artifactId>xstream</artifactId>
                <version>1.4.10</version>
                </dependency>
-               <dependency>
-               <groupId>org.apache.wicket</groupId>
-               <artifactId>wicket-core</artifactId>
-               <version>1.5.16</version>
-               </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
@@ -662,10 +671,55 @@
                <artifactId>xalan</artifactId>
                <version>2.7.2</version>
                </dependency>
-               
-               
-       </dependencies>
-       
+                       <!-- Music -->
+           <dependency>
+                   <groupId>org.onap.music</groupId>
+                   <artifactId>MUSIC</artifactId>
+                   <version>2.5.5</version>
+                   <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>
+           
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-music</artifactId>
+                       <version>${epsdk.version}</version>
+                               
+               <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>
 
 </project>