From: Manoop Talasila <talasila@research.att.com>
Date: Wed, 28 Aug 2019 18:51:46 +0000 (+0000)
Subject: Merge "Portal Spring Boot Development"
X-Git-Tag: 3.2.0~108
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=ace89e59c9838b666ddd02c08fd5e39a94eee39a;hp=-c

Merge "Portal Spring Boot Development"
---

ace89e59c9838b666ddd02c08fd5e39a94eee39a
diff --combined pom.xml
index 87791b93,9e136c05..a6e369b9
--- a/pom.xml
+++ b/pom.xml
@@@ -22,14 -22,14 +22,15 @@@
  		<module>ecomp-portal-BE-os</module>
  		<module>ecomp-portal-FE-os</module>
  		<module>ecomp-portal-widget-ms</module>
+ 		<module>portal-BE</module>
  	</modules>
  
  	<properties>
  		<!-- Jenkins should invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
  		<build.number>0</build.number>
  		<epsdk.version>2.6.0-SNAPSHOT</epsdk.version>
 -		<springframework.version>4.2.3.RELEASE</springframework.version>
 +		<springframework.version>4.3.24.RELEASE</springframework.version>
 +		<springframework.security.version>4.2.13.RELEASE</springframework.security.version>
  		<hibernate.version>4.3.11.Final</hibernate.version>
  		<fasterxml.version>2.8.10</fasterxml.version>
  		<eelf.version>1.0.0</eelf.version>