chore: spring boot 3.2 (#113)

Signed-off-by: Attila Mészáros <[email protected]>
operator-framework · Dec 4, 2023 · 5c04b49 · 5c04b49
1 parent ffedea9
commit 5c04b49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
-        <spring-boot.version>3.1.5</spring-boot.version>
+        <spring-boot.version>3.2.0</spring-boot.version>
         <josdk.version>4.6.0</josdk.version>
         <surefire.version>3.2.2</surefire.version>
         <fabric8-client.version>6.9.2</fabric8-client.version>

diff --git a/...c/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java b/...c/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java
@@ -10,6 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -88,7 +89,7 @@ public OperatorStarter operatorStarter(Operator operator, CRDApplier applier) {
   @ConditionalOnMissingBean(Operator.class)
   public Operator operator(
       BiConsumer<Operator, Reconciler<?>> reconcilerRegisterer,
-      Consumer<ConfigurationServiceOverrider> compositeConfigurationServiceOverrider,
+      @Qualifier("compositeConfigurationServiceOverrider") Consumer<ConfigurationServiceOverrider> compositeConfigurationServiceOverrider,
       KubernetesClient kubernetesClient,
       List<Reconciler<?>> reconcilers) {