X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fpom.xml;h=6cb1279a1d90f8d07346461f60c8191dd603f5cc;hb=a09f7a4a532e35f216cf5215e49d2a7c179b0270;hp=ce394eafbdb0bfe5145809b0cedcbc440a797b36;hpb=8886b47bca90cb0e84478d24e5c9afb3a9054b63;p=portal.git

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index ce394eaf..6cb1279a 100644
--- 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.5.0</version>
 	</parent>
 
 	<artifactId>portal-be-common</artifactId>
@@ -86,7 +86,7 @@
 			</plugin>
 
 		</plugins>
-
+	
 		<testResources>
 			<testResource>
 				<directory>src/test/java</directory>
@@ -117,6 +117,22 @@
 	</build>
 
 	<dependencies>
+	<dependency>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>aaf-cadi-aaf</artifactId>
+		<version>2.1.7</version>
+		<exclusions>
+			<exclusion>
+				<groupId>gso</groupId>
+				<artifactId>GLCookieDecryption</artifactId>
+			</exclusion>
+		</exclusions>
+	</dependency>
+	<dependency>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>aaf-cadi-core</artifactId>
+		<version>2.1.7</version>
+	</dependency>
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
@@ -397,12 +413,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- for generating PDF -->
-		<dependency>
-			<groupId>com.lowagie</groupId>
-			<artifactId>itext</artifactId>
-			<version>2.0.8</version>
-		</dependency>
 		<!-- Quartz -->
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -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.8</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>