Skip to content

Commit 7280fe7

Browse files
authored
chore: update to SpringBoot v3.4.0 and related fixes (#192)
1 parent 239c193 commit 7280fe7

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<maven.compiler.target>17</maven.compiler.target>
5959
<maven.compiler.release>17</maven.compiler.release>
6060
<spotless.version>2.43.0</spotless.version>
61-
<spring-boot.version>3.3.6</spring-boot.version>
61+
<spring-boot.version>3.4.0</spring-boot.version>
6262
<josdk.version>5.0.0-beta1</josdk.version>
6363
<surefire.version>3.5.2</surefire.version>
6464
<fabric8-client.version>7.0.0</fabric8-client.version>

starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorHealthIndicatorAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
44
import org.springframework.context.annotation.Bean;
5-
import org.springframework.context.annotation.ComponentScan;
65
import org.springframework.context.annotation.Configuration;
6+
import org.springframework.context.annotation.Import;
77

88
import io.javaoperatorsdk.operator.Operator;
99

1010
@Configuration(proxyBeanMethods = false)
1111
@ConditionalOnBean(Operator.class)
12-
@ComponentScan("io.javaoperatorsdk.operator.springboot.starter")
12+
@Import(OperatorAutoConfiguration.class)
1313
public class OperatorHealthIndicatorAutoConfiguration {
1414

1515
@Bean

starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.springframework.beans.factory.config.BeanPostProcessor;
1111
import org.springframework.boot.test.context.SpringBootTest;
1212
import org.springframework.boot.test.context.TestConfiguration;
13-
import org.springframework.boot.test.mock.mockito.MockBean;
14-
import org.springframework.boot.test.mock.mockito.SpyBean;
1513
import org.springframework.context.annotation.Bean;
14+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
15+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
1616

1717
import io.fabric8.kubernetes.client.KubernetesClient;
1818
import io.javaoperatorsdk.operator.Operator;
@@ -41,7 +41,7 @@ public class AutoConfigurationTest {
4141
@Autowired
4242
private OperatorConfigurationProperties config;
4343

44-
@SpyBean
44+
@MockitoSpyBean
4545
private Operator operator;
4646

4747
@Autowired
@@ -53,7 +53,7 @@ public class AutoConfigurationTest {
5353
@Autowired
5454
private Consumer<ConfigurationServiceOverrider> compositeConfigurationServiceOverrider;
5555

56-
@MockBean
56+
@MockitoBean
5757
private Cloner cloner;
5858

5959
@Test

0 commit comments

Comments
 (0)