Skip to content

Commit 39715e9

Browse files
authored
Update spring-statemachine to 4.0.0 (#5707)
This should make skipper to start and run. Simple ticktock stream shouldwork ok.
1 parent bed42bf commit 39715e9

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

spring-cloud-skipper/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525
<java.version>17</java.version>
2626

27-
<spring-statemachine.version>2.5.1</spring-statemachine.version>
27+
<spring-statemachine.version>4.0.0</spring-statemachine.version>
2828
<spring-cloud-deployer.version>2.9.3-SNAPSHOT</spring-cloud-deployer.version>
2929

3030
<zeroturnaround.version>1.15</zeroturnaround.version>

spring-cloud-skipper/spring-cloud-skipper-server-core/src/main/java/org/springframework/cloud/skipper/server/statemachine/StateMachineConfiguration.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2019 the original author or authors.
2+
* Copyright 2017-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
3030
import org.springframework.cloud.skipper.server.statemachine.SkipperStateMachineService.SkipperVariables;
3131
import org.springframework.context.annotation.Bean;
3232
import org.springframework.context.annotation.Configuration;
33-
import org.springframework.core.task.TaskExecutor;
3433
import org.springframework.statemachine.StateMachinePersist;
3534
import org.springframework.statemachine.config.EnableStateMachineFactory;
3635
import org.springframework.statemachine.config.StateMachineConfigurerAdapter;
@@ -76,9 +75,6 @@ private static long adjustTimerPeriod(HealthCheckProperties healthCheckPropertie
7675
@Configuration
7776
public static class SkipperStateMachineFactoryConfig extends StateMachineConfigurerAdapter<SkipperStates, SkipperEvents> {
7877

79-
@Autowired
80-
private TaskExecutor skipperStateMachineTaskExecutor;
81-
8278
@Autowired
8379
private ReleaseService releaseService;
8480

@@ -101,7 +97,6 @@ public static class SkipperStateMachineFactoryConfig extends StateMachineConfigu
10197
public void configure(StateMachineConfigurationConfigurer<SkipperStates, SkipperEvents> config) throws Exception {
10298
config
10399
.withConfiguration()
104-
.taskExecutor(skipperStateMachineTaskExecutor)
105100
// this is to simply add logging for state enters
106101
.listener(new StateMachineListenerAdapter<SkipperStates, SkipperEvents>() {
107102
@Override

spring-cloud-skipper/spring-cloud-skipper-server-core/src/main/java/org/springframework/cloud/skipper/server/statemachine/StateMachinePersistConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2018 the original author or authors.
2+
* Copyright 2017-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
1616
package org.springframework.cloud.skipper.server.statemachine;
1717

1818
import java.util.Map;
19+
import java.util.function.Function;
1920
import java.util.stream.Collectors;
2021

2122
import org.springframework.cloud.skipper.server.statemachine.SkipperStateMachineService.SkipperEvents;
@@ -29,7 +30,6 @@
2930
import org.springframework.statemachine.data.jpa.JpaStateMachineRepository;
3031
import org.springframework.statemachine.kryo.KryoStateMachineSerialisationService;
3132
import org.springframework.statemachine.persist.StateMachineRuntimePersister;
32-
import org.springframework.statemachine.support.Function;
3333
import org.springframework.util.ObjectUtils;
3434

3535
/**

0 commit comments

Comments
 (0)