diff --git a/.github/workflows/check-md-link.yml b/.github/workflows/check-md-link.yml index e415aabe6f..88c6f49ae4 100644 --- a/.github/workflows/check-md-link.yml +++ b/.github/workflows/check-md-link.yml @@ -41,5 +41,5 @@ jobs: with: use-quiet-mode: 'yes' config-file: '.github/workflows/check-md-link-config.json' - folder-path: 'regtests, .github, build-logic, polaris-core, service, quarkus, persistence, spec, k8, getting-started, helm' + folder-path: 'regtests, .github, build-logic, polaris-core, service, runtime, persistence, spec, k8, getting-started, helm' file-path: 'CHAT_BYLAWS.md, CODE_OF_CONDUCT.md, CONTRIBUTING.md, README.md, SECURITY.md' diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 43d48132ee..74fdb8d92e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -86,7 +86,7 @@ jobs: - name: Build run: ./gradlew compileAll - name: Run selected tests - run: ./gradlew :polaris-quarkus-service:intTest + run: ./gradlew :polaris-runtime-service:intTest - name: Archive test results uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index f18aefb893..b953b78f72 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -86,10 +86,10 @@ jobs: run: | eval $(minikube -p minikube docker-env) ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true minikube image ls diff --git a/.github/workflows/python-client.yml b/.github/workflows/python-client.yml index df12b8261c..37ead61eda 100644 --- a/.github/workflows/python-client.yml +++ b/.github/workflows/python-client.yml @@ -81,8 +81,8 @@ jobs: - name: Image build run: | ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true - name: Integration Tests diff --git a/.github/workflows/regtest.yml b/.github/workflows/regtest.yml index 91ce8559a6..70e433baf5 100644 --- a/.github/workflows/regtest.yml +++ b/.github/workflows/regtest.yml @@ -49,8 +49,8 @@ jobs: - name: Image build run: | ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true - name: Regression Test diff --git a/.github/workflows/spark_client_regtests.yml b/.github/workflows/spark_client_regtests.yml index d31c7c0ae8..b4da3331e6 100644 --- a/.github/workflows/spark_client_regtests.yml +++ b/.github/workflows/spark_client_regtests.yml @@ -52,8 +52,8 @@ jobs: - name: Image build run: | ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true # NOTE: the regression test runs with spark 3.5.5 and scala 2.12 in Java 17. We also have integration diff --git a/LICENSE b/LICENSE index 0606a38573..93cc39a5ca 100644 --- a/LICENSE +++ b/LICENSE @@ -269,7 +269,7 @@ This product includes code from Project Nessie. * build-logic/src/main/kotlin/publishing/PublishingHelperPlugin.kt * build-logic/src/main/kotlin/Utilities.kt * build-logic/src/main/kotlin/polaris-shadow-jar.gradle.kts -* build-logic/src/main/kotlin/polaris-quarkus.gradle.kts +* build-logic/src/main/kotlin/polaris-runtime.gradle.kts * tools/config-docs/annotations/src/main/java/org/apache/polaris/docs/ConfigDocs.java * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/DocGenDoclet.java * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/MarkdownFormatter.java @@ -309,7 +309,7 @@ This product includes code from Project Nessie. * tools/config-docs/generator/src/test/java/tests/smallrye/SomeEnum.java * tools/config-docs/generator/src/test/java/tests/smallrye/VeryNested.java * tools/container-spec-helper/src/main/java/org/apache/polaris/containerspec/ContainerSpecHelper.java -* quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java +* runtime/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java * helm/polaris/tests/logging_storage_test.yaml * helm/polaris/tests/quantity_test.yaml * helm/polaris/tests/service_monitor_test.yaml diff --git a/README.md b/README.md index 22c2364fec..a0c9350ee7 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,11 @@ Apache Polaris is organized into the following modules: - `polaris-api-iceberg-service` - The Iceberg REST service - Service modules: - `polaris-service-common` - The main components of the Polaris server -- Quarkus runtime modules: - - `polaris-quarkus-service` - The Quarkus-specific components of the Polaris server - - `polaris-quarkus-defaults` - The Quarkus-specific configuration defaults - - `polaris-quarkus-server` - The Polaris server runtime - - `polaris-quarkus-admin-tool` - The Polaris admin & maintenance tool +- Runtime modules: + - `polaris-runtime-service` - The runtime components of the Polaris server + - `polaris-runtime-defaults` - The runtime configuration defaults + - `polaris-server` - The Polaris server + - `polaris-admin` - The Polaris admin & maintenance tool - Persistence modules: - `polaris-eclipselink` - The Eclipselink implementation of the MetaStoreManager interface - `polaris-relational-jdbc` - The JDBC implementation of BasePersistence to be used via AtomicMetaStoreManager @@ -88,8 +88,8 @@ select * from db1.table1; - To build the image locally: ```bash ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` - `docker run -p 8181:8181 -p 8182:8182 apache/polaris:latest` - To run the image. @@ -116,7 +116,7 @@ Polaris Servers can be configured using a variety of ways. Please see the [Configuration Guide](site/content/in-dev/unreleased/configuration.md) for more information. -Default configuration values can be found in `quarkus/defaults/src/main/resources/application.properties`. +Default configuration values can be found in `runtime/defaults/src/main/resources/application.properties`. #### Building docs diff --git a/aggregated-license-report/build.gradle.kts b/aggregated-license-report/build.gradle.kts index 3966a740ad..f222eab3e0 100644 --- a/aggregated-license-report/build.gradle.kts +++ b/aggregated-license-report/build.gradle.kts @@ -22,7 +22,7 @@ import org.gradle.kotlin.dsl.support.unzipTo val licenseReports by configurations.creating { description = "Used to generate license reports" } dependencies { - licenseReports(project(":polaris-quarkus-service", "licenseReports")) + licenseReports(project(":polaris-runtime-service", "licenseReports")) } val collectLicenseReportJars by diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 47f0e8b9e0..64b2319350 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -44,13 +44,13 @@ dependencies { api(project(":polaris-eclipselink")) api(project(":polaris-relational-jdbc")) - api(project(":polaris-quarkus-admin")) - api(project(":polaris-quarkus-common")) - api(project(":polaris-quarkus-test-commons")) - api(project(":polaris-quarkus-defaults")) - api(project(":polaris-quarkus-server")) - api(project(":polaris-quarkus-service")) - api(project(":polaris-quarkus-spark-tests")) + api(project(":polaris-admin")) + api(project(":polaris-runtime-common")) + api(project(":polaris-runtime-test-common")) + api(project(":polaris-runtime-defaults")) + api(project(":polaris-server")) + api(project(":polaris-runtime-service")) + api(project(":polaris-runtime-spark-tests")) api(project(":polaris-tests")) } diff --git a/build-logic/src/main/kotlin/polaris-quarkus.gradle.kts b/build-logic/src/main/kotlin/polaris-runtime.gradle.kts similarity index 100% rename from build-logic/src/main/kotlin/polaris-quarkus.gradle.kts rename to build-logic/src/main/kotlin/polaris-runtime.gradle.kts diff --git a/getting-started/assets/cloud_providers/deploy-aws.sh b/getting-started/assets/cloud_providers/deploy-aws.sh index aceefb51c7..cedee88063 100644 --- a/getting-started/assets/cloud_providers/deploy-aws.sh +++ b/getting-started/assets/cloud_providers/deploy-aws.sh @@ -79,7 +79,7 @@ aws s3api create-bucket --bucket $S3_BUCKET_NAME --region $CURRENT_REGION --crea export STORAGE_LOCATION="s3://$S3_BUCKET_NAME/quickstart_catalog/" -./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \ +./gradlew clean :polaris-server:assemble :polaris-admin:assemble \ -Dquarkus.container-image.tag=postgres-latest \ -Dquarkus.container-image.build=true \ --no-build-cache diff --git a/getting-started/assets/cloud_providers/deploy-azure.sh b/getting-started/assets/cloud_providers/deploy-azure.sh index c6a76e4f19..9164dcbbc0 100644 --- a/getting-started/assets/cloud_providers/deploy-azure.sh +++ b/getting-started/assets/cloud_providers/deploy-azure.sh @@ -66,7 +66,7 @@ fs.native-azure.enabled=true azure.auth-type=DEFAULT EOF -./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \ +./gradlew clean :polaris-server:assemble :polaris-admin:assemble \ -Dquarkus.container-image.tag=postgres-latest \ -Dquarkus.container-image.build=true \ --no-build-cache diff --git a/getting-started/assets/cloud_providers/deploy-gcp.sh b/getting-started/assets/cloud_providers/deploy-gcp.sh index fd57d9d799..691430dea3 100644 --- a/getting-started/assets/cloud_providers/deploy-gcp.sh +++ b/getting-started/assets/cloud_providers/deploy-gcp.sh @@ -47,7 +47,7 @@ echo "GCS Bucket Name: $GCS_BUCKET_NAME" gcloud storage buckets create "gs://$GCS_BUCKET_NAME" --location=$CURRENT_REGION export STORAGE_LOCATION="gs://$GCS_BUCKET_NAME/quickstart_catalog/" -./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \ +./gradlew clean :polaris-server:assemble :polaris-admin:assemble \ -Dquarkus.container-image.tag=postgres-latest \ -Dquarkus.container-image.build=true \ --no-build-cache diff --git a/getting-started/eclipselink/README.md b/getting-started/eclipselink/README.md index a9ae12cbd3..0614822d1a 100644 --- a/getting-started/eclipselink/README.md +++ b/getting-started/eclipselink/README.md @@ -26,10 +26,10 @@ This example requires `jq` to be installed on your machine. ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.tag=postgres-latest \ -Dquarkus.container-image.build=true ``` diff --git a/getting-started/jdbc/README.md b/getting-started/jdbc/README.md index 49b02de2d6..17e14631db 100644 --- a/getting-started/jdbc/README.md +++ b/getting-started/jdbc/README.md @@ -26,10 +26,10 @@ This example requires `jq` to be installed on your machine. ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.tag=postgres-latest \ -Dquarkus.container-image.build=true ``` diff --git a/getting-started/spark/README.md b/getting-started/spark/README.md index 125ea3160e..b0a5753aaa 100644 --- a/getting-started/spark/README.md +++ b/getting-started/spark/README.md @@ -28,8 +28,8 @@ If a Polaris image is not already present locally, build one with the following ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` diff --git a/getting-started/telemetry/README.md b/getting-started/telemetry/README.md index 3e3221b8c5..11533d378d 100644 --- a/getting-started/telemetry/README.md +++ b/getting-started/telemetry/README.md @@ -25,8 +25,8 @@ This example requires `jq` to be installed on your machine. ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` diff --git a/gradle/projects.main.properties b/gradle/projects.main.properties index 590f55481f..1427745096 100644 --- a/gradle/projects.main.properties +++ b/gradle/projects.main.properties @@ -25,14 +25,14 @@ polaris-api-management-model=api/management-model polaris-api-management-service=api/management-service polaris-api-catalog-service=api/polaris-catalog-service polaris-service-common=service/common -polaris-quarkus-defaults=quarkus/defaults -polaris-quarkus-service=quarkus/service -polaris-quarkus-server=quarkus/server -polaris-quarkus-distribution=quarkus/distribution -polaris-quarkus-spark-tests=quarkus/spark-tests -polaris-quarkus-admin=quarkus/admin -polaris-quarkus-common=quarkus/common -polaris-quarkus-test-commons=quarkus/test-commons +polaris-runtime-defaults=runtime/defaults +polaris-runtime-service=runtime/service +polaris-server=runtime/server +polaris-distribution=runtime/distribution +polaris-runtime-spark-tests=runtime/spark-tests +polaris-admin=runtime/admin +polaris-runtime-common=runtime/common +polaris-runtime-test-common=runtime/test-commons polaris-eclipselink=persistence/eclipselink polaris-relational-jdbc=persistence/relational-jdbc polaris-tests=integration-tests diff --git a/helm/polaris/README.md b/helm/polaris/README.md index 74b3e55adf..61f291032a 100644 --- a/helm/polaris/README.md +++ b/helm/polaris/README.md @@ -81,10 +81,10 @@ If necessary, build and load the Docker images with support for Postgres into Mi eval $(minikube -p minikube docker-env) ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` @@ -171,7 +171,7 @@ Run the catalog bootstrap using the Polaris admin tool. This step initializes th ```bash java -Dpolaris.persistence.eclipselink.configuration-file=./persistence.xml \ -Dpolaris.persistence.eclipselink.persistence-unit=polaris \ - -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar \ + -jar runtime/admin/build/polaris-admin-*-runner.jar \ bootstrap -c POLARIS,root,pass -r POLARIS ``` diff --git a/helm/polaris/README.md.gotmpl b/helm/polaris/README.md.gotmpl index 94a233ada7..c676663f56 100644 --- a/helm/polaris/README.md.gotmpl +++ b/helm/polaris/README.md.gotmpl @@ -82,10 +82,10 @@ If necessary, build and load the Docker images with support for Postgres into Mi eval $(minikube -p minikube docker-env) ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` @@ -172,7 +172,7 @@ Run the catalog bootstrap using the Polaris admin tool. This step initializes th ```bash java -Dpolaris.persistence.eclipselink.configuration-file=./persistence.xml \ -Dpolaris.persistence.eclipselink.persistence-unit=polaris \ - -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar \ + -jar runtime/admin/build/polaris-admin-*-runner.jar \ bootstrap -c POLARIS,root,pass -r POLARIS ``` diff --git a/plugins/spark/v3.5/getting-started/README.md b/plugins/spark/v3.5/getting-started/README.md index edad58ba3a..d5aa245baa 100644 --- a/plugins/spark/v3.5/getting-started/README.md +++ b/plugins/spark/v3.5/getting-started/README.md @@ -36,8 +36,8 @@ If a Polaris image is not already present locally, build one with the following ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` diff --git a/plugins/spark/v3.5/integration/build.gradle.kts b/plugins/spark/v3.5/integration/build.gradle.kts index b259f528a5..0a1a8087e7 100644 --- a/plugins/spark/v3.5/integration/build.gradle.kts +++ b/plugins/spark/v3.5/integration/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) - id("polaris-quarkus") + id("polaris-runtime") } // get version information @@ -43,7 +43,7 @@ dependencies { exclude(group = "org.scala-lang", module = "scala-reflect") } - implementation(project(":polaris-quarkus-service")) + implementation(project(":polaris-runtime-service")) testImplementation(project(":polaris-api-management-model")) testImplementation(project(":polaris-spark-${sparkMajorVersion}_${scalaVersion}")) @@ -72,7 +72,7 @@ dependencies { "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}" ) - testImplementation(testFixtures(project(":polaris-quarkus-service"))) + testImplementation(testFixtures(project(":polaris-runtime-service"))) testImplementation(platform(libs.quarkus.bom)) testImplementation("io.quarkus:quarkus-junit5") diff --git a/plugins/spark/v3.5/regtests/README.md b/plugins/spark/v3.5/regtests/README.md index 75dd57a5a3..39220352cb 100755 --- a/plugins/spark/v3.5/regtests/README.md +++ b/plugins/spark/v3.5/regtests/README.md @@ -46,8 +46,8 @@ follows: ```shell ./gradlew build ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true docker compose -f ./plugins/spark/v3.5/regtests/docker-compose.yml up --build --exit-code-from regtest ``` diff --git a/regtests/README.md b/regtests/README.md index 3a00a4c624..e36cbeb087 100644 --- a/regtests/README.md +++ b/regtests/README.md @@ -40,8 +40,8 @@ follows: ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true docker compose -f ./regtests/docker-compose.yml up --build --exit-code-from regtest ``` diff --git a/run.sh b/run.sh index 11b427f1d1..aeee47e93c 100755 --- a/run.sh +++ b/run.sh @@ -53,8 +53,8 @@ sh ./kind-registry.sh # Build and deploy the server image echo "Building polaris image..." ./gradlew \ - :polaris-quarkus-server:build \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:build \ + :polaris-server:quarkusAppPartsBuild --rerun \ $ECLIPSE_LINK_DEPS \ -Dquarkus.container-image.build=true \ -Dquarkus.container-image.registry=localhost:5001 diff --git a/quarkus/admin/README.md b/runtime/admin/README.md similarity index 82% rename from quarkus/admin/README.md rename to runtime/admin/README.md index d9c966f19b..68fa9ef0e3 100644 --- a/quarkus/admin/README.md +++ b/runtime/admin/README.md @@ -30,16 +30,16 @@ Building this module will create a zip/tar distribution with the Polaris server. To build the distribution, you can use the following command: ```shell -./gradlew :polaris-quarkus-admin:build +./gradlew :polaris-admin:build ``` You can manually unpack and run the distribution archives: ```shell -cd quarkus/admin/build/distributions -unzip polaris-quarkus-admin-.zip -cd polaris-quarkus-admin- -java -jar polaris-quarkus-admin--runner.jar +cd runtime/admin/build/distributions +unzip polaris-admin-.zip +cd polaris-admin- +java -jar polaris-admin--runner.jar ``` ## Docker image @@ -48,8 +48,8 @@ To also build the Docker image, you can use the following command: ```shell ./gradlew \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` @@ -58,7 +58,7 @@ To also build the Docker image, you can use the following command: The admin tool can be run from the command line using the following command: ```shell -java -jar polaris-quarkus-admin--runner.jar --help +java -jar polaris-admin--runner.jar --help ``` Using the Docker image, you can run the admin tool with the following command: diff --git a/quarkus/admin/build.gradle.kts b/runtime/admin/build.gradle.kts similarity index 95% rename from quarkus/admin/build.gradle.kts rename to runtime/admin/build.gradle.kts index 6f626c248d..ab06e7e14e 100644 --- a/quarkus/admin/build.gradle.kts +++ b/runtime/admin/build.gradle.kts @@ -21,7 +21,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) alias(libs.plugins.openapi.generator) - id("polaris-quarkus") + id("polaris-runtime") // id("polaris-license-report") } @@ -42,10 +42,10 @@ dependencies { implementation("io.quarkus:quarkus-picocli") implementation("io.quarkus:quarkus-container-image-docker") - implementation(project(":polaris-quarkus-common")) + implementation(project(":polaris-runtime-common")) implementation("org.jboss.slf4j:slf4j-jboss-logmanager") - testImplementation(project(":polaris-quarkus-test-commons")) + testImplementation(project(":polaris-runtime-test-common")) testFixturesApi(project(":polaris-core")) testFixturesApi(enforcedPlatform(libs.quarkus.bom)) diff --git a/quarkus/admin/distribution/DISCLAIMER b/runtime/admin/distribution/DISCLAIMER similarity index 100% rename from quarkus/admin/distribution/DISCLAIMER rename to runtime/admin/distribution/DISCLAIMER diff --git a/quarkus/admin/distribution/LICENSE b/runtime/admin/distribution/LICENSE similarity index 100% rename from quarkus/admin/distribution/LICENSE rename to runtime/admin/distribution/LICENSE diff --git a/quarkus/admin/distribution/NOTICE b/runtime/admin/distribution/NOTICE similarity index 100% rename from quarkus/admin/distribution/NOTICE rename to runtime/admin/distribution/NOTICE diff --git a/quarkus/admin/src/main/docker/Dockerfile.jvm b/runtime/admin/src/main/docker/Dockerfile.jvm similarity index 100% rename from quarkus/admin/src/main/docker/Dockerfile.jvm rename to runtime/admin/src/main/docker/Dockerfile.jvm diff --git a/quarkus/admin/src/main/java/org/apache/polaris/admintool/BaseCommand.java b/runtime/admin/src/main/java/org/apache/polaris/admintool/BaseCommand.java similarity index 100% rename from quarkus/admin/src/main/java/org/apache/polaris/admintool/BaseCommand.java rename to runtime/admin/src/main/java/org/apache/polaris/admintool/BaseCommand.java diff --git a/quarkus/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java b/runtime/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java similarity index 100% rename from quarkus/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java rename to runtime/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java diff --git a/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java b/runtime/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java similarity index 100% rename from quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java rename to runtime/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java diff --git a/quarkus/admin/src/main/java/org/apache/polaris/admintool/PurgeCommand.java b/runtime/admin/src/main/java/org/apache/polaris/admintool/PurgeCommand.java similarity index 100% rename from quarkus/admin/src/main/java/org/apache/polaris/admintool/PurgeCommand.java rename to runtime/admin/src/main/java/org/apache/polaris/admintool/PurgeCommand.java diff --git a/quarkus/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java b/runtime/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java similarity index 100% rename from quarkus/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java rename to runtime/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java diff --git a/quarkus/admin/src/main/resources/application.properties b/runtime/admin/src/main/resources/application.properties similarity index 100% rename from quarkus/admin/src/main/resources/application.properties rename to runtime/admin/src/main/resources/application.properties diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/BootstrapCommandTestBase.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/BootstrapCommandTestBase.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/BootstrapCommandTestBase.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/BootstrapCommandTestBase.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/PurgeCommandTestBase.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/PurgeCommandTestBase.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/PurgeCommandTestBase.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/PurgeCommandTestBase.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkBootstrapCommandTest.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkBootstrapCommandTest.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkBootstrapCommandTest.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkBootstrapCommandTest.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkProfile.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkProfile.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkProfile.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkProfile.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcBootstrapCommandTest.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcBootstrapCommandTest.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcBootstrapCommandTest.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcBootstrapCommandTest.java diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java b/runtime/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java similarity index 100% rename from quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java rename to runtime/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java diff --git a/quarkus/admin/src/test/resources/org/apache/polaris/admintool/credentials.json b/runtime/admin/src/test/resources/org/apache/polaris/admintool/credentials.json similarity index 100% rename from quarkus/admin/src/test/resources/org/apache/polaris/admintool/credentials.json rename to runtime/admin/src/test/resources/org/apache/polaris/admintool/credentials.json diff --git a/quarkus/admin/src/test/resources/org/apache/polaris/admintool/credentials.yaml b/runtime/admin/src/test/resources/org/apache/polaris/admintool/credentials.yaml similarity index 100% rename from quarkus/admin/src/test/resources/org/apache/polaris/admintool/credentials.yaml rename to runtime/admin/src/test/resources/org/apache/polaris/admintool/credentials.yaml diff --git a/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java b/runtime/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java similarity index 100% rename from quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java rename to runtime/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java diff --git a/quarkus/admin/src/testFixtures/resources/org/apache/polaris/admintool/init.sql b/runtime/admin/src/testFixtures/resources/org/apache/polaris/admintool/init.sql similarity index 100% rename from quarkus/admin/src/testFixtures/resources/org/apache/polaris/admintool/init.sql rename to runtime/admin/src/testFixtures/resources/org/apache/polaris/admintool/init.sql diff --git a/quarkus/common/build.gradle.kts b/runtime/common/build.gradle.kts similarity index 97% rename from quarkus/common/build.gradle.kts rename to runtime/common/build.gradle.kts index 07d94328e2..79452e80bb 100644 --- a/quarkus/common/build.gradle.kts +++ b/runtime/common/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) - id("polaris-quarkus") + id("polaris-runtime") } dependencies { diff --git a/quarkus/common/src/main/java/org/apache/polaris/quarkus/common/config/jdbc/QuarkusRelationalJdbcConfiguration.java b/runtime/common/src/main/java/org/apache/polaris/quarkus/common/config/jdbc/QuarkusRelationalJdbcConfiguration.java similarity index 100% rename from quarkus/common/src/main/java/org/apache/polaris/quarkus/common/config/jdbc/QuarkusRelationalJdbcConfiguration.java rename to runtime/common/src/main/java/org/apache/polaris/quarkus/common/config/jdbc/QuarkusRelationalJdbcConfiguration.java diff --git a/quarkus/defaults/README.md b/runtime/defaults/README.md similarity index 100% rename from quarkus/defaults/README.md rename to runtime/defaults/README.md diff --git a/quarkus/defaults/build.gradle.kts b/runtime/defaults/build.gradle.kts similarity index 98% rename from quarkus/defaults/build.gradle.kts rename to runtime/defaults/build.gradle.kts index 2b9d3ad488..88134be6e4 100644 --- a/quarkus/defaults/build.gradle.kts +++ b/runtime/defaults/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) - id("polaris-quarkus") + id("polaris-runtime") } dependencies { diff --git a/quarkus/defaults/src/main/java/org/apache/polaris/service/defaults/Readme.java b/runtime/defaults/src/main/java/org/apache/polaris/service/defaults/Readme.java similarity index 100% rename from quarkus/defaults/src/main/java/org/apache/polaris/service/defaults/Readme.java rename to runtime/defaults/src/main/java/org/apache/polaris/service/defaults/Readme.java diff --git a/quarkus/defaults/src/main/resources/application-it.properties b/runtime/defaults/src/main/resources/application-it.properties similarity index 100% rename from quarkus/defaults/src/main/resources/application-it.properties rename to runtime/defaults/src/main/resources/application-it.properties diff --git a/quarkus/defaults/src/main/resources/application-test.properties b/runtime/defaults/src/main/resources/application-test.properties similarity index 100% rename from quarkus/defaults/src/main/resources/application-test.properties rename to runtime/defaults/src/main/resources/application-test.properties diff --git a/quarkus/defaults/src/main/resources/application.properties b/runtime/defaults/src/main/resources/application.properties similarity index 100% rename from quarkus/defaults/src/main/resources/application.properties rename to runtime/defaults/src/main/resources/application.properties diff --git a/quarkus/distribution/DISCLAIMER b/runtime/distribution/DISCLAIMER similarity index 100% rename from quarkus/distribution/DISCLAIMER rename to runtime/distribution/DISCLAIMER diff --git a/quarkus/distribution/LICENSE b/runtime/distribution/LICENSE similarity index 100% rename from quarkus/distribution/LICENSE rename to runtime/distribution/LICENSE diff --git a/quarkus/distribution/NOTICE b/runtime/distribution/NOTICE similarity index 100% rename from quarkus/distribution/NOTICE rename to runtime/distribution/NOTICE diff --git a/quarkus/distribution/README.md b/runtime/distribution/README.md similarity index 98% rename from quarkus/distribution/README.md rename to runtime/distribution/README.md index 69a4ee4c82..a372124e13 100644 --- a/quarkus/distribution/README.md +++ b/runtime/distribution/README.md @@ -28,7 +28,7 @@ This distribution contains both the Polaris Server and Admin Tool. ## Directory Structure ``` -polaris-quarkus-distribution-@version@/ +polaris-distribution-@version@/ ├── LICENSE ├── NOTICE ├── README.md diff --git a/quarkus/distribution/bin/admin b/runtime/distribution/bin/admin similarity index 100% rename from quarkus/distribution/bin/admin rename to runtime/distribution/bin/admin diff --git a/quarkus/distribution/bin/server b/runtime/distribution/bin/server similarity index 100% rename from quarkus/distribution/bin/server rename to runtime/distribution/bin/server diff --git a/quarkus/distribution/build.gradle.kts b/runtime/distribution/build.gradle.kts similarity index 91% rename from quarkus/distribution/build.gradle.kts rename to runtime/distribution/build.gradle.kts index b4257e89c6..1e9c014f36 100644 --- a/quarkus/distribution/build.gradle.kts +++ b/runtime/distribution/build.gradle.kts @@ -26,8 +26,8 @@ plugins { description = "Apache Polaris Binary Distribution" -val adminProject = project(":polaris-quarkus-admin") -val serverProject = project(":polaris-quarkus-server") +val adminProject = project(":polaris-admin") +val serverProject = project(":polaris-server") // Configurations to resolve artifacts from other projects val adminDistribution by configurations.creating { @@ -41,8 +41,8 @@ val serverDistribution by configurations.creating { } dependencies { - adminDistribution(project(":polaris-quarkus-admin", "distributionElements")) - serverDistribution(project(":polaris-quarkus-server", "distributionElements")) + adminDistribution(project(":polaris-admin", "distributionElements")) + serverDistribution(project(":polaris-server", "distributionElements")) } distributions { diff --git a/quarkus/server/README.md b/runtime/server/README.md similarity index 83% rename from quarkus/server/README.md rename to runtime/server/README.md index 3b2f4e2307..640d2e1667 100644 --- a/quarkus/server/README.md +++ b/runtime/server/README.md @@ -28,15 +28,15 @@ Building this module will create a zip/tar distribution with the Polaris server. To build the distribution, you can use the following command: ```shell -./gradlew :polaris-quarkus-server:build +./gradlew :polaris-server:build ``` You can manually unpack and run the distribution archives: ```shell -cd quarkus/server/build/distributions -unzip polaris-quarkus-server-.zip -cd polaris-quarkus-server- +cd runtime/server/build/distributions +unzip polaris-server-.zip +cd polaris-server- java -jar quarkus-run.jar ``` @@ -47,8 +47,8 @@ required): ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` @@ -57,8 +57,8 @@ following command: ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true \ -Dquarkus.container-image.registry=localhost:5001 \ -Dquarkus.container-image.group=apache \ diff --git a/quarkus/server/build.gradle.kts b/runtime/server/build.gradle.kts similarity index 97% rename from quarkus/server/build.gradle.kts rename to runtime/server/build.gradle.kts index 7b33d4a997..d64f5c9976 100644 --- a/quarkus/server/build.gradle.kts +++ b/runtime/server/build.gradle.kts @@ -24,7 +24,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) alias(libs.plugins.openapi.generator) - id("polaris-quarkus") + id("polaris-runtime") // id("polaris-license-report") } @@ -43,7 +43,7 @@ dependencies { implementation(project(":polaris-api-management-service")) implementation(project(":polaris-api-iceberg-service")) implementation(project(":polaris-service-common")) - implementation(project(":polaris-quarkus-service")) + implementation(project(":polaris-runtime-service")) runtimeOnly(project(":polaris-eclipselink")) runtimeOnly("org.postgresql:postgresql") diff --git a/quarkus/server/distribution/DISCLAIMER b/runtime/server/distribution/DISCLAIMER similarity index 100% rename from quarkus/server/distribution/DISCLAIMER rename to runtime/server/distribution/DISCLAIMER diff --git a/quarkus/server/distribution/LICENSE b/runtime/server/distribution/LICENSE similarity index 100% rename from quarkus/server/distribution/LICENSE rename to runtime/server/distribution/LICENSE diff --git a/quarkus/server/distribution/NOTICE b/runtime/server/distribution/NOTICE similarity index 100% rename from quarkus/server/distribution/NOTICE rename to runtime/server/distribution/NOTICE diff --git a/quarkus/server/src/main/docker/Dockerfile.jvm b/runtime/server/src/main/docker/Dockerfile.jvm similarity index 100% rename from quarkus/server/src/main/docker/Dockerfile.jvm rename to runtime/server/src/main/docker/Dockerfile.jvm diff --git a/quarkus/server/src/main/java/org/apache/polaris/server/quarkus/Readme.java b/runtime/server/src/main/java/org/apache/polaris/server/quarkus/Readme.java similarity index 100% rename from quarkus/server/src/main/java/org/apache/polaris/server/quarkus/Readme.java rename to runtime/server/src/main/java/org/apache/polaris/server/quarkus/Readme.java diff --git a/quarkus/server/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/runtime/server/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor similarity index 100% rename from quarkus/server/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor rename to runtime/server/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor diff --git a/quarkus/server/src/main/resources/application.properties b/runtime/server/src/main/resources/application.properties similarity index 100% rename from quarkus/server/src/main/resources/application.properties rename to runtime/server/src/main/resources/application.properties diff --git a/quarkus/service/README-quarkus.md b/runtime/service/README-quarkus.md similarity index 90% rename from quarkus/service/README-quarkus.md rename to runtime/service/README-quarkus.md index 1add643336..cf303aa10a 100644 --- a/quarkus/service/README-quarkus.md +++ b/runtime/service/README-quarkus.md @@ -17,7 +17,7 @@ under the License. --> -This module contains the Polaris Service powered by Quarkus (instead of Dropwizard). +This module contains the Polaris Service powered by Quarkus. # Main differences @@ -45,35 +45,35 @@ The build creates ready to run package: You can directly run Polaris service (in the build scope) using: ``` -./gradlew :polaris-quarkus-service:quarkusRun +./gradlew :polaris-runtime-service:quarkusRun ``` You can run in Dev mode as well: ``` -./gradlew --console=plain :polaris-quarkus-service:quarkusDev +./gradlew --console=plain :polaris-runtime-service:quarkusDev ``` You can directly build a Docker image using: ``` -./gradlew :polaris-quarkus-service:imageBuild +./gradlew :polaris-runtime-service:imageBuild ``` # Configuration The main configuration file is not the `application.properties`. The default configuration is -packaged as part of the `polaris-quarkus-service`. `polaris-quarkus-service` uses several +packaged as part of the `polaris-runtime-service`. `polaris-runtime-service` uses several configuration sources (in this order): * system properties * environment variables * `.env` file in the current working directory * `$PWD/config/application.properties` file -* the `application.properties` packaged in the `polaris-quarkus-service` application +* the `application.properties` packaged in the `polaris-runtime-service` application It means you can override some configuration property using environment variables for example. -By default, `polaris-quarkus-service` uses 8181 as the HTTP port (defined in the `quarkus.http.port` +By default, `polaris-runtime-service` uses 8181 as the HTTP port (defined in the `quarkus.http.port` configuration property) and 8182 as the management port (defined in the `quarkus.management.port` configuration property). diff --git a/quarkus/service/build.gradle.kts b/runtime/service/build.gradle.kts similarity index 97% rename from quarkus/service/build.gradle.kts rename to runtime/service/build.gradle.kts index 9cfc49e5b2..6dc7a53855 100644 --- a/quarkus/service/build.gradle.kts +++ b/runtime/service/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) - id("polaris-quarkus") + id("polaris-runtime") } dependencies { @@ -30,7 +30,7 @@ dependencies { implementation(project(":polaris-api-catalog-service")) implementation(project(":polaris-service-common")) - implementation(project(":polaris-quarkus-defaults")) + implementation(project(":polaris-runtime-defaults")) implementation(platform(libs.iceberg.bom)) implementation("org.apache.iceberg:iceberg-api") @@ -40,7 +40,7 @@ dependencies { implementation(platform(libs.opentelemetry.bom)) implementation(platform(libs.quarkus.bom)) - implementation(project(":polaris-quarkus-common")) + implementation(project(":polaris-runtime-common")) implementation("io.quarkus:quarkus-logging-json") implementation("io.quarkus:quarkus-rest-jackson") implementation("io.quarkus:quarkus-reactive-routes") @@ -124,7 +124,7 @@ dependencies { testImplementation(libs.threeten.extra) testImplementation(libs.hawkular.agent.prometheus.scraper) - testImplementation(project(":polaris-quarkus-test-commons")) + testImplementation(project(":polaris-runtime-test-common")) testImplementation("io.quarkus:quarkus-junit5") implementation(libs.awaitility) testImplementation(platform(libs.testcontainers.bom)) diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusApplicationIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusApplicationIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusApplicationIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusApplicationIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusManagementServiceIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusManagementServiceIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusManagementServiceIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusManagementServiceIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusPolicyServiceIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusPolicyServiceIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusPolicyServiceIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusPolicyServiceIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusViewFileIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusViewFileIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusViewFileIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusViewFileIT.java diff --git a/quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcRestCatalogIT.java b/runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcRestCatalogIT.java similarity index 100% rename from quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcRestCatalogIT.java rename to runtime/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcRestCatalogIT.java diff --git a/quarkus/service/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager b/runtime/service/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager similarity index 100% rename from quarkus/service/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager rename to runtime/service/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentor.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentor.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentor.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentor.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentor.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentor.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentor.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentor.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationRealmConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationRealmConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationRealmConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticationRealmConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusPrincipalAuthInfo.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusPrincipalAuthInfo.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusPrincipalAuthInfo.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusPrincipalAuthInfo.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentor.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentor.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentor.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentor.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentor.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentor.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentor.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentor.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocator.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocator.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocator.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocator.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapper.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapper.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapper.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapper.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapper.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapper.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapper.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapper.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalMapper.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalMapper.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalMapper.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalMapper.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalRolesMapper.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalRolesMapper.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalRolesMapper.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/mapping/PrincipalRolesMapper.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolver.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolver.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolver.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolver.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/OidcTenantResolver.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/OidcTenantResolver.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/OidcTenantResolver.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/external/tenant/OidcTenantResolver.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanism.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanism.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanism.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanism.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProvider.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProvider.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProvider.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProvider.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusFileIOConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusFileIOConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusFileIOConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusFileIOConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/ProductionReadinessChecks.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/ProductionReadinessChecks.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/ProductionReadinessChecks.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/ProductionReadinessChecks.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusBehaviorChangesConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusBehaviorChangesConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusBehaviorChangesConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusBehaviorChangesConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFilterPriorities.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFilterPriorities.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFilterPriorities.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFilterPriorities.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReadinessConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReadinessConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReadinessConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReadinessConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReservedProperties.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReservedProperties.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReservedProperties.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusReservedProperties.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedBehaviorChangesConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedBehaviorChangesConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedBehaviorChangesConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedBehaviorChangesConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedFeaturesConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedFeaturesConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedFeaturesConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusResolvedFeaturesConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusRealmContextConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusRealmContextConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusRealmContextConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusRealmContextConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/RealmContextFilter.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/context/RealmContextFilter.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/RealmContextFilter.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/context/RealmContextFilter.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/events/QuarkusPolarisEventListenerConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/events/QuarkusPolarisEventListenerConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/events/QuarkusPolarisEventListenerConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/events/QuarkusPolarisEventListenerConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/legacy/LegacyManagementEndpoints.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/legacy/LegacyManagementEndpoints.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/legacy/LegacyManagementEndpoints.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/legacy/LegacyManagementEndpoints.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterFilterConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterFilterConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterFilterConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterFilterConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusTokenBucketConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusTokenBucketConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusTokenBucketConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusTokenBucketConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/secrets/QuarkusSecretsManagerConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/secrets/QuarkusSecretsManagerConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/secrets/QuarkusSecretsManagerConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/secrets/QuarkusSecretsManagerConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java b/runtime/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java similarity index 100% rename from quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java rename to runtime/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/ManagementServiceTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/ManagementServiceTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/ManagementServiceTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/ManagementServiceTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/RealmHeaderTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/RealmHeaderTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/RealmHeaderTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/RealmHeaderTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/ActiveRolesAugmentorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/AuthenticatingAugmentorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/OidcTenantResolvingAugmentorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/PrincipalAuthInfoAugmentorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocatorTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocatorTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocatorTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/ClaimsLocatorTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapperTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapperTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapperTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalMapperTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapperTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapperTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapperTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/mapping/DefaultPrincipalRolesMapperTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolverTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolverTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolverTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/external/tenant/DefaultOidcTenantResolverTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanismTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanismTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanismTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalAuthenticationMechanismTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProviderTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProviderTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProviderTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/auth/internal/InternalIdentityProviderTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/CatalogNoEntityCacheTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/CatalogNoEntityCacheTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/CatalogNoEntityCacheTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/CatalogNoEntityCacheTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/GetConfigTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/GetConfigTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/GetConfigTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/GetConfigTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogHandlerAuthzTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogHandlerAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogHandlerAuthzTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogViewTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogViewTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogViewTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogViewTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogWithEntityCacheTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogWithEntityCacheTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogWithEntityCacheTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogWithEntityCacheTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogHandlerAuthzTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogHandlerAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogHandlerAuthzTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusApplicationIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusPolicyServiceIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIntegrationTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIntegrationTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIntegrationTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagDisabledMetricsTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagDisabledMetricsTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagDisabledMetricsTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagDisabledMetricsTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagEnabledMetricsTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagEnabledMetricsTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagEnabledMetricsTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagEnabledMetricsTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/BatchFileCleanupTaskHandlerTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/BatchFileCleanupTaskHandlerTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/BatchFileCleanupTaskHandlerTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/BatchFileCleanupTaskHandlerTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestData.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestData.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestData.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestData.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java similarity index 100% rename from quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java rename to runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java diff --git a/quarkus/service/src/test/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager b/runtime/service/src/test/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager similarity index 100% rename from quarkus/service/src/test/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager rename to runtime/service/src/test/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager diff --git a/quarkus/service/src/test/resources/logback-test.xml b/runtime/service/src/test/resources/logback-test.xml similarity index 100% rename from quarkus/service/src/test/resources/logback-test.xml rename to runtime/service/src/test/resources/logback-test.xml diff --git a/quarkus/service/src/testFixtures/java/org/apache/polaris/service/quarkus/it/QuarkusServerManager.java b/runtime/service/src/testFixtures/java/org/apache/polaris/service/quarkus/it/QuarkusServerManager.java similarity index 100% rename from quarkus/service/src/testFixtures/java/org/apache/polaris/service/quarkus/it/QuarkusServerManager.java rename to runtime/service/src/testFixtures/java/org/apache/polaris/service/quarkus/it/QuarkusServerManager.java diff --git a/quarkus/spark-tests/build.gradle.kts b/runtime/spark-tests/build.gradle.kts similarity index 96% rename from quarkus/spark-tests/build.gradle.kts rename to runtime/spark-tests/build.gradle.kts index 0e83a7f279..21aede694d 100644 --- a/quarkus/spark-tests/build.gradle.kts +++ b/runtime/spark-tests/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) - id("polaris-quarkus") + id("polaris-runtime") } dependencies { @@ -32,10 +32,10 @@ dependencies { exclude(group = "org.scala-lang", module = "scala-reflect") } - implementation(project(":polaris-quarkus-service")) + implementation(project(":polaris-runtime-service")) testImplementation(project(":polaris-tests")) - testImplementation(testFixtures(project(":polaris-quarkus-service"))) + testImplementation(testFixtures(project(":polaris-runtime-service"))) testImplementation(platform(libs.quarkus.bom)) testImplementation("io.quarkus:quarkus-junit5") diff --git a/quarkus/spark-tests/src/intTest/java/org/apache/polaris/service/quarkus/spark/it/QuarkusSparkIT.java b/runtime/spark-tests/src/intTest/java/org/apache/polaris/service/quarkus/spark/it/QuarkusSparkIT.java similarity index 100% rename from quarkus/spark-tests/src/intTest/java/org/apache/polaris/service/quarkus/spark/it/QuarkusSparkIT.java rename to runtime/spark-tests/src/intTest/java/org/apache/polaris/service/quarkus/spark/it/QuarkusSparkIT.java diff --git a/quarkus/spark-tests/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager b/runtime/spark-tests/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager similarity index 100% rename from quarkus/spark-tests/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager rename to runtime/spark-tests/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager diff --git a/quarkus/test-commons/build.gradle.kts b/runtime/test-commons/build.gradle.kts similarity index 98% rename from quarkus/test-commons/build.gradle.kts rename to runtime/test-commons/build.gradle.kts index cb6a40d45f..709bd42dcb 100644 --- a/quarkus/test-commons/build.gradle.kts +++ b/runtime/test-commons/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(libs.plugins.quarkus) alias(libs.plugins.jandex) - id("polaris-quarkus") + id("polaris-runtime") } configurations.all { diff --git a/quarkus/test-commons/src/main/java/org/apache/polaris/test/commons/PostgresRelationalJdbcLifeCycleManagement.java b/runtime/test-commons/src/main/java/org/apache/polaris/test/commons/PostgresRelationalJdbcLifeCycleManagement.java similarity index 100% rename from quarkus/test-commons/src/main/java/org/apache/polaris/test/commons/PostgresRelationalJdbcLifeCycleManagement.java rename to runtime/test-commons/src/main/java/org/apache/polaris/test/commons/PostgresRelationalJdbcLifeCycleManagement.java diff --git a/quarkus/test-commons/src/main/java/org/apache/polaris/test/commons/RelationalJdbcProfile.java b/runtime/test-commons/src/main/java/org/apache/polaris/test/commons/RelationalJdbcProfile.java similarity index 100% rename from quarkus/test-commons/src/main/java/org/apache/polaris/test/commons/RelationalJdbcProfile.java rename to runtime/test-commons/src/main/java/org/apache/polaris/test/commons/RelationalJdbcProfile.java diff --git a/site/content/in-dev/unreleased/admin-tool.md b/site/content/in-dev/unreleased/admin-tool.md index 15ab617634..14f37b6f0f 100644 --- a/site/content/in-dev/unreleased/admin-tool.md +++ b/site/content/in-dev/unreleased/admin-tool.md @@ -29,15 +29,15 @@ example, to build the tool with support for Postgres, run the following: ```shell ./gradlew \ - :polaris-quarkus-admin:assemble \ - :polaris-quarkus-admin:quarkusAppPartsBuild --rerun \ + :polaris-admin:assemble \ + :polaris-admin:quarkusAppPartsBuild --rerun \ -Dquarkus.container-image.build=true ``` The above command will generate: -- One standalone JAR in `quarkus/admin/build/polaris-quarkus-admin-*-runner.jar` -- Two distribution archives in `quarkus/admin/build/distributions` +- One standalone JAR in `runtime/admin/build/polaris-admin-*-runner.jar` +- Two distribution archives in `runtime/admin/build/distributions` - Two Docker images named `apache/polaris-admin-tool:latest` and `apache/polaris-admin-tool:` ## Usage @@ -46,7 +46,7 @@ Please make sure the admin tool and Polaris server are with the same version bef To run the standalone JAR, use the following command: ```shell -java -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar --help +java -jar runtime/admin/build/polaris-admin-*-runner.jar --help ``` To run the Docker image, use the following command: @@ -58,7 +58,7 @@ docker run apache/polaris-admin-tool:latest --help The basic usage of the Polaris Admin Tool is outlined below: ``` -Usage: polaris-quarkus-admin-runner.jar [-hV] [COMMAND] +Usage: polaris-admin-runner.jar [-hV] [COMMAND] Polaris Admin Tool -h, --help Show this help message and exit. -V, --version Print version information and exit. @@ -89,13 +89,13 @@ issues. If a realm is already bootstrapped, running the `bootstrap` command agai effect on that realm. ```shell -java -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar bootstrap --help +java -jar runtime/admin/build/polaris-admin-*-runner.jar bootstrap --help ``` The basic usage of the `bootstrap` command is outlined below: ``` -Usage: polaris-quarkus-admin-runner.jar bootstrap [-hV] [-c=]... -r= [-r=]... Bootstraps realms and root principal credentials. -c, --credential= @@ -110,7 +110,7 @@ For example, to bootstrap the `realm1` realm and create its root principal crede client ID `admin` and client secret `admin`, you can run the following command: ```shell -java -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar bootstrap -r realm1 -c realm1,admin,admin +java -jar runtime/admin/build/polaris-admin-*-runner.jar bootstrap -r realm1 -c realm1,admin,admin ``` ## Purging Realms and Principal Credentials @@ -122,13 +122,13 @@ The `purge` command is used to remove realms and principal credentials from the credentials, grants, and any other data associated with the realms. ```shell -java -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar purge --help +java -jar runtime/admin/build/polaris-admin-*-runner.jar purge --help ``` The basic usage of the `purge` command is outlined below: ``` -Usage: polaris-quarkus-admin-runner.jar purge [-hV] -r= [-r=]... +Usage: polaris-admin-runner.jar purge [-hV] -r= [-r=]... Purge realms and all associated entities. -h, --help Show this help message and exit. -r, --realm= The name of a realm to purge. @@ -138,5 +138,5 @@ Purge realms and all associated entities. For example, to purge the `realm1` realm, you can run the following command: ```shell -java -jar quarkus/admin/build/polaris-quarkus-admin-*-runner.jar purge -r realm1 +java -jar runtime/admin/build/polaris-admin-*-runner.jar purge -r realm1 ``` \ No newline at end of file diff --git a/site/content/in-dev/unreleased/getting-started/quickstart.md b/site/content/in-dev/unreleased/getting-started/quickstart.md index 6fac350e89..a9fd43f906 100644 --- a/site/content/in-dev/unreleased/getting-started/quickstart.md +++ b/site/content/in-dev/unreleased/getting-started/quickstart.md @@ -31,9 +31,9 @@ Before running Polaris, ensure you have completed the following setup steps: ```shell cd ~/polaris ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild \ - :polaris-quarkus-admin:assemble --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild \ + :polaris-admin:assemble --rerun \ -Dquarkus.container-image.tag=postgres-latest \ -Dquarkus.container-image.build=true ``` @@ -81,7 +81,7 @@ Run the following command to start Polaris: You should see output for some time as Polaris builds and starts up. Eventually, you won’t see any more logs and should see messages that resemble the following: ``` -INFO [io.quarkus] [,] [,,,] (Quarkus Main Thread) polaris-quarkus-service on JVM (powered by Quarkus ) started in 2.656s. Listening on: http://localhost:8181. Management interface listening on http://0.0.0.0:8182. +INFO [io.quarkus] [,] [,,,] (Quarkus Main Thread) polaris-runtime-service on JVM (powered by Quarkus ) started in 2.656s. Listening on: http://localhost:8181. Management interface listening on http://0.0.0.0:8182. INFO [io.quarkus] [,] [,,,] (Quarkus Main Thread) Profile prod activated. Live Coding activated. INFO [io.quarkus] [,] [,,,] (Quarkus Main Thread) Installed features: [...] ``` diff --git a/site/content/in-dev/unreleased/metastores.md b/site/content/in-dev/unreleased/metastores.md index 2660584cd6..4810b124a0 100644 --- a/site/content/in-dev/unreleased/metastores.md +++ b/site/content/in-dev/unreleased/metastores.md @@ -110,13 +110,13 @@ To build Polaris with the necessary H2 dependency and start the Polaris service, ```shell ./gradlew \ - :polaris-quarkus-server:assemble \ - :polaris-quarkus-server:quarkusAppPartsBuild --rerun \ + :polaris-server:assemble \ + :polaris-server:quarkusAppPartsBuild --rerun \ -PeclipseLinkDeps=com.h2database:h2:2.3.232 java -Dpolaris.persistence.type=eclipse-link \ -Dpolaris.persistence.eclipselink.configuration-file=/path/to/persistence.xml \ -Dpolaris.persistence.eclipselink.persistence-unit=polaris \ - -jar quarkus/server/build/quarkus-app/quarkus-run.jar + -jar runtime/server/build/quarkus-app/quarkus-run.jar ``` ### Using Postgres diff --git a/tools/config-docs/site/build.gradle.kts b/tools/config-docs/site/build.gradle.kts index 6d2dd2fb22..bb228a0d1c 100644 --- a/tools/config-docs/site/build.gradle.kts +++ b/tools/config-docs/site/build.gradle.kts @@ -24,7 +24,7 @@ plugins { description = "Polaris site - reference docs" val genProjectPaths = listOf( - ":polaris-quarkus-service", + ":polaris-runtime-service", ":polaris-eclipselink", )