From be3dfad989c1c866e5374ba8c8cc0ce090c27278 Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Tue, 9 Dec 2025 17:26:53 +0100
Subject: [PATCH 1/7] Fix build issue with Java 21

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eb8ecc58..090f8cc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <version.junit.jupiter>5.7.0</version.junit.jupiter>
 
         <version.io.rest-assured>4.3.1</version.io.rest-assured>
-        <version.lombok>1.18.20</version.lombok>
+        <version.lombok>1.18.42</version.lombok>
         <version.org.hamcrest>1.3</version.org.hamcrest>
         <version.mockito.core>4.9.0</version.mockito.core>
         <version.logback>1.2.13</version.logback>

From 0885117a03c2febecd5b518d7714ea0312f11274 Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Thu, 11 Dec 2025 09:59:30 +0100
Subject: [PATCH 2/7] Prevent "java.lang.OutOfMemoryError: Java heap space"
 when running java-generator-maven-plugin

---
 provisioners/pom.xml                          | 84 ++++++++++++++++++-
 .../broker_activemqartemis_crd.yaml           |  0
 .../broker_activemqartemisaddress_crd.yaml    |  0
 .../broker_activemqartemisscaledown_crd.yaml  |  0
 .../broker_activemqartemissecurity_crd.yaml   |  0
 .../infinispan.org_backups.yaml               |  0
 .../infinispan.org_batches.yaml               |  0
 .../infinispan.org_caches.yaml                |  0
 .../infinispan.org_infinispans.yaml           |  0
 .../infinispan.org_restores.yaml              |  0
 .../keycloak.org_keycloakbackups_crd.yaml     |  0
 .../keycloak.org_keycloakclients_crd.yaml     |  0
 .../keycloak.org_keycloakrealms_crd.yaml      |  0
 .../keycloak.org_keycloaks_crd.yaml           |  0
 .../keycloak.org_keycloakusers_crd.yaml       |  0
 ...ycloakrealmimports.k8s.keycloak.org-v1.yml |  0
 .../keycloaks.k8s.keycloak.org-v1.yml         |  0
 ...er.opendatahub.io_datascienceclusters.yaml |  0
 ...ion.opendatahub.io_dscinitializations.yaml |  0
 ...atures.opendatahub.io_featuretrackers.yaml |  0
 ...ervices.platform.opendatahub.io_auths.yaml |  0
 ...s.platform.opendatahub.io_monitorings.yaml |  0
 .../wildfly.org_wildflyservers_crd.yaml       |  0
 23 files changed, 82 insertions(+), 2 deletions(-)
 rename provisioners/src/main/resources/crds/default/{ => broker_activemqartemis}/broker_activemqartemis_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => broker_activemqartemis}/broker_activemqartemisaddress_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => broker_activemqartemis}/broker_activemqartemisscaledown_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => broker_activemqartemis}/broker_activemqartemissecurity_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => infinispan}/infinispan.org_backups.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => infinispan}/infinispan.org_batches.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => infinispan}/infinispan.org_caches.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => infinispan}/infinispan.org_infinispans.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => infinispan}/infinispan.org_restores.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloak.org_keycloakbackups_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloak.org_keycloakclients_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloak.org_keycloakrealms_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloak.org_keycloaks_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloak.org_keycloakusers_crd.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloakrealmimports.k8s.keycloak.org-v1.yml (100%)
 rename provisioners/src/main/resources/crds/default/{ => keycloak}/keycloaks.k8s.keycloak.org-v1.yml (100%)
 rename provisioners/src/main/resources/crds/default/{ => opendatahub}/datasciencecluster.opendatahub.io_datascienceclusters.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => opendatahub}/dscinitialization.opendatahub.io_dscinitializations.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => opendatahub}/features.opendatahub.io_featuretrackers.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => opendatahub}/services.platform.opendatahub.io_auths.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => opendatahub}/services.platform.opendatahub.io_monitorings.yaml (100%)
 rename provisioners/src/main/resources/crds/default/{ => wildfly}/wildfly.org_wildflyservers_crd.yaml (100%)

diff --git a/provisioners/pom.xml b/provisioners/pom.xml
index fc44443d..5b3d51f8 100644
--- a/provisioners/pom.xml
+++ b/provisioners/pom.xml
@@ -232,13 +232,93 @@
                 <artifactId>java-generator-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>default-crd-generation</id>
+                        <id>default-crd-generation-broker_activemqartemis</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
                             <target>target/generated-sources</target>
-                            <source>src/main/resources/crds/default</source>
+                            <source>src/main/resources/crds/default/broker_activemqartemis</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-infinispan</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/infinispan</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-keycloak</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/keycloak</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-opendatahub</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/opendatahub</source>
+                            <!--
+                                This is needed to force the Java generator from CRD to stick with the original names
+                                for enums, and avoid to uppercase them, since this could generate duplicate names,
+                                as in https://github.com/infinispan/infinispan-operator/blob/2.3.4.Final/config/crd/bases/infinispan.org_infinispans.yaml#L1473-L1477
+                             -->
+                            <enumUppercase>false</enumUppercase>
+                            <!--
+                                The following is required in order to generate Sundrio and Lombok annotations
+                            -->
+                            <extraAnnotations>true</extraAnnotations>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-crd-generation-wildfly</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <target>target/generated-sources</target>
+                            <source>src/main/resources/crds/default/wildfly</source>
                             <!--
                                 This is needed to force the Java generator from CRD to stick with the original names
                                 for enums, and avoid to uppercase them, since this could generate duplicate names,
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemis_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemis_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemis_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemis_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemisaddress_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisaddress_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemisaddress_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisaddress_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemisscaledown_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisscaledown_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemisscaledown_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemisscaledown_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/broker_activemqartemissecurity_crd.yaml b/provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemissecurity_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/broker_activemqartemissecurity_crd.yaml
rename to provisioners/src/main/resources/crds/default/broker_activemqartemis/broker_activemqartemissecurity_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_backups.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_backups.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_backups.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_backups.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_batches.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_batches.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_batches.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_batches.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_caches.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_caches.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_caches.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_caches.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_infinispans.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_infinispans.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_infinispans.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_infinispans.yaml
diff --git a/provisioners/src/main/resources/crds/default/infinispan.org_restores.yaml b/provisioners/src/main/resources/crds/default/infinispan/infinispan.org_restores.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/infinispan.org_restores.yaml
rename to provisioners/src/main/resources/crds/default/infinispan/infinispan.org_restores.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakbackups_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakbackups_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakbackups_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakbackups_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakclients_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakclients_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakclients_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakclients_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakrealms_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakrealms_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakrealms_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakrealms_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloaks_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloaks_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloaks_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloaks_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloak.org_keycloakusers_crd.yaml b/provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakusers_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloak.org_keycloakusers_crd.yaml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloak.org_keycloakusers_crd.yaml
diff --git a/provisioners/src/main/resources/crds/default/keycloakrealmimports.k8s.keycloak.org-v1.yml b/provisioners/src/main/resources/crds/default/keycloak/keycloakrealmimports.k8s.keycloak.org-v1.yml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloakrealmimports.k8s.keycloak.org-v1.yml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloakrealmimports.k8s.keycloak.org-v1.yml
diff --git a/provisioners/src/main/resources/crds/default/keycloaks.k8s.keycloak.org-v1.yml b/provisioners/src/main/resources/crds/default/keycloak/keycloaks.k8s.keycloak.org-v1.yml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/keycloaks.k8s.keycloak.org-v1.yml
rename to provisioners/src/main/resources/crds/default/keycloak/keycloaks.k8s.keycloak.org-v1.yml
diff --git a/provisioners/src/main/resources/crds/default/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/provisioners/src/main/resources/crds/default/opendatahub/datasciencecluster.opendatahub.io_datascienceclusters.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/datasciencecluster.opendatahub.io_datascienceclusters.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/datasciencecluster.opendatahub.io_datascienceclusters.yaml
diff --git a/provisioners/src/main/resources/crds/default/dscinitialization.opendatahub.io_dscinitializations.yaml b/provisioners/src/main/resources/crds/default/opendatahub/dscinitialization.opendatahub.io_dscinitializations.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/dscinitialization.opendatahub.io_dscinitializations.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/dscinitialization.opendatahub.io_dscinitializations.yaml
diff --git a/provisioners/src/main/resources/crds/default/features.opendatahub.io_featuretrackers.yaml b/provisioners/src/main/resources/crds/default/opendatahub/features.opendatahub.io_featuretrackers.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/features.opendatahub.io_featuretrackers.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/features.opendatahub.io_featuretrackers.yaml
diff --git a/provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_auths.yaml b/provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_auths.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_auths.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_auths.yaml
diff --git a/provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_monitorings.yaml b/provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_monitorings.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/services.platform.opendatahub.io_monitorings.yaml
rename to provisioners/src/main/resources/crds/default/opendatahub/services.platform.opendatahub.io_monitorings.yaml
diff --git a/provisioners/src/main/resources/crds/default/wildfly.org_wildflyservers_crd.yaml b/provisioners/src/main/resources/crds/default/wildfly/wildfly.org_wildflyservers_crd.yaml
similarity index 100%
rename from provisioners/src/main/resources/crds/default/wildfly.org_wildflyservers_crd.yaml
rename to provisioners/src/main/resources/crds/default/wildfly/wildfly.org_wildflyservers_crd.yaml

From 09fdc8c188e8d6bd635ec7118514501351b1a03a Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Thu, 11 Dec 2025 10:30:02 +0100
Subject: [PATCH 3/7] Prevent "java.lang.OutOfMemoryError: Java heap space"
 when running java-generator-maven-plugin

---
 .mvn/jvm.config | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mvn/jvm.config

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 00000000..88216d55
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx3000m
\ No newline at end of file

From 6f90ff232e4d0702c907b35f863b5a6506a3d57a Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Thu, 11 Dec 2025 12:27:54 +0100
Subject: [PATCH 4/7] Prevent "java.lang.OutOfMemoryError: Java heap space"
 when running java-generator-maven-plugin

---
 .mvn/jvm.config | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .mvn/jvm.config

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
deleted file mode 100644
index 88216d55..00000000
--- a/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xmx3000m
\ No newline at end of file

From ccf0c43bdd48121df382b40918e76d50ed3ad57b Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Thu, 11 Dec 2025 12:31:13 +0100
Subject: [PATCH 5/7] Prevent "java.lang.OutOfMemoryError: Java heap space"
 when running java-generator-maven-plugin

---
 .mvn/jvm.config | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mvn/jvm.config

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 00000000..a8a74f2a
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx2048m -XX:MaxPermSize=512m

From ebbd1dd78b8f3fd1fdc9450cd777d8bc0a39544e Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Thu, 11 Dec 2025 12:36:33 +0100
Subject: [PATCH 6/7] Prevent "java.lang.OutOfMemoryError: Java heap space"
 when running java-generator-maven-plugin

---
 .mvn/jvm.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
index a8a74f2a..15e6c97b 100644
--- a/.mvn/jvm.config
+++ b/.mvn/jvm.config
@@ -1 +1 @@
--Xmx2048m -XX:MaxPermSize=512m
+-Xmx2048m
\ No newline at end of file

From e8a495850b1ff57fca78154cfb24181edef07233 Mon Sep 17 00:00:00 2001
From: Tommaso Borgato <tborgato@redhat.com>
Date: Thu, 11 Dec 2025 12:47:11 +0100
Subject: [PATCH 7/7] Prevent "java.lang.OutOfMemoryError: Java heap space"
 when running java-generator-maven-plugin

---
 .mvn/jvm.config | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .mvn/jvm.config

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
deleted file mode 100644
index 15e6c97b..00000000
--- a/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xmx2048m
\ No newline at end of file