Merge "spring-framework jar version upgrade"

6 files changed, 10 insertions, 12 deletions

diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml
index 1cf2dadf..39cce474 100644
--- a/ecomp-sdk/epsdk-aaf/pom.xml
+++ b/ecomp-sdk/epsdk-aaf/pom.xml
@@ -19,7 +19,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<springframework.version>4.3.24.RELEASE</springframework.version>
 	</properties>
 	<dependencies>
 		<!-- internal -->
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java
index da3dc60a..fe4bcae7 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/conf/HibernateConfiguration.java
@@ -52,8 +52,8 @@ import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java
index 9a0003d4..36f766c8 100644
--- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/DataAccessServiceImplTest.java
@@ -43,8 +43,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
+import org.hibernate.query.Query;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Criterion;
@@ -218,7 +218,7 @@ public class DataAccessServiceImplTest {
 	@Test
 	public void getLookupListTest() {
 		Session mockedSession = Mockito.mock(Session.class);
-		SQLQuery mockSQLQuery = Mockito.mock(SQLQuery.class);
+		NativeQuery mockSQLQuery = Mockito.mock(NativeQuery.class);
 		Mockito.when(sessionFactory.getCurrentSession()).thenReturn(mockedSession);
 		Mockito.when(mockedSession.createSQLQuery(Mockito.anyString())).thenReturn(mockSQLQuery);
 		Mockito.when(mockSQLQuery.list()).thenReturn(new ArrayList());
@@ -229,7 +229,7 @@ public class DataAccessServiceImplTest {
 	@Test
 	public void executeSQLQueryWithoutRangeTest() {
 		Session mockedSession = Mockito.mock(Session.class);
-		SQLQuery mockSQLQuery = Mockito.mock(SQLQuery.class);
+		NativeQuery mockSQLQuery = Mockito.mock(NativeQuery.class);
 		Mockito.when(sessionFactory.getCurrentSession()).thenReturn(mockedSession);
 		Mockito.when(mockedSession.createSQLQuery(Mockito.anyString())).thenReturn(mockSQLQuery);
 		Mockito.when(mockSQLQuery.addEntity("org.onap.portalsdk.core.domain.support.domainvo", DomainVo.class))
@@ -241,7 +241,7 @@ public class DataAccessServiceImplTest {
 	@Test
 	public void executeSQLQueryTest() {
 		Session mockedSession = Mockito.mock(Session.class);
-		SQLQuery mockSQLQuery = Mockito.mock(SQLQuery.class);
+		NativeQuery mockSQLQuery = Mockito.mock(NativeQuery.class);
 		Mockito.when(sessionFactory.getCurrentSession()).thenReturn(mockedSession);
 		Mockito.when(mockedSession.createSQLQuery(Mockito.anyString())).thenReturn(mockSQLQuery);
 		Mockito.when(mockSQLQuery.addEntity("org.onap.portalsdk.core.domain.support.domainvo", DomainVo.class))
diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 553dcf8a..f76c0d30 100644
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -18,7 +18,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<springframework.version>4.3.20.RELEASE</springframework.version>
 		<jersey1.version>1.19.4</jersey1.version>
 		<jaxrs.version>2.0.1</jaxrs.version>
 		<cassandra.version>3.0.0</cassandra.version>
diff --git a/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImplTest.java b/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImplTest.java
index 8c2df7ed..af3f1d08 100644
--- a/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImplTest.java
+++ b/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImplTest.java
@@ -40,7 +40,7 @@ package org.onap.portalsdk.workflow.dao;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.Query;
+import org.hibernate.query.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index d65b84a8..07039127 100644
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -34,8 +34,8 @@
 
 	<properties>
 		<encoding>UTF-8</encoding>
-		<springframework.version>4.3.24.RELEASE</springframework.version>
-		<hibernate.version>4.3.11.Final</hibernate.version>
+		<springframework.version>5.2.8.RELEASE</springframework.version>
+		<hibernate.version>5.4.3.Final</hibernate.version>
 		<skiptests>false</skiptests>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>