From 3f6c499ae85897477bf98b3e644897c3c19bc3df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= <a_meszaros@apple.com>
Date: Mon, 22 Jun 2026 09:19:34 +0200
Subject: [PATCH] Upgrade to newest QOSDK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
---
 pom.xml                                       | 26 ++++++++++++-------
 .../GenericBulkDependentResource.java         |  9 ++++++-
 .../operator/glue/TestUtils.java              |  4 +--
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 42e9a230..537fbf6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,11 +17,11 @@
     <surefire-plugin.version>3.5.2</surefire-plugin.version>
     <sonar.organization>java-operator-sdk</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-    <fabric8-client.version>7.1.0</fabric8-client.version>
-    <quarkus.version>3.19.0</quarkus.version>
+    <fabric8-client.version>7.7.0</fabric8-client.version>
+    <quarkus.version>3.35.3</quarkus.version>
     <graalvm.version>24.1.2</graalvm.version>
     <mokito.version>5.11.0</mokito.version>
-    <qosdk.version>7.1.0</qosdk.version>
+    <qosdk.version>7.7.5</qosdk.version>
     <assertj.version>3.27.7</assertj.version>
     <spotless.version>2.43.0</spotless.version>
   </properties>
@@ -46,12 +46,6 @@
   </dependencyManagement>
 
   <dependencies>
-    <!--  TODO remove after released as part of QOSDK  -->
-    <dependency>
-      <groupId>io.javaoperatorsdk</groupId>
-      <artifactId>operator-framework-core</artifactId>
-      <version>5.0.4</version>
-    </dependency>
     <dependency>
       <groupId>io.quarkiverse.operatorsdk</groupId>
       <artifactId>quarkus-operator-sdk</artifactId>
@@ -142,10 +136,24 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire-plugin.version}</version>
         <configuration>
+          <!-- Mockito 5.18+ no longer self-attaches its inline agent on recent JDKs;
+               load it explicitly as a Java agent. -->
+          <argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
           <includes>
             <include>**/*Test.java</include>
           </includes>
diff --git a/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericBulkDependentResource.java b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericBulkDependentResource.java
index bbea509f..bf6a7a49 100644
--- a/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericBulkDependentResource.java
+++ b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericBulkDependentResource.java
@@ -16,7 +16,7 @@
 
 public class GenericBulkDependentResource extends
     GenericDependentResource implements
-    BulkDependentResource<GenericKubernetesResource, Glue> {
+    BulkDependentResource<GenericKubernetesResource, Glue, String> {
 
   public GenericBulkDependentResource(GenericTemplateHandler genericTemplateHandler,
       String desiredTemplate, String name,
@@ -49,4 +49,11 @@ public Map<String, GenericKubernetesResource> getSecondaryResources(Glue glue,
             r -> name.equals(r.getMetadata().getAnnotations().get(DEPENDENT_NAME_ANNOTATION_KEY)))
         .collect(Collectors.toMap(r -> r.getMetadata().getName(), r -> r));
   }
+
+  @Override
+  public void deleteTargetResource(Glue primary, GenericKubernetesResource resource, String key,
+      Context<Glue> context) {
+    context.getClient().resource(resource).delete();
+  }
+
 }
diff --git a/src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java b/src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java
index ea6bf0e5..e6e9fdf0 100644
--- a/src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java
+++ b/src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java
@@ -18,7 +18,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 import io.fabric8.kubernetes.client.utils.Serialization;
-import io.javaoperatorsdk.operator.ReconcilerUtils;
+import io.javaoperatorsdk.operator.ReconcilerUtilsInternal;
 import io.javaoperatorsdk.operator.glue.customresource.glue.Glue;
 import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator;
 
@@ -66,7 +66,7 @@ public static GenericKubernetesResource createOrUpdate(KubernetesClient client,
 
   public static void applyCrd(Class<? extends HasMetadata> resourceClass, KubernetesClient client,
       boolean test) {
-    applyCrd(ReconcilerUtils.getResourceTypeName(resourceClass), client, test);
+    applyCrd(ReconcilerUtilsInternal.getResourceTypeName(resourceClass), client, test);
   }
 
   @SafeVarargs