Skip to content

Commit

Permalink
chore: update to SpringBoot v3.4.0 and related fixes (#192)
Browse files Browse the repository at this point in the history
  • Loading branch information
ebma16 authored Dec 11, 2024
1 parent 239c193 commit 7280fe7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<spotless.version>2.43.0</spotless.version>
<spring-boot.version>3.3.6</spring-boot.version>
<spring-boot.version>3.4.0</spring-boot.version>
<josdk.version>5.0.0-beta1</josdk.version>
<surefire.version>3.5.2</surefire.version>
<fabric8-client.version>7.0.0</fabric8-client.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

import io.javaoperatorsdk.operator.Operator;

@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(Operator.class)
@ComponentScan("io.javaoperatorsdk.operator.springboot.starter")
@Import(OperatorAutoConfiguration.class)
public class OperatorHealthIndicatorAutoConfiguration {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;

import io.fabric8.kubernetes.client.KubernetesClient;
import io.javaoperatorsdk.operator.Operator;
Expand Down Expand Up @@ -41,7 +41,7 @@ public class AutoConfigurationTest {
@Autowired
private OperatorConfigurationProperties config;

@SpyBean
@MockitoSpyBean
private Operator operator;

@Autowired
Expand All @@ -53,7 +53,7 @@ public class AutoConfigurationTest {
@Autowired
private Consumer<ConfigurationServiceOverrider> compositeConfigurationServiceOverrider;

@MockBean
@MockitoBean
private Cloner cloner;

@Test
Expand Down

0 comments on commit 7280fe7

Please sign in to comment.