Update Spring version (#100)

* Update Spring version to 2.4.13
AzBuilder · Nov 25, 2021 · 22cfcc4 · 22cfcc4
1 parent 750ee45
commit 22cfcc4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...c/main/java/org/azbuilder/api/plugin/scheduler/configuration/QuartzAutoConfiguration.java b/...c/main/java/org/azbuilder/api/plugin/scheduler/configuration/QuartzAutoConfiguration.java
@@ -38,12 +38,12 @@ protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
     }
 
     @Bean
-    public SchedulerFactoryBean schedulerFactoryBean(ApplicationContext applicationContext, DataSource quartzDataSource, DataSourceConfigurationProperties dataSourceConfigurationProperties) {
+    public SchedulerFactoryBean schedulerFactoryBean(ApplicationContext applicationContext, DataSource dataSource, DataSourceConfigurationProperties dataSourceConfigurationProperties) {
         SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean();
         schedulerFactoryBean.setJobFactory(new AutowireCapableBeanJobFactory(applicationContext.getAutowireCapableBeanFactory()));
-        schedulerFactoryBean.setDataSource(quartzDataSource);
+        schedulerFactoryBean.setDataSource(dataSource);
         Properties properties = new Properties();
-        properties.put("org.quartz.jobStore.class","org.quartz.impl.jdbcjobstore.JobStoreTX");
+        properties.put("org.quartz.jobStore.class","org.springframework.scheduling.quartz.LocalDataSourceJobStore");
         properties.put("org.quartz.jobStore.isClustered","true");
         properties.put("org.quartz.scheduler.instanceId","AUTO");
         switch(dataSourceConfigurationProperties.getType()){
@@ -64,6 +64,7 @@ public SchedulerFactoryBean schedulerFactoryBean(ApplicationContext applicationC
     @Bean
     public Scheduler scheduler(SchedulerFactoryBean schedulerFactoryBean) throws SchedulerException {
         Scheduler scheduler = schedulerFactoryBean.getScheduler();
+
         scheduler.start();
         return scheduler;
     }

diff --git a/api/src/test/resources/application-test.properties b/api/src/test/resources/application-test.properties
@@ -55,4 +55,5 @@ org.terrakube.hostname=localhost:8080
 ##############
 #QUARTZ SETUP#
 ##############
-spring.quartz.job-store-type=memory
+spring.quartz.job-store-type=jdbc
+spring.quartz.jdbc.initialize-schema=never
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.11</version>
+        <version>2.4.13</version>
     </parent>
 
     <groupId>org.azbuilder.api</groupId>
@@ -15,7 +15,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>1.6.3</revision>
+        <revision>1.6.4</revision>
         <sonar.organization>azbuilder</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.project.key>AzBuilder_azb-server</sonar.project.key>