Merge polaris-service-common into polaris-runtime-service (#2233)

Author: adutra

.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, runtime, persistence, spec, getting-started, helm'
+        folder-path: 'regtests, .github, build-logic, polaris-core, runtime, persistence, spec, getting-started, helm'
         file-path: 'CHAT_BYLAWS.md, CODE_OF_CONDUCT.md, CONTRIBUTING.md, README.md, SECURITY.md'

LICENSE

@@ -218,11 +218,11 @@ This product includes code from Apache Iceberg.
 * spec/iceberg-rest-catalog-open-api.yaml
 * spec/polaris-catalog-apis/oauth-tokens-api.yaml
 * integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationBase.java
-* service/common/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
-* service/common/src/main/java/org/apache/polaris/service/catalog/iceberg/CatalogHandlerUtils.java
+* runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
+* runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/CatalogHandlerUtils.java
 * plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/PolarisRESTCatalog.java
 * plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/SparkCatalog.java
-* service/common/src/main/java/org/apache/polaris/service/catalog/common/LocationUtils.java
+* runtime/service/src/main/java/org/apache/polaris/service/catalog/common/LocationUtils.java
 
 Copyright: Copyright 2017-2025 The Apache Software Foundation
 Home page: https://iceberg.apache.org

README.md

@@ -51,8 +51,6 @@ Apache Polaris is organized into the following modules:
   - `polaris-api-management-model` - The Polaris management model
   - `polaris-api-management-service` - The Polaris management service
   - `polaris-api-iceberg-service` - The Iceberg REST service
-- Service modules:
-  - `polaris-service-common` - The main components of the Polaris server
 - Runtime modules:
   - `polaris-runtime-service` - The runtime components of the Polaris server
   - `polaris-runtime-defaults` - The runtime configuration defaults

bom/build.gradle.kts

@@ -40,7 +40,6 @@ dependencies {
     api(project(":polaris-config-docs-generator"))
 
     api(project(":polaris-core"))
-    api(project(":polaris-service-common"))
 
     api(project(":polaris-eclipselink"))
     api(project(":polaris-relational-jdbc"))

build.gradle.kts

@@ -102,8 +102,7 @@ tasks.named<RatTask>("rat").configure {
   excludes.add("gradle/wrapper/gradle-wrapper*")
 
   excludes.add("logs/**")
-  excludes.add("service/common/src/**/banner.txt")
-  excludes.add("quarkus/admin/src/**/banner.txt")
+  excludes.add("runtime/service/src/**/banner.txt")
 
   excludes.add("site/node_modules/**")
   excludes.add("site/layouts/robots.txt")

gradle/projects.main.properties

@@ -24,7 +24,6 @@ polaris-api-iceberg-service=api/iceberg-service
 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-runtime-defaults=runtime/defaults
 polaris-runtime-service=runtime/service
 polaris-server=runtime/server

plugins/spark/v3.5/integration/build.gradle.kts

@@ -100,7 +100,7 @@ tasks.named<Test>("intTest").configure {
     environment("AWS_REGION", "us-west-2")
   }
   // Note: the test secrets are referenced in
-  // org.apache.polaris.service.quarkus.it.QuarkusServerManager
+  // org.apache.polaris.service.it.ServerManager
   environment("POLARIS_BOOTSTRAP_CREDENTIALS", "POLARIS,test-admin,test-secret")
   jvmArgs("--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED")
   // Need to allow a java security manager after Java 21, for Subject.getSubject to work

plugins/spark/v3.5/integration/src/intTest/resources/META-INF/services/org.apache.polaris.service.it.ext.PolarisServerManager

@@ -17,4 +17,4 @@
 # under the License.
 #
 
-org.apache.polaris.service.quarkus.it.QuarkusServerManager
+org.apache.polaris.service.it.ServerManager

runtime/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java renamed to runtime/admin/src/main/java/org/apache/polaris/admintool/config/AdminToolProducers.java

@@ -34,7 +34,7 @@
 import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-public class QuarkusProducers {
+public class AdminToolProducers {
 
   @Produces
   public MetaStoreManagerFactory metaStoreManagerFactory(

runtime/defaults/src/main/resources/application.properties

@@ -195,24 +195,24 @@ polaris.oidc.principal-roles-mapper.type=default
 quarkus.arc.ignored-split-packages=\
   org.apache.polaris.service.catalog.api,\
   org.apache.polaris.service.catalog.api.impl,\
-  org.apache.polaris.service.quarkus.metrics,\
-  org.apache.polaris.service.quarkus.config,\
-  org.apache.polaris.service.quarkus.auth,\
-  org.apache.polaris.service.quarkus.auth.external,\
-  org.apache.polaris.service.quarkus.auth.external.mapping,\
-  org.apache.polaris.service.quarkus.auth.external.tenant,\
-  org.apache.polaris.service.quarkus.auth.internal,\
-  org.apache.polaris.service.quarkus.events,\
-  org.apache.polaris.service.quarkus.task,\
-  org.apache.polaris.service.quarkus.secrets,\
-  org.apache.polaris.service.quarkus.storage,\
-  org.apache.polaris.service.quarkus.tracing,\
-  org.apache.polaris.service.quarkus.ratelimiter,\
-  org.apache.polaris.service.quarkus.catalog.io,\
-  org.apache.polaris.service.quarkus.legacy,\
-  org.apache.polaris.service.quarkus.context,\
-  org.apache.polaris.service.quarkus.persistence,\
-  org.apache.polaris.service.quarkus.logging,\
+  org.apache.polaris.service.metrics,\
+  org.apache.polaris.service.config,\
+  org.apache.polaris.service.auth,\
+  org.apache.polaris.service.auth.external,\
+  org.apache.polaris.service.auth.external.mapping,\
+  org.apache.polaris.service.auth.external.tenant,\
+  org.apache.polaris.service.auth.internal,\
+  org.apache.polaris.service.events,\
+  org.apache.polaris.service.task,\
+  org.apache.polaris.service.secrets,\
+  org.apache.polaris.service.storage,\
+  org.apache.polaris.service.tracing,\
+  org.apache.polaris.service.ratelimiter,\
+  org.apache.polaris.service.catalog.io,\
+  org.apache.polaris.service.legacy,\
+  org.apache.polaris.service.context,\
+  org.apache.polaris.service.persistence,\
+  org.apache.polaris.service.logging,\
   org.apache.polaris.service.types,\
   org.apache.polaris.admintool.config,\
   org.apache.polaris.admintool