Merge Polaris-Admin to Polaris-Server

.github/workflows/gradle.yml

@@ -65,7 +65,7 @@ jobs:
         run: |
           ./gradlew check sourceTarball distTar distZip publishToMavenLocal \
             -x :polaris-runtime-service:test \
-            -x :polaris-admin:test \
+            -x :polaris-server:test \
             -x intTest --continue
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
@@ -154,9 +154,9 @@ jobs:
             **/build/reports/tests/**
 
   # Durations (approximates from GH CI):
-  # - :polaris-admin:test 6m
-  quarkus-admin-tests:
-    name: Quarkus Admin Tests
+  # - :polaris-server:test 6m
+  quarkus-server-tests:
+    name: Quarkus Server Tests
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -169,21 +169,21 @@ jobs:
           distribution: 'temurin'
       - name: Prepare Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-prepare
-      - name: Run Quarkus admin tests
+      - name: Run Quarkus server tests
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: |
-          ./gradlew :polaris-admin:test --continue
+          ./gradlew :polaris-server:test --continue
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         with:
-          job-name: 'quarkus-admin-tests'
+          job-name: 'quarkus-server-tests'
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         if: always()
         with:
-          name: upload-quarkus-admin-test-artifacts
+          name: upload-quarkus-server-test-artifacts
           path: |
             **/build/test-results/**
             **/build/reports/tests/**
@@ -238,7 +238,7 @@ jobs:
     needs:
       - unit-tests
       - quarkus-tests
-      - quarkus-admin-tests
+      - quarkus-server-tests
       - quarkus-int-tests
       - integration-tests
     steps:

.github/workflows/helm.yml

@@ -99,8 +99,6 @@ jobs:
           ./gradlew \
             :polaris-server:assemble \
             :polaris-server:quarkusAppPartsBuild --rerun \
-            :polaris-admin:assemble \
-            :polaris-admin:quarkusAppPartsBuild --rerun \
             -Dquarkus.container-image.build=true
           minikube image ls
 

LICENSE

@@ -328,7 +328,6 @@ This product includes code from Project Nessie.
 * tools/minio-testcontainer/src/main/java/org/apache/polaris/test/minio/MinioAccess.java
 * tools/minio-testcontainer/src/main/java/org/apache/polaris/test/minio/MinioContainer.java
 * tools/minio-testcontainer/src/main/java/org/apache/polaris/test/minio/MinioExtension.java
-* runtime/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
 * runtime/service/src/main/java/org/apache/polaris/service/storage/aws/StsClientsPool.java
 * helm/polaris/tests/logging_storage_test.yaml
 * helm/polaris/tests/quantity_test.yaml

bom/build.gradle.kts

@@ -89,8 +89,6 @@ dependencies {
 
     api(project(":polaris-extensions-auth-opa"))
 
-    api(project(":polaris-admin"))
-    api(project(":polaris-runtime-common"))
     api(project(":polaris-runtime-test-common"))
     api(project(":polaris-runtime-defaults"))
     api(project(":polaris-server"))

gradle/projects.main.properties

@@ -24,13 +24,12 @@ 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-runtime-common=runtime/common
 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-common
 polaris-relational-jdbc=persistence/relational-jdbc
 polaris-tests=integration-tests