This is an automated email from the ASF dual-hosted git repository.
adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 6744d287 Quarkus: separate service module from server artifact (#628)
6744d287 is described below
commit 6744d287d04f54271076c7cc8e05d5189690795b
Author: Alexandre Dutra <[email protected]>
AuthorDate: Tue Jan 14 12:25:25 2025 +0100
Quarkus: separate service module from server artifact (#628)
---
gradle/projects.main.properties | 1 +
quarkus/server/README.md | 12 +++++
quarkus/server/build.gradle.kts | 55 ++++++++++++++++++++++
.../src/main/docker/Dockerfile.jvm | 0
.../io.smallrye.config.ConfigSourceInterceptor | 0
.../src/main/resources/application.properties} | 8 +++-
quarkus/service/build.gradle.kts | 15 ++----
.../src/main/resources/application.properties | 7 ---
8 files changed, 79 insertions(+), 19 deletions(-)
diff --git a/gradle/projects.main.properties b/gradle/projects.main.properties
index b5de26f9..6d1a3105 100644
--- a/gradle/projects.main.properties
+++ b/gradle/projects.main.properties
@@ -24,6 +24,7 @@ polaris-api-management-model=api/management-model
polaris-api-management-service=api/management-service
polaris-service-common=service/common
polaris-quarkus-service=quarkus/service
+polaris-quarkus-server=quarkus/server
polaris-eclipselink=extension/persistence/eclipselink
polaris-jpa-model=extension/persistence/jpa-model
polaris-tests=integration-tests
diff --git a/quarkus/server/README.md b/quarkus/server/README.md
new file mode 100644
index 00000000..7fb773ec
--- /dev/null
+++ b/quarkus/server/README.md
@@ -0,0 +1,12 @@
+# Polaris Quarkus Server
+
+This module contains the Quarkus-based Polaris server main artifact.
+
+Building this module will create a zip/tar distribution with the Polaris
server.
+
+To also build the Docker image, you can use the following command (a running
Docker daemon is
+required):
+
+```shell
+./gradlew :polaris-quarkus-server:build -Dquarkus.container-image.build=true
+```
diff --git a/quarkus/server/build.gradle.kts b/quarkus/server/build.gradle.kts
new file mode 100644
index 00000000..c27c77e4
--- /dev/null
+++ b/quarkus/server/build.gradle.kts
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+plugins {
+ alias(libs.plugins.quarkus)
+ alias(libs.plugins.openapi.generator)
+ id("polaris-server")
+ id("polaris-license-report")
+ id("distribution")
+}
+
+dependencies {
+ implementation(project(":polaris-core"))
+ implementation(project(":polaris-api-management-service"))
+ implementation(project(":polaris-api-iceberg-service"))
+ implementation(project(":polaris-service-common"))
+ implementation(project(":polaris-quarkus-service"))
+
+ implementation(platform(libs.quarkus.bom))
+ implementation("io.quarkus:quarkus-container-image-docker")
+
+ // override dnsjava version in dependencies due to
https://github.com/dnsjava/dnsjava/issues/329
+ implementation(platform(libs.dnsjava))
+}
+
+tasks.named("distZip") { dependsOn("quarkusBuild") }
+
+tasks.named("distTar") { dependsOn("quarkusBuild") }
+
+distributions {
+ main {
+ contents {
+ from(project.layout.buildDirectory.dir("quarkus-app"))
+ from("../../NOTICE")
+ from("../../LICENSE-BINARY-DIST").rename("LICENSE-BINARY-DIST",
"LICENSE")
+ exclude("lib/main/io.quarkus.quarkus-container-image*")
+ }
+ }
+}
diff --git a/quarkus/service/src/main/docker/Dockerfile.jvm
b/quarkus/server/src/main/docker/Dockerfile.jvm
similarity index 100%
rename from quarkus/service/src/main/docker/Dockerfile.jvm
rename to quarkus/server/src/main/docker/Dockerfile.jvm
diff --git
a/quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
b/quarkus/server/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
similarity index 100%
copy from
quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
copy to
quarkus/server/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
diff --git
a/quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
b/quarkus/server/src/main/resources/application.properties
similarity index 76%
rename from
quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
rename to quarkus/server/src/main/resources/application.properties
index b92210f7..3f5018a7 100644
---
a/quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
+++ b/quarkus/server/src/main/resources/application.properties
@@ -17,4 +17,10 @@
# under the License.
#
-io.smallrye.config.LoggingConfigSourceInterceptor
\ No newline at end of file
+quarkus.application.name=Apache Polaris Server (incubating)
+
+quarkus.container-image.build=false
+quarkus.container-image.push=false
+quarkus.container-image.registry=docker.io
+quarkus.container-image.group=apache
+quarkus.container-image.name=polaris
diff --git a/quarkus/service/build.gradle.kts b/quarkus/service/build.gradle.kts
index 94ced9bf..be3fd2c7 100644
--- a/quarkus/service/build.gradle.kts
+++ b/quarkus/service/build.gradle.kts
@@ -19,10 +19,8 @@
plugins {
alias(libs.plugins.quarkus)
- alias(libs.plugins.openapi.generator)
+ alias(libs.plugins.jandex)
id("polaris-server")
- id("polaris-license-report")
- id("application")
}
dependencies {
@@ -185,11 +183,6 @@ tasks.named("compileJava") {
dependsOn("compileQuarkusGeneratedSourcesJava") }
tasks.named("sourcesJar") { dependsOn("compileQuarkusGeneratedSourcesJava") }
-distributions {
- main {
- contents {
- from("../../NOTICE")
- from("../../LICENSE-BINARY-DIST").rename("LICENSE-BINARY-DIST",
"LICENSE")
- }
- }
-}
+tasks.named("javadoc") { dependsOn("jandex") }
+
+tasks.named("quarkusDependenciesBuild") { dependsOn("jandex") }
diff --git a/quarkus/service/src/main/resources/application.properties
b/quarkus/service/src/main/resources/application.properties
index 1deccdfa..ba30712b 100644
--- a/quarkus/service/src/main/resources/application.properties
+++ b/quarkus/service/src/main/resources/application.properties
@@ -17,17 +17,10 @@
# under the License.
#
-quarkus.application.name=Apache Polaris (incubating)
quarkus.banner.path=/org/apache/polaris/service/banner.txt
quarkus.config.mapping.validate-unknown=true
-quarkus.container-image.build=false
-quarkus.container-image.push=false
-quarkus.container-image.registry=docker.io
-quarkus.container-image.group=apache
-quarkus.container-image.name=polaris
-
quarkus.http.auth.basic=false
quarkus.http.access-log.enabled=true
# quarkus.http.access-log.pattern=common
