downgrade spring 6.1.4 (#1477)

pom.xml

@@ -92,7 +92,7 @@
         <shedlock.version>5.13.0</shedlock.version>
         <slf4j.version>2.0.12</slf4j.version>
         <solrj.version>1.4.1</solrj.version>
-        <spring.version>6.1.8</spring.version>
+        <spring.version>6.1.4</spring.version>
         <spock.version>2.3-groovy-3.0</spock.version>
         <stax-utils.version>20070216</stax-utils.version>
 

whois-commons/src/main/resources/applicationContext-commons.xml

@@ -3,15 +3,15 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:cache="http://www.springframework.org/schema/cache" xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:cache="http://www.springframework.org/schema/cache"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/tx
                            http://www.springframework.org/schema/tx/spring-tx.xsd
                            http://www.springframework.org/schema/context
                            http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/cache
-                           http://www.springframework.org/schema/cache/spring-cache.xsd http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd">
+                           http://www.springframework.org/schema/cache/spring-cache.xsd">
 
     <!-- TODO: this is loaded many many times on context init, which slows down startup process -->
     <!-- @Transactional CAN be used on private methods with mode="aspectj". However, annotations on interfaces will NOT work! -->
@@ -21,7 +21,7 @@
     <context:component-scan base-package="net.ripe.db.whois.common"/>
 
     <context:annotation-config/>
-    <cache:annotation-driven mode="aspectj"/>
+    <cache:annotation-driven/>
 
 <!--    <aop:aspectj-autoproxy proxy-target-class="true"/>-->
 

whois-scheduler/src/main/java/net/ripe/db/whois/scheduler/SchedulerConfig.java

@@ -8,6 +8,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.TaskScheduler;
@@ -17,9 +18,9 @@
 import javax.sql.DataSource;
 
 @Configuration
-// @EnableAspectJAutoProxy(proxyTargetClass = true)
+@EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableScheduling
-@EnableSchedulerLock(defaultLockAtMostFor="23h", mode = AdviceMode.ASPECTJ)
+@EnableSchedulerLock(defaultLockAtMostFor="23h")
 @ImportResource(value = "classpath:applicationContext-api.xml")
 @ComponentScan(basePackages="net.ripe.db.whois.scheduler")
 public class SchedulerConfig {