diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml
index a2e2da53fc..d0d69e5347 100644
--- a/.github/workflows/operator-ci.yml
+++ b/.github/workflows/operator-ci.yml
@@ -76,7 +76,7 @@ jobs:
run: |
eval $(minikube -p minikube docker-env)
(cd quarkus/container && docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t keycloak:${{ steps.vars.outputs.version }})
- (cd operator/app && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
+ (cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
- name: Test operator running locally
run: |
@@ -121,7 +121,7 @@ jobs:
run: |
eval $(minikube -p minikube docker-env)
(cd quarkus/container && docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t keycloak:${{ steps.vars.outputs.version }})
- (cd operator/app && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
+ (cd operator && ./scripts/build-testing-docker-images.sh ${{ steps.vars.outputs.version }} keycloak custom-keycloak)
- name: Test operator running in cluster
run: |
@@ -163,7 +163,7 @@ jobs:
- name: Install Yq
run: sudo snap install yq
- name: Install OLM
- working-directory: operator/app
+ working-directory: operator
run: ./scripts/install-olm.sh
- name: Download keycloak distribution
id: download-keycloak-dist
@@ -172,13 +172,13 @@ jobs:
name: keycloak-distribution
path: quarkus/container
- name: Arrange OLM test installation
- working-directory: operator/app
+ working-directory: operator
run: |
eval $(minikube -p minikube docker-env)
./scripts/olm-testing.sh ${GITHUB_SHA::6}
- name: Deploy an example Keycloak and wait for it to be ready
- working-directory: operator/app
+ working-directory: operator
run: |
kubectl apply -f src/main/resources/example-postgres.yaml
./scripts/check-crds-installed.sh
diff --git a/operator/app/.gitignore b/operator/.gitignore
similarity index 100%
rename from operator/app/.gitignore
rename to operator/.gitignore
diff --git a/operator/app/pom.xml b/operator/app/pom.xml
deleted file mode 100644
index 095ae4165e..0000000000
--- a/operator/app/pom.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
- 4.0.0
-
-
- keycloak-operator-parent
- org.keycloak
- 999-SNAPSHOT
- ../pom.xml
-
-
- Keycloak Operator
- keycloak-operator
-
-
-
- 4.7.5.Final
- 1.5.4.Final-format-001
- 2.13.3
- 2.13.3
- 5.12.2
-
- 3.8.1
- true
- 11
- 11
- 11
- UTF-8
- UTF-8
- 3.0.8
- 2.7.6.Final
- keycloak
- registry.access.redhat.com/ubi8/openjdk-11-runtime
-
-
-
-
-
- io.quarkiverse.operatorsdk
- quarkus-operator-sdk-bom
- ${quarkus.operator.sdk.version}
- pom
- import
-
-
-
-
-
-
-
-
- io.fabric8
- crd-generator-api
- ${kubernetes-client.version}
-
-
- io.fabric8
- crd-generator-apt
- ${kubernetes-client.version}
-
-
-
-
- io.quarkiverse.operatorsdk
- quarkus-operator-sdk
-
-
- io.quarkiverse.operatorsdk
- quarkus-operator-sdk-csv-generator
-
-
- io.quarkus
- quarkus-resteasy-jackson
-
-
- io.quarkus
- quarkus-rest-client
-
-
- io.quarkus
- quarkus-rest-client-jackson
-
-
- io.quarkus
- quarkus-openshift
-
-
- io.quarkus
- quarkus-minikube
-
-
- io.quarkus
- quarkus-kubernetes-client
-
-
-
-
-
- io.quarkiverse.operatorsdk
- quarkus-operator-sdk-csv-generator-deployment
- provided
-
-
-
-
- org.keycloak
- keycloak-config-api
-
-
-
-
- io.quarkus
- quarkus-test-common
- test
-
-
- io.quarkus
- quarkus-junit5
- test
-
-
- org.assertj
- assertj-core
- ${assertj-core.version}
- test
-
-
- org.awaitility
- awaitility
- ${awaitility.version}
- test
-
-
- io.rest-assured
- rest-assured
- test
-
-
-
-
-
-
-
- io.quarkus
- quarkus-maven-plugin
- ${quarkus.version}
-
-
- maven-compiler-plugin
- ${compiler-plugin.version}
-
-
-
-
-
- org.keycloak
- keycloak-operator-maven-plugin
- ${project.version}
-
-
- generate-server-config
- generate-sources
-
- keycloak-operator-codegen
-
-
-
-
-
-
- io.quarkus
- quarkus-maven-plugin
- ${quarkus.version}
-
-
-
- build
-
-
-
-
-
- maven-resources-plugin
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${basedir}/target
-
-
- src/main/kubernetes
- true
-
-
-
-
-
- import-keycloak-core
- validate
-
- copy-resources
-
-
- ${basedir}/target/keycloak-core
-
-
- ${basedir}/../../core/src/main/java
- true
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.2.0
-
-
- generate-sources
-
- add-source
-
-
-
-
-
-
-
-
-
-
-
-
- exec-maven-plugin
- org.codehaus.mojo
- 1.6.0
-
-
- patch-core-sources
- generate-sources
-
- exec
-
-
- ${basedir}/patch-sources.sh
-
-
-
-
-
- maven-surefire-plugin
-
-
-
- default-test
- verify
-
- test
-
-
-
-
-
-
-
-
-
-
- native
-
- native
-
-
-
-
diff --git a/operator/maven-plugin/pom.xml b/operator/maven-plugin/pom.xml
deleted file mode 100644
index 8166c4f15d..0000000000
--- a/operator/maven-plugin/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
- keycloak-operator-parent
- org.keycloak
- 999-SNAPSHOT
- ../pom.xml
-
-
- 4.0.0
-
- Keycloak Operator Maven Plugin
- keycloak-operator-maven-plugin
- Keycloak Operator Maven Plugin
- maven-plugin
-
-
-
-
- org.apache.maven
- maven-plugin-api
- 3.6.3
-
-
- org.apache.maven.plugin-tools
- maven-plugin-annotations
- 3.6.0
- provided
-
-
- org.apache.maven
- maven-project
- 2.2.1
-
-
-
-
- org.keycloak
- keycloak-config-api
-
-
-
-
- com.github.javaparser
- javaparser-core
-
-
-
-
diff --git a/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/CodegenMojo.java b/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/CodegenMojo.java
deleted file mode 100644
index 5d4bb27fb1..0000000000
--- a/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/CodegenMojo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.keycloak.operator.maven;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-import java.io.File;
-
-@Mojo(name = "keycloak-operator-codegen", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
-public class CodegenMojo extends AbstractMojo {
-
- @Parameter(property = "operator.codegen.target", defaultValue = "${basedir}/target/generated-sources/java")
- private File target;
-
- @Override
- public void execute() throws MojoExecutionException, MojoFailureException {
- try {
- Log log = getLog();
-
- ServerConfigGen serverConfigGen = new ServerConfigGen();
-
- serverConfigGen.generate(log, target);
- } catch (Exception e) {
- e.printStackTrace();
- throw new MojoFailureException("Failed to generate code", e);
- }
- }
-}
diff --git a/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/ServerConfigGen.java b/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/ServerConfigGen.java
deleted file mode 100644
index fcc996a13b..0000000000
--- a/operator/maven-plugin/src/main/java/org/keycloak/operator/maven/ServerConfigGen.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.keycloak.operator.maven;
-
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.Modifier;
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
-import com.github.javaparser.ast.body.FieldDeclaration;
-import com.github.javaparser.ast.expr.StringLiteralExpr;
-import com.github.javaparser.utils.StringEscapeUtils;
-import org.apache.maven.plugin.logging.Log;
-import org.keycloak.config.AllOptions;
-import org.keycloak.config.Option;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-public class ServerConfigGen {
-
- public static final String ANNOTATION_JSON_PROPERTY = "com.fasterxml.jackson.annotation.JsonProperty";
- public static final String ANNOTATION_JSON_PROPERTY_DESCRIPTION = "com.fasterxml.jackson.annotation.JsonPropertyDescription";
-
- public void generate(Log log, File destination) {
- String className = "ServerConfig";
- String[] packageName = new String[]{"org", "keycloak", "operator", "codegen", "configuration"};
- CompilationUnit cu = new CompilationUnit();
- cu.setPackageDeclaration(String.join(".", packageName));
-
- ClassOrInterfaceDeclaration serverConfig = cu.addClass(className);
-
- Path dest = Paths.get(destination.getAbsolutePath(), packageName);
- dest.toFile().mkdirs();
-
- AllOptions.ALL_OPTIONS.forEach(o -> {
- if (o.getSupportedRuntimes().contains(Option.Runtime.OPERATOR)) {
- String fieldName = toCamelCase(o.getKey());
-
- FieldDeclaration field = serverConfig.addField(o.getType().getCanonicalName(), fieldName, Modifier.Keyword.PRIVATE);
- field.addSingleMemberAnnotation(
- ANNOTATION_JSON_PROPERTY,
- new StringLiteralExpr(o.getKey()));
- if (o.getDescription() != null) {
- field.addSingleMemberAnnotation(
- ANNOTATION_JSON_PROPERTY_DESCRIPTION,
- new StringLiteralExpr(StringEscapeUtils.escapeJava(o.getDescription())));
- }
- field.createGetter();
- field.createSetter();
- }
- });
-
- writeToFile(dest.resolve(className + ".java").toFile(), cu.toString());
- }
-
- private void writeToFile(File file, String str) {
- try (FileWriter fileWriter = new FileWriter(file);
- PrintWriter printWriter = new PrintWriter(fileWriter)) {
- printWriter.println(str);
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
- }
-
- private String toCamelCase(String original) {
- boolean convertNext = false;
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < original.length(); i++) {
- char currentChar = original.charAt(i);
- if (currentChar == '-') {
- convertNext = true;
- } else if (convertNext) {
- builder.append(Character.toUpperCase(currentChar));
- convertNext = false;
- } else {
- builder.append(Character.toLowerCase(currentChar));
- }
- }
- return builder.toString();
- }
-
-}
diff --git a/operator/app/olm-base/bundle.Dockerfile b/operator/olm-base/bundle.Dockerfile
similarity index 100%
rename from operator/app/olm-base/bundle.Dockerfile
rename to operator/olm-base/bundle.Dockerfile
diff --git a/operator/app/olm-base/manifests/clusterserviceversion.yaml b/operator/olm-base/manifests/clusterserviceversion.yaml
similarity index 100%
rename from operator/app/olm-base/manifests/clusterserviceversion.yaml
rename to operator/olm-base/manifests/clusterserviceversion.yaml
diff --git a/operator/app/olm-base/metadata/annotations.yaml b/operator/olm-base/metadata/annotations.yaml
similarity index 100%
rename from operator/app/olm-base/metadata/annotations.yaml
rename to operator/olm-base/metadata/annotations.yaml
diff --git a/operator/app/overlays/default-namespace/kustomization.yaml b/operator/overlays/default-namespace/kustomization.yaml
similarity index 100%
rename from operator/app/overlays/default-namespace/kustomization.yaml
rename to operator/overlays/default-namespace/kustomization.yaml
diff --git a/operator/app/patch-sources.sh b/operator/patch-sources.sh
similarity index 100%
rename from operator/app/patch-sources.sh
rename to operator/patch-sources.sh
diff --git a/operator/pom.xml b/operator/pom.xml
old mode 100755
new mode 100644
index 666a3d6e87..68e1a141d5
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -1,36 +1,277 @@
-
-
+
+
+ 4.0.0
+
keycloak-parent
org.keycloak
999-SNAPSHOT
../pom.xml
- Keycloak Operator Parent
-
- 4.0.0
+
+ Keycloak Operator
+ keycloak-operator
- keycloak-operator-parent
- pom
+
+
+ 4.7.5.Final
+ 1.5.4.Final-format-001
+ 2.13.3
+ 2.13.3
+ 5.12.2
-
- maven-plugin
- app
-
+ 3.8.1
+ true
+ 11
+ 11
+ 11
+ UTF-8
+ UTF-8
+ 3.0.8
+ 2.7.6.Final
+ keycloak
+ registry.access.redhat.com/ubi8/openjdk-11-runtime
+
+
+
+
+
+ io.quarkiverse.operatorsdk
+ quarkus-operator-sdk-bom
+ ${quarkus.operator.sdk.version}
+ pom
+ import
+
+
+
+
+
+
+
+
+ io.fabric8
+ crd-generator-api
+ ${kubernetes-client.version}
+
+
+ io.fabric8
+ crd-generator-apt
+ ${kubernetes-client.version}
+
+
+
+
+ io.quarkiverse.operatorsdk
+ quarkus-operator-sdk
+
+
+ io.quarkiverse.operatorsdk
+ quarkus-operator-sdk-csv-generator
+
+
+ io.quarkus
+ quarkus-resteasy-jackson
+
+
+ io.quarkus
+ quarkus-rest-client
+
+
+ io.quarkus
+ quarkus-rest-client-jackson
+
+
+ io.quarkus
+ quarkus-openshift
+
+
+ io.quarkus
+ quarkus-minikube
+
+
+ io.quarkus
+ quarkus-kubernetes-client
+
+
+
+
+
+ io.quarkiverse.operatorsdk
+ quarkus-operator-sdk-csv-generator-deployment
+ provided
+
+
+
+
+ org.keycloak
+ keycloak-common
+
+
+
+
+ io.quarkus
+ quarkus-test-common
+ test
+
+
+ io.quarkus
+ quarkus-junit5
+ test
+
+
+ org.assertj
+ assertj-core
+ ${assertj-core.version}
+ test
+
+
+ org.awaitility
+ awaitility
+ ${awaitility.version}
+ test
+
+
+ io.rest-assured
+ rest-assured
+ test
+
+
+
+
+
+
+
+ io.quarkus
+ quarkus-maven-plugin
+ ${quarkus.version}
+
+
+ maven-compiler-plugin
+ ${compiler-plugin.version}
+
+
+
+
+
+ io.quarkus
+ quarkus-maven-plugin
+ ${quarkus.version}
+
+
+
+ build
+
+
+
+
+
+ maven-resources-plugin
+
+
+ copy-resources
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target
+
+
+ src/main/kubernetes
+ true
+
+
+
+
+
+ import-keycloak-core
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/keycloak-core
+
+
+ ${basedir}/../core/src/main/java
+ true
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.2.0
+
+
+ generate-sources
+
+ add-source
+
+
+
+
+
+
+
+
+
+
+
+
+ exec-maven-plugin
+ org.codehaus.mojo
+ 1.6.0
+
+
+ patch-core-sources
+ generate-sources
+
+ exec
+
+
+ ${basedir}/patch-sources.sh
+
+
+
+
+
+ maven-surefire-plugin
+
+
+
+ default-test
+ verify
+
+ test
+
+
+
+
+
+
+
+
+
+
+ native
+
+ native
+
+
+
diff --git a/operator/app/scripts/Dockerfile-custom-image b/operator/scripts/Dockerfile-custom-image
similarity index 100%
rename from operator/app/scripts/Dockerfile-custom-image
rename to operator/scripts/Dockerfile-custom-image
diff --git a/operator/app/scripts/build-testing-docker-images.sh b/operator/scripts/build-testing-docker-images.sh
similarity index 100%
rename from operator/app/scripts/build-testing-docker-images.sh
rename to operator/scripts/build-testing-docker-images.sh
diff --git a/operator/app/scripts/check-crds-installed.sh b/operator/scripts/check-crds-installed.sh
similarity index 100%
rename from operator/app/scripts/check-crds-installed.sh
rename to operator/scripts/check-crds-installed.sh
diff --git a/operator/app/scripts/check-examples-installed.sh b/operator/scripts/check-examples-installed.sh
similarity index 100%
rename from operator/app/scripts/check-examples-installed.sh
rename to operator/scripts/check-examples-installed.sh
diff --git a/operator/app/scripts/create-olm-bundle.sh b/operator/scripts/create-olm-bundle.sh
similarity index 100%
rename from operator/app/scripts/create-olm-bundle.sh
rename to operator/scripts/create-olm-bundle.sh
diff --git a/operator/app/scripts/create-olm-test-catalog.sh b/operator/scripts/create-olm-test-catalog.sh
similarity index 100%
rename from operator/app/scripts/create-olm-test-catalog.sh
rename to operator/scripts/create-olm-test-catalog.sh
diff --git a/operator/app/scripts/create-olm-test-resources.sh b/operator/scripts/create-olm-test-resources.sh
similarity index 100%
rename from operator/app/scripts/create-olm-test-resources.sh
rename to operator/scripts/create-olm-test-resources.sh
diff --git a/operator/app/scripts/install-keycloak-operator.sh b/operator/scripts/install-keycloak-operator.sh
similarity index 100%
rename from operator/app/scripts/install-keycloak-operator.sh
rename to operator/scripts/install-keycloak-operator.sh
diff --git a/operator/app/scripts/install-olm.sh b/operator/scripts/install-olm.sh
similarity index 100%
rename from operator/app/scripts/install-olm.sh
rename to operator/scripts/install-olm.sh
diff --git a/operator/app/scripts/olm-testing.sh b/operator/scripts/olm-testing.sh
similarity index 93%
rename from operator/app/scripts/olm-testing.sh
rename to operator/scripts/olm-testing.sh
index 746591e066..417fc9da75 100755
--- a/operator/app/scripts/olm-testing.sh
+++ b/operator/scripts/olm-testing.sh
@@ -10,7 +10,7 @@ VERSION="86400000.0.0"
# Build Keycloak Docker image (the keycloak tar.gz should already be in the container folder)
(
- cd $SCRIPT_DIR/../../../quarkus/container
+ cd $SCRIPT_DIR/../../quarkus/container
docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t "ttl.sh/${UUID}keycloak:${VERSION}"
docker push "ttl.sh/${UUID}keycloak:${VERSION}"
@@ -18,7 +18,7 @@ VERSION="86400000.0.0"
# Build the operator Docker image
(
- cd $SCRIPT_DIR/../../../
+ cd $SCRIPT_DIR/../../
mvn clean package -Poperator -pl :keycloak-operator -am \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.image="ttl.sh/${UUID}keycloak-operator:${VERSION}" \
diff --git a/operator/app/scripts/prepare-olm-test.sh b/operator/scripts/prepare-olm-test.sh
similarity index 100%
rename from operator/app/scripts/prepare-olm-test.sh
rename to operator/scripts/prepare-olm-test.sh
diff --git a/operator/app/src/main/java/org/keycloak/operator/Config.java b/operator/src/main/java/org/keycloak/operator/Config.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/Config.java
rename to operator/src/main/java/org/keycloak/operator/Config.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/Constants.java b/operator/src/main/java/org/keycloak/operator/Constants.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/Constants.java
rename to operator/src/main/java/org/keycloak/operator/Constants.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecret.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecret.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecret.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecret.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakController.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakController.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakDeployment.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeployment.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakDeployment.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeployment.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryService.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryService.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryService.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryService.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJob.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJob.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJob.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJob.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecret.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecret.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecret.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecret.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakService.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakService.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakService.java
rename to operator/src/main/java/org/keycloak/operator/controllers/KeycloakService.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/OperatorManagedResource.java b/operator/src/main/java/org/keycloak/operator/controllers/OperatorManagedResource.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/OperatorManagedResource.java
rename to operator/src/main/java/org/keycloak/operator/controllers/OperatorManagedResource.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/StatusUpdater.java b/operator/src/main/java/org/keycloak/operator/controllers/StatusUpdater.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/StatusUpdater.java
rename to operator/src/main/java/org/keycloak/operator/controllers/StatusUpdater.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/WatchedSecretsStore.java b/operator/src/main/java/org/keycloak/operator/controllers/WatchedSecretsStore.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/controllers/WatchedSecretsStore.java
rename to operator/src/main/java/org/keycloak/operator/controllers/WatchedSecretsStore.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpecUnsupported.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpecUnsupported.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpecUnsupported.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpecUnsupported.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusBuilder.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusBuilder.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusBuilder.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusBuilder.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusCondition.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusCondition.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusCondition.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusCondition.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusBuilder.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusBuilder.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusBuilder.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusBuilder.java
diff --git a/operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusCondition.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusCondition.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusCondition.java
rename to operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatusCondition.java
diff --git a/operator/app/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java b/operator/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java
rename to operator/src/main/java/org/keycloak/representations/overrides/ComponentExportRepresentationMap.java
diff --git a/operator/app/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java b/operator/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java
rename to operator/src/main/java/org/keycloak/representations/overrides/MultivaluedStringStringHashMap.java
diff --git a/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java b/operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java
rename to operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java
diff --git a/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java b/operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java
rename to operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java
diff --git a/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java b/operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java
rename to operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java
diff --git a/operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java b/operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java
similarity index 100%
rename from operator/app/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java
rename to operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java
diff --git a/operator/app/src/main/kubernetes/kubernetes.yml b/operator/src/main/kubernetes/kubernetes.yml
similarity index 100%
rename from operator/app/src/main/kubernetes/kubernetes.yml
rename to operator/src/main/kubernetes/kubernetes.yml
diff --git a/operator/app/src/main/kubernetes/kustomization.yml b/operator/src/main/kubernetes/kustomization.yml
similarity index 100%
rename from operator/app/src/main/kubernetes/kustomization.yml
rename to operator/src/main/kubernetes/kustomization.yml
diff --git a/operator/app/src/main/kubernetes/minikube.yml b/operator/src/main/kubernetes/minikube.yml
similarity index 100%
rename from operator/app/src/main/kubernetes/minikube.yml
rename to operator/src/main/kubernetes/minikube.yml
diff --git a/operator/app/src/main/resources/application.properties b/operator/src/main/resources/application.properties
similarity index 100%
rename from operator/app/src/main/resources/application.properties
rename to operator/src/main/resources/application.properties
diff --git a/operator/app/src/main/resources/example-db-secret.yaml b/operator/src/main/resources/example-db-secret.yaml
similarity index 100%
rename from operator/app/src/main/resources/example-db-secret.yaml
rename to operator/src/main/resources/example-db-secret.yaml
diff --git a/operator/app/src/main/resources/example-keycloak.yaml b/operator/src/main/resources/example-keycloak.yaml
similarity index 100%
rename from operator/app/src/main/resources/example-keycloak.yaml
rename to operator/src/main/resources/example-keycloak.yaml
diff --git a/operator/app/src/main/resources/example-postgres.yaml b/operator/src/main/resources/example-postgres.yaml
similarity index 100%
rename from operator/app/src/main/resources/example-postgres.yaml
rename to operator/src/main/resources/example-postgres.yaml
diff --git a/operator/app/src/main/resources/example-realm.yaml b/operator/src/main/resources/example-realm.yaml
similarity index 100%
rename from operator/app/src/main/resources/example-realm.yaml
rename to operator/src/main/resources/example-realm.yaml
diff --git a/operator/app/src/main/resources/example-tls-secret.yaml b/operator/src/main/resources/example-tls-secret.yaml
similarity index 100%
rename from operator/app/src/main/resources/example-tls-secret.yaml
rename to operator/src/main/resources/example-tls-secret.yaml
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java b/operator/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java
diff --git a/operator/app/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java b/operator/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java
similarity index 100%
rename from operator/app/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java
rename to operator/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java
diff --git a/operator/app/src/test/resources/application.properties b/operator/src/test/resources/application.properties
similarity index 100%
rename from operator/app/src/test/resources/application.properties
rename to operator/src/test/resources/application.properties
diff --git a/operator/app/src/test/resources/correct-podtemplate-keycloak.yml b/operator/src/test/resources/correct-podtemplate-keycloak.yml
similarity index 100%
rename from operator/app/src/test/resources/correct-podtemplate-keycloak.yml
rename to operator/src/test/resources/correct-podtemplate-keycloak.yml
diff --git a/operator/app/src/test/resources/empty-podtemplate-keycloak.yml b/operator/src/test/resources/empty-podtemplate-keycloak.yml
similarity index 100%
rename from operator/app/src/test/resources/empty-podtemplate-keycloak.yml
rename to operator/src/test/resources/empty-podtemplate-keycloak.yml
diff --git a/operator/app/src/test/resources/incorrect-realm.yaml b/operator/src/test/resources/incorrect-realm.yaml
similarity index 100%
rename from operator/app/src/test/resources/incorrect-realm.yaml
rename to operator/src/test/resources/incorrect-realm.yaml
diff --git a/operator/app/src/test/resources/test-serialization-keycloak-cr.yml b/operator/src/test/resources/test-serialization-keycloak-cr.yml
similarity index 100%
rename from operator/app/src/test/resources/test-serialization-keycloak-cr.yml
rename to operator/src/test/resources/test-serialization-keycloak-cr.yml
diff --git a/operator/app/src/test/resources/token-test-realm.yaml b/operator/src/test/resources/token-test-realm.yaml
similarity index 100%
rename from operator/app/src/test/resources/token-test-realm.yaml
rename to operator/src/test/resources/token-test-realm.yaml
diff --git a/pom.xml b/pom.xml
index 05637f64ff..d7901ef7e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1930,16 +1930,6 @@
-
- config-api
-
- [11,)
-
-
- config-api
-
-
-
quarkus
diff --git a/config-api/pom.xml b/quarkus/config-api/pom.xml
similarity index 81%
rename from config-api/pom.xml
rename to quarkus/config-api/pom.xml
index 28f9cb0deb..f14c340aa0 100755
--- a/config-api/pom.xml
+++ b/quarkus/config-api/pom.xml
@@ -19,7 +19,7 @@
- keycloak-parent
+ keycloak-quarkus-parent
org.keycloak
999-SNAPSHOT
../pom.xml
@@ -31,13 +31,6 @@
jar
-
- UTF-8
- 11
- 11
- 11
-
-
org.keycloak
diff --git a/config-api/src/main/java/org/keycloak/config/AllOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/AllOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/AllOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/AllOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/ClusteringOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/ClusteringOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/ClusteringOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/ClusteringOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/DatabaseOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/FeatureOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/FeatureOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/FeatureOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/FeatureOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/HealthOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/HealthOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/HealthOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/HealthOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/HostnameOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/HostnameOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/HostnameOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/HostnameOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/HttpOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/HttpOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/HttpOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/HttpOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/LoggingOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/LoggingOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/LoggingOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/LoggingOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/MetricsOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/MetricsOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/MetricsOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/MetricsOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/MultiOption.java b/quarkus/config-api/src/main/java/org/keycloak/config/MultiOption.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/MultiOption.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/MultiOption.java
diff --git a/config-api/src/main/java/org/keycloak/config/Option.java b/quarkus/config-api/src/main/java/org/keycloak/config/Option.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/Option.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/Option.java
diff --git a/config-api/src/main/java/org/keycloak/config/OptionBuilder.java b/quarkus/config-api/src/main/java/org/keycloak/config/OptionBuilder.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/OptionBuilder.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/OptionBuilder.java
diff --git a/config-api/src/main/java/org/keycloak/config/OptionCategory.java b/quarkus/config-api/src/main/java/org/keycloak/config/OptionCategory.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/OptionCategory.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/OptionCategory.java
diff --git a/config-api/src/main/java/org/keycloak/config/ProxyOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/ProxyOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/ProxyOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/ProxyOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/StorageOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/StorageOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/StorageOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/StorageOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/TransactionOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/TransactionOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/TransactionOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/TransactionOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/VaultOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/VaultOptions.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/VaultOptions.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/VaultOptions.java
diff --git a/config-api/src/main/java/org/keycloak/config/database/Database.java b/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java
similarity index 100%
rename from config-api/src/main/java/org/keycloak/config/database/Database.java
rename to quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index 1207d2ba04..a9b343f0de 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -159,6 +159,7 @@
+ config-api
runtime
deployment
server