LEXEVS-5246. Resolving dependency and spring injection issues

lexevs-dao/ivy.xml

@@ -31,7 +31,7 @@
 		<dependency org="org.codehaus.castor" name="castor-xml" rev="1.3.1" conf="default"/>
 		<dependency org="org.easymock" name="easymock" rev="2.4" conf="default"/> 
 		<dependency org="org.easymock" name="easymockclassextension" rev="2.4" conf="default"/> 
-		<dependency org="asm" name="asm" rev="3.1" conf="default"/>
+		<dependency org="org.ow2.asm" name="asm" rev="9.3" conf="default"/> 
 		<dependency org="cglib" name="cglib" rev="2.2" conf="default" />
 		<dependency org="org.aspectj" name="aspectjrt" rev="1.7.2" conf="default"/>
 		<dependency org="org.aspectj" name="aspectjweaver" rev="1.7.2" conf="default"/>
@@ -46,6 +46,7 @@
 		<dependency org="org.springframework" name="spring-beans" rev="5.3.19" conf="default" />
 		<dependency org="org.springframework" name="spring-jdbc" rev="5.3.19" conf="default" />
 		<dependency org="org.springframework" name="spring-orm" rev="5.3.19" conf="default" />
+		<dependency org="org.springframework" name="spring-orm" type="sources" rev="5.3.19" conf="default"/>
 		<dependency org="org.springframework.retry" name="spring-retry" rev="1.3.2" conf="default" />
 		<dependency org="org.springframework" name="spring-tx" rev="5.3.19" conf="default" />
 		<dependency org="org.springframework" name="spring-asm" rev="3.1.4.RELEASE" conf="default" />
@@ -58,8 +59,9 @@
 		<dependency org="org.mybatis" name="mybatis" rev="3.5.9" conf="default" />
 		<dependency org="org.mybatis.dynamic-sql" name="mybatis-dynamic-sql" rev="1.4.0" conf="default" />
 		<dependency org="org.hibernate" name="hibernate-core" rev="5.6.8.Final" conf="default" />
-		<dependency org="org.hibernate.common" name="hibernate-commons-annotations" rev="4.0.0.Final" conf="default" />
-		<dependency org="org.jboss.logging" name="jboss-logging" rev="3.1.2.GA" conf="default" />
+		<dependency org="net.bytebuddy" name="byte-buddy-dep" rev="1.12.9" conf="default" />
+		<dependency org="org.hibernate.common" name="hibernate-commons-annotations" rev="5.1.2.Final" conf="default" />
+		<dependency org="org.jboss.logging" name="jboss-logging" rev="3.4.3.Final" conf="default" />
 		<dependency org="org.hibernate.javax.persistence" name="hibernate-jpa-2.1-api" rev="1.0.2.Final" conf="default" />
 		<dependency org="org.hibernate" name="hibernate-ehcache" rev="5.6.8.Final" conf="default" />
 		<dependency org="javax.annotation" name="jsr250-api" rev="1.0" conf="default" />
@@ -82,7 +84,7 @@
    		<dependency org="commons-io" name="commons-io" rev="2.6" conf="default" />
    	    <dependency org="commons-dbcp" name="commons-dbcp" rev="1.4" conf="default" />
    	    <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="default"/>	
-   	    <dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default->*"/>  
+   	   	<dependency org="javax.persistence" name="javax.persistence-api" rev="2.2" conf="default->*"/>  
    	    <dependency org="org.mockito" name="mockito-all" rev="1.10.8" conf="default"/>
    	    <dependency org="org.jdom" name="jdom" rev="1.1" conf="default->*"/>
   		<dependency org="commons-codec" name="commons-codec" rev="1.10" conf="default"/>
@@ -99,13 +101,15 @@
 		<!-- https://mvnrepository.com/artifact/com.arangodb/velocypack -->
 		<dependency org="com.arangodb" name="velocypack" rev="1.4.2" conf="default"/>
 		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
-		<dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="2.10.0.pr2" conf="default"/>
+		<dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="2.13.2" conf="default"/>
 		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
-		<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.10.0.pr2" conf="default"/>
+		<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.13.2.2" conf="default"/>
 		<!-- https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-core-asl -->
 		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.9.13" conf="default"/>
 		<!-- https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
 		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.13" conf="default"/>
+		<dependency org="com.fasterxml" name="classmate" rev="1.5.1" conf="default"/>
+
 
    	 </dependencies>
 </ivy-module>

lexevs-dao/src/main/resources/lexevsDao.xml

@@ -38,7 +38,8 @@
 	</bean>
 
     <bean id="abstractIbatisDao" abstract="true">
-    	<property name="sqlMapClientTemplate" ref="sqlMapClientTemplate"/>
+    	<property name="sqlSessionTemplate" ref="sqlSessionTemplate"/>
+		<property name="sqlSessionBatchTemplate" ref="sqlSessionBatchTemplate"/>
 		<property name="prefixResolver" ref="defaultPrefixResolver"/>
 		<property name="primaryKeyIncrementer" ref="primaryKeyIncrementer"/>
     </bean>
@@ -457,11 +458,6 @@
 			<ref bean="dataSource" />
 		</property>
 	</bean>
-
-	<bean id="sqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
-		<property name="dataSource" ref="dataSource"/>
-		<property name="sqlMapClient" ref="sqlMap"/>
-	</bean>
 
 	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
    		<constructor-arg ref="sqlSessionFactory" />
@@ -477,8 +473,6 @@
 		<property name="mapperLocations" value="classpath*:resources/ibatis.v20/**/*.xml" />
 	</bean>
 
-	<bean id="executorType" class="org.apache.ibatis.session.ExecutorType"/>
-
     <bean id="abstractResourceManagerVariableFactory" 
      	class="org.lexevs.system.constants.IndividualVariableFactory"
      	abstract="true">
@@ -498,6 +492,10 @@
 	</bean>
 
 	<bean id="hibernateRegistryDao" class="org.lexevs.dao.database.hibernate.registry.HibernateRegistryDao">
+		<property name="hibernateTemplate" ref="hibernateTemplate"/>
+	</bean>
+
+	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate5.HibernateTemplate">
 		<property name="sessionFactory" ref="registrySessionFactory"/>
 	</bean>