X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fpom.xml;h=1a04c40d69efb13eb7b7b4e234db12314d7ec666;hb=refs%2Fchanges%2F00%2F97300%2F1;hp=d7917795a5cdc6105578ae437abfd39735483609;hpb=21a8761f684745bb300e075c7e98ad897ace9eed;p=portal.git

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index d7917795..1a04c40d 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</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>portal-be-common</artifactId>
@@ -86,7 +86,7 @@
 			</plugin>
 
 		</plugins>
-
+	
 		<testResources>
 			<testResource>
 				<directory>src/test/java</directory>
@@ -117,10 +117,26 @@
 	</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>
-			<version>${eelf.version}</version>
+			<version>1.0.0-oss</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -163,19 +179,20 @@
 			<artifactId>spring-test</artifactId>
 			<version>${springframework.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.4.0-b180830.0359</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<version>1.3.1.RELEASE</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
 					<artifactId>log4j-over-slf4j</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<!-- Hibernate -->
@@ -187,7 +204,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>5.1.3.Final</version>
+			<version>5.2.5.Final</version>
 		</dependency>
 		<!-- hibernate-core depends on dom4j, which has optional dependencies. 
 			On jenkins, contrary to doc, mvn 3.0.5 packages the optional dependencies 
@@ -239,9 +256,19 @@
 			<version>2.3.1</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
+    		<groupId>org.apache.taglibs</groupId>
+    		<artifactId>taglibs-standard-spec</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.taglibs</groupId>
+    		<artifactId>taglibs-standard-impl</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.taglibs</groupId>
+   			<artifactId>taglibs-standard-jstlel</artifactId>
+    		<version>1.2.5</version>
 		</dependency>
 		<!-- Apache Tiles -->
 		<dependency>
@@ -257,7 +284,7 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>3.0.0-milestone1</version>
+			<version>3.1.16</version>
 		</dependency>
 		<!-- Mapper -->
 		<dependency>
@@ -284,12 +311,18 @@
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
-			<version>2.2.0</version>
+			<version>6.8.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.lucene</groupId>
+					<artifactId>lucene-queryparser</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.searchbox</groupId>
 			<artifactId>jest</artifactId>
-			<version>2.0.0</version>
+			<version>5.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.jcs</groupId>
@@ -305,7 +338,7 @@
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-websocket</artifactId>
-			<version>8.0.28</version>
+			<version>8.0.52</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -328,7 +361,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>3.5-FINAL</version>
+			<version>3.17</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -343,7 +376,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
-			<version>3.5-FINAL</version>
+			<version>3.17</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -358,7 +391,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-scratchpad</artifactId>
-			<version>3.5-FINAL</version>
+			<version>3.17</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -385,12 +418,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>
@@ -406,8 +433,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>1.45</version>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.60</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
@@ -435,6 +462,10 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-log4j12</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpclient</artifactId>
+				</exclusion>	
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -475,6 +506,12 @@
 			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-common</artifactId>
 			<version>${epsdk.version}</version>
+			 <exclusions>
+				<exclusion>
+             		<groupId>commons-beanutils</groupId>
+             		<artifactId>commons-beanutils-core</artifactId>
+            	 </exclusion>
+              </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.portal.sdk</groupId>
@@ -493,7 +530,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.2</version>
+			<version>4.5.3</version>
 		</dependency>
 		<!-- for testing -->
 		<dependency>
@@ -525,22 +562,22 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.2</version>
+			<version>1.9.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ecwid.consul</groupId>
 			<artifactId>consul-api</artifactId>
-			<version>1.2.1</version>
+			<version>1.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.orbitz.consul</groupId>
 			<artifactId>consul-client</artifactId>
-			<version>0.13.8</version>
+			<version>1.3.6</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.3</version>
+			<version>1.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
@@ -566,12 +603,30 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.6.3</version>
+			<version>2.10.0</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.glassfish.web/javax.el -->
+		<dependency>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>javax.el</artifactId>
+			<version>2.2.6</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/javax.el/el-api -->
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>2.2.1-b04</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.12.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.connectors</groupId>
 			<artifactId>jersey-jetty-connector</artifactId>
-			<version>2.23.1</version>
+			<version>2.28</version>
 		</dependency>
 		<!-- Jacoco for offline instrumentation -->
 		<dependency>
@@ -583,24 +638,122 @@
 		<dependency>
              <groupId>org.owasp.esapi</groupId>
              <artifactId>esapi</artifactId>
-             <version>2.1.0.1</version>
+             <version>2.2.0.0</version>
+             <exclusions>
+				<exclusion>
+             		<groupId>commons-beanutils</groupId>
+             		<artifactId>commons-beanutils-core</artifactId>
+            	 </exclusion>
+            	 <exclusion>
+             		<groupId>commons-httpclient</groupId>
+             		<artifactId>commons-httpclient</artifactId>
+            	 </exclusion>
+				 <exclusion>
+        			<groupId>org.beanshell</groupId>
+            		<artifactId>bsh-core</artifactId>
+				 </exclusion>
+              </exclusions>
         </dependency>
         <dependency>
 		    <groupId>org.springframework.security</groupId>
 		    <artifactId>spring-security-core</artifactId>
-		    <version>${springframework.version}</version>
+		    <version>${springframework.security.version}</version>
 	    </dependency>
 	    <dependency>
 	        <groupId>org.springframework.security</groupId>
 	        <artifactId>spring-security-web</artifactId>
-	        <version>${springframework.version}</version>
+	        <version>${springframework.security.version}</version>
         </dependency>
 	    <dependency>
 		    <groupId>org.springframework.security</groupId>
 		    <artifactId>spring-security-config</artifactId>
-		    <version>${springframework.version}</version>
+		    <version>${springframework.security.version}</version>
+	    </dependency>
+		<dependency>
+    		<groupId>com.thoughtworks.xstream</groupId>
+    		<artifactId>xstream</artifactId>
+    		<version>1.4.11</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+    		<groupId>commons-collections</groupId>
+    		<artifactId>commons-collections</artifactId>
+    		<version>3.2.2</version>
+		</dependency>
+		<dependency>
+    		<groupId>xalan</groupId>
+    		<artifactId>xalan</artifactId>
+    		<version>2.7.2</version>
+		</dependency>
+	    		<!-- Music -->
+	    <dependency>
+		    <groupId>org.onap.music</groupId>
+		    <artifactId>MUSIC</artifactId>
+		    <version>2.5.10</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>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.25</version>
+		</dependency>
 	</dependencies>
 
 </project>