From 5c1b637e9dca9c4dbfdb3d46115f241d57be029b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Str=C3=A4hle?= <bernhard.straehle@gmail.com>
Date: Fri, 29 Nov 2024 23:07:12 +0100
Subject: [PATCH] Fix CRD-Generator tests and examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernhard Strähle <bernhard.straehle@gmail.com>
---
 bootstrapper-maven-plugin/src/main/resources/templates/pom.xml | 3 ---
 operator-framework/pom.xml                                     | 2 ++
 .../javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java  | 2 +-
 .../operator/config/runtime/TestCustomResource.java            | 2 +-
 sample-operators/mysql-schema/pom.xml                          | 3 ---
 sample-operators/tomcat-operator/pom.xml                       | 3 ---
 sample-operators/webpage/pom.xml                               | 3 ---
 7 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml b/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
index ea7699dea8..01d9f11b8a 100644
--- a/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
+++ b/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
@@ -89,9 +89,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
index dac36571da..1aceaa6556 100644
--- a/operator-framework/pom.xml
+++ b/operator-framework/pom.xml
@@ -119,7 +119,9 @@
             <goals>
               <goal>generate</goal>
             </goals>
+            <phase>process-test-classes</phase>
             <configuration>
+              <classesToScan>${project.build.testOutputDirectory}</classesToScan>
               <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
             </configuration>
           </execution>
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java
index 09b52f1078..5325742d5f 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java
@@ -43,7 +43,7 @@ void correctlyAppliesManuallySpecifiedCRD() {
   @Group("crd.example")
   @Version("v1")
   @Kind("Test")
-  private static class TestCR extends CustomResource<Void, Void> implements Namespaced {
+  public static class TestCR extends CustomResource<Void, Void> implements Namespaced {
   }
 
   @ControllerConfiguration
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java
index 0f94ae92e4..1a75ffaa94 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java
@@ -7,5 +7,5 @@
 
 @Group("sample.javaoperatorsdk")
 @Version("v1")
-class TestCustomResource extends CustomResource<Void, Void> implements Namespaced {
+public class TestCustomResource extends CustomResource<Void, Void> implements Namespaced {
 }
diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
index 84ab638cd0..0017ac74ed 100644
--- a/sample-operators/mysql-schema/pom.xml
+++ b/sample-operators/mysql-schema/pom.xml
@@ -89,9 +89,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
index 724873b78d..471d43d4ed 100644
--- a/sample-operators/tomcat-operator/pom.xml
+++ b/sample-operators/tomcat-operator/pom.xml
@@ -115,9 +115,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml
index 96932c7fcc..cda7e1e46f 100644
--- a/sample-operators/webpage/pom.xml
+++ b/sample-operators/webpage/pom.xml
@@ -86,9 +86,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>