From f07949126ac4a9af2cb39da8a5ddf485d7aabe55 Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Wed, 21 Aug 2024 12:59:26 +0200 Subject: [PATCH] Drop support for Java 8 (#9253) * Remove usage of no longer needed "annotation stripper" plugin * Remove no longer needed `:nessie-model-quarkus` project * Let all "server side" projects use `nessie-conventions-server`, even if this is currently the same as `nessie-conventions-client` * Let all "client side" projects use `nessie-conventions-client` --- CHANGELOG.md | 3 + api/client-testextension/build.gradle.kts | 2 +- api/client/build.gradle.kts | 8 -- api/model-quarkus/build.gradle.kts | 89 ------------------- api/model-quarkus/src/main | 1 - api/model/build.gradle.kts | 8 -- bom/build.gradle.kts | 1 - ...adle.kts => nessie-common-java.gradle.kts} | 6 +- .../nessie-conventions-client.gradle.kts | 29 +----- .../nessie-conventions-quarkus.gradle.kts | 14 +-- .../nessie-conventions-scala.gradle.kts | 19 ++-- .../nessie-conventions-server.gradle.kts | 14 +-- .../nessie-conventions-server8.gradle.kts | 31 ------- .../nessie-conventions-spark.gradle.kts | 9 +- ...ie-conventions-unpublished-tool.gradle.kts | 6 +- catalog/format/iceberg-bench/build.gradle.kts | 2 +- .../iceberg-fixturegen/build.gradle.kts | 2 +- catalog/format/iceberg/build.gradle.kts | 8 -- catalog/model/build.gradle.kts | 8 -- catalog/service/rest/build.gradle.kts | 8 -- cli/cli/build.gradle.kts | 6 +- cli/grammar/build.gradle.kts | 2 +- gc/gc-base-tests/build.gradle.kts | 2 +- gc/gc-base/build.gradle.kts | 2 +- gc/gc-iceberg-files/build.gradle.kts | 2 +- gc/gc-iceberg-inttest/build.gradle.kts | 2 +- gc/gc-iceberg-mock/build.gradle.kts | 2 +- gc/gc-iceberg/build.gradle.kts | 2 +- gc/gc-repository-jdbc/build.gradle.kts | 2 +- gc/gc-tool-inttest/build.gradle.kts | 2 +- gc/gc-tool/build.gradle.kts | 2 +- gradle.properties | 4 +- gradle/libs.versions.toml | 1 - gradle/projects.main.properties | 1 - servers/quarkus-auth/build.gradle.kts | 9 +- servers/quarkus-catalog/build.gradle.kts | 7 -- servers/quarkus-common/build.gradle.kts | 7 -- servers/quarkus-config/build.gradle.kts | 7 -- servers/quarkus-distcache/build.gradle.kts | 7 -- servers/quarkus-rest/build.gradle.kts | 9 +- servers/quarkus-server/build.gradle.kts | 13 +-- servers/quarkus-tests/build.gradle.kts | 7 -- servers/services-config/build.gradle.kts | 2 +- servers/services/build.gradle.kts | 2 +- testing/azurite-container/build.gradle.kts | 2 +- testing/gcs-container/build.gradle.kts | 2 +- testing/keycloak-container/build.gradle.kts | 2 +- testing/minio-container/build.gradle.kts | 2 +- testing/nessie-container/build.gradle.kts | 2 +- testing/object-storage-mock/build.gradle.kts | 2 +- testing/trino-container/build.gradle.kts | 2 +- tools/content-generator/build.gradle.kts | 2 +- tools/server-admin/build.gradle.kts | 9 +- tools/storage/uri/build.gradle.kts | 2 +- versioned/spi/build.gradle.kts | 2 +- 55 files changed, 61 insertions(+), 338 deletions(-) delete mode 100644 api/model-quarkus/build.gradle.kts delete mode 120000 api/model-quarkus/src/main rename build-logic/src/main/kotlin/{nessie-conventions-iceberg.gradle.kts => nessie-common-java.gradle.kts} (83%) delete mode 100644 build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts diff --git a/CHANGELOG.md b/CHANGELOG.md index 25dd1a97da6..341b88d2f41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ as necessary. Empty sections will not end in the release notes. ### Upgrade notes +- Support for Java 8 has been removed, even for Nessie clients. Minimum runtime requirement for clients + is Java 11. + ### Breaking changes ### New Features diff --git a/api/client-testextension/build.gradle.kts b/api/client-testextension/build.gradle.kts index 0e5871c9782..19bfec93419 100644 --- a/api/client-testextension/build.gradle.kts +++ b/api/client-testextension/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-server") + id("nessie-conventions-client") id("nessie-jacoco") } diff --git a/api/client/build.gradle.kts b/api/client/build.gradle.kts index 1da1a236a5f..9c41ee1e34f 100644 --- a/api/client/build.gradle.kts +++ b/api/client/build.gradle.kts @@ -19,7 +19,6 @@ import org.apache.tools.ant.taskdefs.condition.Os plugins { id("nessie-conventions-client") id("nessie-jacoco") - alias(libs.plugins.annotations.stripper) } publishingHelper { mavenName = "Nessie - Client" } @@ -177,13 +176,6 @@ testing { } } -annotationStripper { - registerDefault().configure { - annotationsToDrop("^jakarta[.].+".toRegex()) - unmodifiedClassesForJavaVersion = 11 - } -} - // prevent duplicate checkstyle work jacksonTestVersions .map { jacksonVersion -> "Jackson_" + jacksonVersion.replace("[.]".toRegex(), "_") } diff --git a/api/model-quarkus/build.gradle.kts b/api/model-quarkus/build.gradle.kts deleted file mode 100644 index d5a1c5746e4..00000000000 --- a/api/model-quarkus/build.gradle.kts +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2022 Dremio - * - * Licensed 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. - */ - -import io.smallrye.openapi.api.OpenApiConfig.OperationIdStrategy -import io.smallrye.openapi.gradleplugin.SmallryeOpenApiExtension -import io.smallrye.openapi.gradleplugin.SmallryeOpenApiTask -import org.apache.tools.ant.filters.ReplaceTokens - -plugins { - id("nessie-conventions-server") - id("nessie-jacoco") - alias(libs.plugins.smallrye.openapi) -} - -publishingHelper { mavenName = "Nessie - Model - Variant only for Java 11+ consumers" } - -description = - "nessie-model-jakarta is effectively the same as nessie-model, but it is _not_ a " + - "multi-release jar and retains the jakarta annotations in the canonical classes. " + - "Please note that this artifact will go away, once Nessie no longer support Java 8 for clients. " + - "Therefore, do _not_ refer to this artifact - it is only meant for consumption by Nessie-Quarkus." - -dependencies { - implementation(platform(libs.jackson.bom)) - implementation("com.fasterxml.jackson.core:jackson-databind") - implementation("com.fasterxml.jackson.core:jackson-annotations") - - // javax/jakarta - compileOnly(libs.jakarta.ws.rs.api) - compileOnly(libs.javax.ws.rs) - compileOnly(libs.jakarta.validation.api) - compileOnly(libs.javax.validation.api) - compileOnly(libs.jakarta.annotation.api) - compileOnly(libs.findbugs.jsr305) - - compileOnly(libs.microprofile.openapi) - - compileOnly(libs.immutables.builder) - compileOnly(libs.immutables.value.annotations) - annotationProcessor(libs.immutables.value.processor) -} - -extensions.configure { - scanDependenciesDisable = false - infoVersion = project.version.toString() - infoDescription = - "Transactional Catalog for Data Lakes\n" + - "\n" + - "* Git-inspired data version control\n" + - "* Cross-table transactions and visibility\n" + - "* Works with Apache Iceberg tables" - schemaFilename = "META-INF/openapi/openapi" - operationIdStrategy = OperationIdStrategy.METHOD - scanPackages = - listOf("org.projectnessie.api", "org.projectnessie.api.http", "org.projectnessie.model") -} - -tasks.named("processResources").configure { - inputs.property("projectVersion", project.version) - filter(ReplaceTokens::class, mapOf("tokens" to mapOf("projectVersion" to project.version))) -} - -val openapiSource by - configurations.creating { - isCanBeConsumed = true - isCanBeResolved = false - description = "Source OpenAPI spec files, containing the examples" - } - -val generateOpenApiSpec = tasks.named("generateOpenApiSpec") - -generateOpenApiSpec.configure { - inputs.files("src/main").withPathSensitivity(PathSensitivity.RELATIVE) -} - -artifacts { add(openapiSource.name, file("src/main/resources/META-INF")) } diff --git a/api/model-quarkus/src/main b/api/model-quarkus/src/main deleted file mode 120000 index 592e3ff7738..00000000000 --- a/api/model-quarkus/src/main +++ /dev/null @@ -1 +0,0 @@ -../../model/src/main \ No newline at end of file diff --git a/api/model/build.gradle.kts b/api/model/build.gradle.kts index d78a466296c..71faa34dfb7 100644 --- a/api/model/build.gradle.kts +++ b/api/model/build.gradle.kts @@ -22,7 +22,6 @@ import org.apache.tools.ant.filters.ReplaceTokens plugins { id("nessie-conventions-client") id("nessie-jacoco") - alias(libs.plugins.annotations.stripper) alias(libs.plugins.smallrye.openapi) } @@ -102,13 +101,6 @@ generateOpenApiSpec.configure { artifacts { add(openapiSource.name, file("src/main/resources/META-INF")) } -annotationStripper { - registerDefault().configure { - annotationsToDrop("^jakarta[.].+".toRegex()) - unmodifiedClassesForJavaVersion = 11 - } -} - tasks.named("intTest").configure { dependsOn(generateOpenApiSpec) systemProperty( diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index e195fa2a65a..b3df29891ea 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -42,7 +42,6 @@ dependencies { api(project(":nessie-gc-repository-jdbc")) api(project(":nessie-gcs-testcontainer")) api(project(":nessie-model")) - api(project(":nessie-model-quarkus")) api(project(":nessie-notice")) api(project(":nessie-jaxrs-testextension")) api(project(":nessie-jaxrs-tests")) diff --git a/build-logic/src/main/kotlin/nessie-conventions-iceberg.gradle.kts b/build-logic/src/main/kotlin/nessie-common-java.gradle.kts similarity index 83% rename from build-logic/src/main/kotlin/nessie-conventions-iceberg.gradle.kts rename to build-logic/src/main/kotlin/nessie-common-java.gradle.kts index 4e097a1bc75..f4d76def5e0 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-iceberg.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-common-java.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Dremio + * Copyright (C) 2024 Dremio * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -// Java project using Apache Iceberg, Java 11 - plugins { `java-library` `maven-publish` @@ -25,5 +23,3 @@ plugins { id("nessie-java") id("nessie-testing") } - -tasks.withType().configureEach { options.release = 11 } diff --git a/build-logic/src/main/kotlin/nessie-conventions-client.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-client.gradle.kts index 68752e53ab2..a2bee64b983 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-client.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-client.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Dremio + * Copyright (C) 2024 Dremio * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,29 +14,8 @@ * limitations under the License. */ -// Java project, production code built for Java 8 +// Conventions for projects being consumed by downstream clients. -plugins { - `java-library` - `maven-publish` - signing - id("nessie-common-base") - id("nessie-common-src") - id("nessie-java") - id("nessie-testing") -} +plugins { id("nessie-common-java") } -tasks.withType().configureEach { - if (path.startsWith(":nessie-client:")) { - // :nessie-client is a little special, because it contains a Java 11 version for - // Nessie's dependency-free http client, so setting "release=8", would not work. - sourceCompatibility = "1.8" - targetCompatibility = "1.8" - } else if (name == "compileJava") { - // Client production code must be compatible with Java 8 - options.release = 8 - } else { - // Test code may depend on server code for in-JVM tests, so need Java 11 for test code - options.release = 11 - } -} +tasks.withType().configureEach { options.release = 11 } diff --git a/build-logic/src/main/kotlin/nessie-conventions-quarkus.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-quarkus.gradle.kts index d3611be81a1..a092cdd5765 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-quarkus.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-quarkus.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Dremio + * Copyright (C) 2024 Dremio * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,8 @@ * limitations under the License. */ -// Java project using Quarkus, Java 11 (soon: Java 17) +// Conventions for project being built for/with Quarkus. -plugins { - `java-library` - `maven-publish` - signing - id("nessie-common-base") - id("nessie-common-src") - id("nessie-java") - id("nessie-testing") -} +plugins { id("nessie-common-java") } tasks.withType().configureEach { options.release = 21 } diff --git a/build-logic/src/main/kotlin/nessie-conventions-scala.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-scala.gradle.kts index 3d884b56be1..f236cf6a645 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-scala.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-scala.gradle.kts @@ -14,24 +14,19 @@ * limitations under the License. */ -// Scala project, Java 11 +// Conventions for "Nessie internal" Scala projects, not Spark, not client facing. plugins { + id("nessie-common-java") scala - `maven-publish` - signing - id("nessie-common-base") - id("nessie-common-src") - id("nessie-java") id("nessie-scala") - id("nessie-testing") } -tasks.withType().configureEach { options.release = 11 } +tasks.withType().configureEach { options.release = 21 } tasks.withType().configureEach { - options.release = 11 - scalaCompileOptions.additionalParameters.add("-release:11") - sourceCompatibility = "11" - targetCompatibility = "11" + options.release = 21 + scalaCompileOptions.additionalParameters.add("-release:21") + sourceCompatibility = "21" + targetCompatibility = "21" } diff --git a/build-logic/src/main/kotlin/nessie-conventions-server.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-server.gradle.kts index 7f410b90b9d..08aa7452285 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-server.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-server.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Dremio + * Copyright (C) 2024 Dremio * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,8 @@ * limitations under the License. */ -// Java project, non-client facing, server component, Java 11 +// Conventions for server-side projects being consumed by downstream projects. -plugins { - `java-library` - `maven-publish` - signing - id("nessie-common-base") - id("nessie-common-src") - id("nessie-java") - id("nessie-testing") -} +plugins { id("nessie-common-java") } tasks.withType().configureEach { options.release = 11 } diff --git a/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts deleted file mode 100644 index bb1b8237b60..00000000000 --- a/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2023 Dremio - * - * Licensed 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. - */ - -// Java project, non-client facing, server component, Java 8 (11 for tests) - -plugins { - `java-library` - `maven-publish` - signing - id("nessie-common-base") - id("nessie-common-src") - id("nessie-java") - id("nessie-testing") -} - -tasks.withType().configureEach { - options.release = if (this.name == "compileJava") 8 else 11 -} diff --git a/build-logic/src/main/kotlin/nessie-conventions-spark.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-spark.gradle.kts index 3d884b56be1..f8f3da8a920 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-spark.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-spark.gradle.kts @@ -14,17 +14,12 @@ * limitations under the License. */ -// Scala project, Java 11 +// Conventions for Nessie Spark extensions. plugins { + id("nessie-common-java") scala - `maven-publish` - signing - id("nessie-common-base") - id("nessie-common-src") - id("nessie-java") id("nessie-scala") - id("nessie-testing") } tasks.withType().configureEach { options.release = 11 } diff --git a/build-logic/src/main/kotlin/nessie-conventions-unpublished-tool.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-unpublished-tool.gradle.kts index c6177bbc290..81eed18e9ee 100644 --- a/build-logic/src/main/kotlin/nessie-conventions-unpublished-tool.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-conventions-unpublished-tool.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Dremio + * Copyright (C) 2024 Dremio * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -// Java project, non-client facing, server component, Java 11 +// Conventions for Nessie tools that are not published to Maven. plugins { `java-library` @@ -24,4 +24,4 @@ plugins { id("nessie-testing") } -tasks.withType().configureEach { options.release = 11 } +tasks.withType().configureEach { options.release = 21 } diff --git a/catalog/format/iceberg-bench/build.gradle.kts b/catalog/format/iceberg-bench/build.gradle.kts index b3987cb1eaa..5764d8b70e2 100644 --- a/catalog/format/iceberg-bench/build.gradle.kts +++ b/catalog/format/iceberg-bench/build.gradle.kts @@ -17,7 +17,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { - id("nessie-conventions-client") + id("nessie-conventions-server") id("com.github.johnrengelman.shadow") alias(libs.plugins.jmh) } diff --git a/catalog/format/iceberg-fixturegen/build.gradle.kts b/catalog/format/iceberg-fixturegen/build.gradle.kts index fe7b4399218..5414bb63eec 100644 --- a/catalog/format/iceberg-fixturegen/build.gradle.kts +++ b/catalog/format/iceberg-fixturegen/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-client") + id("nessie-conventions-server") id("nessie-jacoco") } diff --git a/catalog/format/iceberg/build.gradle.kts b/catalog/format/iceberg/build.gradle.kts index 559dd7fbed5..7579ccaeef6 100644 --- a/catalog/format/iceberg/build.gradle.kts +++ b/catalog/format/iceberg/build.gradle.kts @@ -17,7 +17,6 @@ plugins { id("nessie-conventions-client") id("nessie-jacoco") - alias(libs.plugins.annotations.stripper) } description = "Nessie - Catalog - Iceberg table format" @@ -70,13 +69,6 @@ dependencies { testFixturesApi("org.apache.iceberg:iceberg-core:$versionIceberg") } -annotationStripper { - registerDefault().configure { - annotationsToDrop("^jakarta[.].+".toRegex()) - unmodifiedClassesForJavaVersion.set(11) - } -} - val generatedAvroSchemas = layout.buildDirectory.asFile.map { it.resolve("generated/avroSchemas") }.get() diff --git a/catalog/model/build.gradle.kts b/catalog/model/build.gradle.kts index da7a0ad4d2c..49cb2986f4f 100644 --- a/catalog/model/build.gradle.kts +++ b/catalog/model/build.gradle.kts @@ -17,7 +17,6 @@ plugins { id("nessie-conventions-client") id("nessie-jacoco") - alias(libs.plugins.annotations.stripper) } publishingHelper { mavenName = "Nessie - Catalog - Schema Model" } @@ -58,10 +57,3 @@ dependencies { protobufSchemaGen(libs.jandex) testFixturesApi(libs.jandex) } - -annotationStripper { - registerDefault().configure { - annotationsToDrop("^jakarta[.].+".toRegex()) - unmodifiedClassesForJavaVersion.set(11) - } -} diff --git a/catalog/service/rest/build.gradle.kts b/catalog/service/rest/build.gradle.kts index aa6d639ed2e..d66da0b6344 100644 --- a/catalog/service/rest/build.gradle.kts +++ b/catalog/service/rest/build.gradle.kts @@ -17,7 +17,6 @@ plugins { id("nessie-conventions-server") id("nessie-jacoco") - alias(libs.plugins.annotations.stripper) } publishingHelper { mavenName = "Nessie - Catalog - REST Service" } @@ -71,10 +70,3 @@ dependencies { testImplementation(platform(libs.awssdk.bom)) testImplementation("software.amazon.awssdk:s3") } - -annotationStripper { - registerDefault().configure { - annotationsToDrop("^jakarta[.].+".toRegex()) - unmodifiedClassesForJavaVersion.set(11) - } -} diff --git a/cli/cli/build.gradle.kts b/cli/cli/build.gradle.kts index ac8d9e7516a..dd66fce5dc3 100644 --- a/cli/cli/build.gradle.kts +++ b/cli/cli/build.gradle.kts @@ -18,7 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.apache.tools.ant.taskdefs.condition.Os plugins { - id("nessie-conventions-server") + id("nessie-conventions-client") id("nessie-jacoco") id("nessie-shadow-jar") id("nessie-license-report") @@ -26,14 +26,12 @@ plugins { publishingHelper { mavenName = "Nessie - CLI" } -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - val versionIceberg = libs.versions.iceberg.get() val nessieQuarkusServer by configurations.creating dependencies { - implementation(project(":nessie-model-quarkus")) + implementation(project(":nessie-model")) implementation(project(":nessie-client")) implementation(project(":nessie-cli-grammar")) implementation(project(":nessie-notice")) diff --git a/cli/grammar/build.gradle.kts b/cli/grammar/build.gradle.kts index 2db1f6f52cd..cfff7c1392d 100644 --- a/cli/grammar/build.gradle.kts +++ b/cli/grammar/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-server") + id("nessie-conventions-client") alias(libs.plugins.jmh) } diff --git a/gc/gc-base-tests/build.gradle.kts b/gc/gc-base-tests/build.gradle.kts index 6a8c909dc71..5f1429113af 100644 --- a/gc/gc-base-tests/build.gradle.kts +++ b/gc/gc-base-tests/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-client") } publishingHelper { mavenName = "Nessie - GC - Base Implementation Tests" } diff --git a/gc/gc-base/build.gradle.kts b/gc/gc-base/build.gradle.kts index 501d0469eb3..8c3f92c2182 100644 --- a/gc/gc-base/build.gradle.kts +++ b/gc/gc-base/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") } diff --git a/gc/gc-iceberg-files/build.gradle.kts b/gc/gc-iceberg-files/build.gradle.kts index 7937ab622a1..59b400d9773 100644 --- a/gc/gc-iceberg-files/build.gradle.kts +++ b/gc/gc-iceberg-files/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") } diff --git a/gc/gc-iceberg-inttest/build.gradle.kts b/gc/gc-iceberg-inttest/build.gradle.kts index a180dbcaee4..e90aaeeb564 100644 --- a/gc/gc-iceberg-inttest/build.gradle.kts +++ b/gc/gc-iceberg-inttest/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") alias(libs.plugins.nessie.run) } diff --git a/gc/gc-iceberg-mock/build.gradle.kts b/gc/gc-iceberg-mock/build.gradle.kts index fc293d14d62..55396120bf5 100644 --- a/gc/gc-iceberg-mock/build.gradle.kts +++ b/gc/gc-iceberg-mock/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-client") } publishingHelper { mavenName = "Nessie - GC - Mocked Iceberg data for tests" } diff --git a/gc/gc-iceberg/build.gradle.kts b/gc/gc-iceberg/build.gradle.kts index 5f73e924815..660ccfb1c0a 100644 --- a/gc/gc-iceberg/build.gradle.kts +++ b/gc/gc-iceberg/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") } diff --git a/gc/gc-repository-jdbc/build.gradle.kts b/gc/gc-repository-jdbc/build.gradle.kts index 59d9ec02086..e7ea4147c8f 100644 --- a/gc/gc-repository-jdbc/build.gradle.kts +++ b/gc/gc-repository-jdbc/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") } diff --git a/gc/gc-tool-inttest/build.gradle.kts b/gc/gc-tool-inttest/build.gradle.kts index 0ad8475761a..40762ffb381 100644 --- a/gc/gc-tool-inttest/build.gradle.kts +++ b/gc/gc-tool-inttest/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") alias(libs.plugins.nessie.run) } diff --git a/gc/gc-tool/build.gradle.kts b/gc/gc-tool/build.gradle.kts index 7e105d41018..dd328a0854d 100644 --- a/gc/gc-tool/build.gradle.kts +++ b/gc/gc-tool/build.gradle.kts @@ -18,7 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("com.github.johnrengelman.shadow") - id("nessie-conventions-iceberg") + id("nessie-conventions-client") id("nessie-jacoco") id("nessie-shadow-jar") id("nessie-license-report") diff --git a/gradle.properties b/gradle.properties index 2ef956f6c58..a5c243a7705 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ org.gradle.configureondemand=true # explicitly disable the configuration cache org.gradle.configuration-cache=false #org.gradle.configuration-cache-problems=warn -# bump the Gradle daemon heap size (you can set bigger heap sizes as well) +# bump the Gradle daemon heap size (you can set even bigger heap sizes as well) org.gradle.jvmargs=\ - -Xms2g -Xmx4g -XX:MaxMetaspaceSize=768m \ + -Xms2g -Xmx4g -XX:MaxMetaspaceSize=1g \ -Dfile.encoding=UTF-8 \ -Duser.language=en -Duser.country=US -Duser.variant= \ --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 04b9196f116..2fdc4be1d33 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -150,7 +150,6 @@ wiremock = { module = "com.github.tomakehurst:wiremock-jre8-standalone", version zstd-jni = { module = "com.github.luben:zstd-jni", version = "1.5.6-4" } [plugins] -annotations-stripper = { id = "org.projectnessie.annotation-stripper", version = "0.1.2" } gatling = { id = "io.gatling.gradle", version = "3.11.5.2" } jmh = { id = "me.champeau.jmh", version = "0.7.2" } nessie-run = { id = "org.projectnessie", version = "0.32.2" } diff --git a/gradle/projects.main.properties b/gradle/projects.main.properties index c082937c3e8..ff6045a0d16 100644 --- a/gradle/projects.main.properties +++ b/gradle/projects.main.properties @@ -19,7 +19,6 @@ nessie-events-quarkus=events/quarkus nessie-events-service=events/service nessie-events-spi=events/spi nessie-model=api/model -nessie-model-quarkus=api/model-quarkus nessie-gc-base=gc/gc-base nessie-gc-base-tests=gc/gc-base-tests nessie-gc-repository-jdbc=gc/gc-repository-jdbc diff --git a/servers/quarkus-auth/build.gradle.kts b/servers/quarkus-auth/build.gradle.kts index 4ff62b5c605..154af5f2b2f 100644 --- a/servers/quarkus-auth/build.gradle.kts +++ b/servers/quarkus-auth/build.gradle.kts @@ -21,15 +21,8 @@ plugins { publishingHelper { mavenName = "Nessie - Auth for Quarkus based servers" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { - implementation(project(":nessie-model-quarkus")) + implementation(project(":nessie-model")) implementation(project(":nessie-quarkus-common")) implementation(project(":nessie-quarkus-config")) implementation(project(":nessie-services")) diff --git a/servers/quarkus-catalog/build.gradle.kts b/servers/quarkus-catalog/build.gradle.kts index c0be6332b8d..201cbad03e4 100644 --- a/servers/quarkus-catalog/build.gradle.kts +++ b/servers/quarkus-catalog/build.gradle.kts @@ -18,13 +18,6 @@ plugins { id("nessie-conventions-quarkus") } publishingHelper { mavenName = "Nessie - Quarkus Catalog" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-combined-cs")) implementation(project(":nessie-rest-services")) diff --git a/servers/quarkus-common/build.gradle.kts b/servers/quarkus-common/build.gradle.kts index 3ed5278b61f..1b8531fdbf3 100644 --- a/servers/quarkus-common/build.gradle.kts +++ b/servers/quarkus-common/build.gradle.kts @@ -18,13 +18,6 @@ plugins { id("nessie-conventions-quarkus") } publishingHelper { mavenName = "Nessie - Quarkus Common" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-model")) implementation(project(":nessie-rest-common")) diff --git a/servers/quarkus-config/build.gradle.kts b/servers/quarkus-config/build.gradle.kts index 8a2745fe3c1..7f7ebedd55b 100644 --- a/servers/quarkus-config/build.gradle.kts +++ b/servers/quarkus-config/build.gradle.kts @@ -18,13 +18,6 @@ plugins { id("nessie-conventions-quarkus") } publishingHelper { mavenName = "Nessie - Quarkus Config Types" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-services-config")) implementation(project(":nessie-versioned-storage-common")) diff --git a/servers/quarkus-distcache/build.gradle.kts b/servers/quarkus-distcache/build.gradle.kts index 55a26b83fe9..8ea263f2154 100644 --- a/servers/quarkus-distcache/build.gradle.kts +++ b/servers/quarkus-distcache/build.gradle.kts @@ -18,13 +18,6 @@ plugins { id("nessie-conventions-quarkus") } publishingHelper { mavenName = "Nessie - Quarkus Dist-Cache" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-quarkus-config")) implementation(project(":nessie-versioned-storage-cache")) diff --git a/servers/quarkus-rest/build.gradle.kts b/servers/quarkus-rest/build.gradle.kts index 34c7e0ea2f9..bc329ab48d5 100644 --- a/servers/quarkus-rest/build.gradle.kts +++ b/servers/quarkus-rest/build.gradle.kts @@ -18,15 +18,8 @@ plugins { id("nessie-conventions-quarkus") } publishingHelper { mavenName = "Nessie - Quarkus REST" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { - implementation(project(":nessie-model-quarkus")) + implementation(project(":nessie-model")) implementation(project(":nessie-rest-common")) implementation(enforcedPlatform(libs.quarkus.bom)) diff --git a/servers/quarkus-server/build.gradle.kts b/servers/quarkus-server/build.gradle.kts index 883c61576ae..c10d351da4d 100644 --- a/servers/quarkus-server/build.gradle.kts +++ b/servers/quarkus-server/build.gradle.kts @@ -35,16 +35,9 @@ val openapiSource by val versionIceberg = libs.versions.iceberg.get() -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-client")) - implementation(project(":nessie-model-quarkus")) + implementation(project(":nessie-model")) implementation(project(":nessie-services")) implementation(project(":nessie-services-config")) implementation(project(":nessie-quarkus-auth")) @@ -94,13 +87,13 @@ dependencies { compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) - openapiSource(project(":nessie-model-quarkus")) { isTransitive = false } + openapiSource(project(":nessie-model")) { isTransitive = false } testFixturesApi(platform(libs.junit.bom)) testFixturesApi(libs.bundles.junit.testing) testFixturesApi(project(":nessie-client")) - testFixturesApi(project(":nessie-model-quarkus")) + testFixturesApi(project(":nessie-model")) testFixturesApi(testFixtures(project(":nessie-client"))) testFixturesApi(project(":nessie-client-testextension")) testFixturesApi(project(":nessie-jaxrs-tests")) diff --git a/servers/quarkus-tests/build.gradle.kts b/servers/quarkus-tests/build.gradle.kts index 7b906aba752..87b391b1241 100644 --- a/servers/quarkus-tests/build.gradle.kts +++ b/servers/quarkus-tests/build.gradle.kts @@ -18,13 +18,6 @@ plugins { id("nessie-conventions-quarkus") } publishingHelper { mavenName = "Nessie - Quarkus Tests" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-quarkus-common")) implementation(project(":nessie-quarkus-config")) diff --git a/servers/services-config/build.gradle.kts b/servers/services-config/build.gradle.kts index c046cf958c0..974ae21847e 100644 --- a/servers/services-config/build.gradle.kts +++ b/servers/services-config/build.gradle.kts @@ -14,6 +14,6 @@ * limitations under the License. */ -plugins { id("nessie-conventions-server8") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - Services Config" } diff --git a/servers/services/build.gradle.kts b/servers/services/build.gradle.kts index ea32a7ee29a..5285bcd5ab8 100644 --- a/servers/services/build.gradle.kts +++ b/servers/services/build.gradle.kts @@ -17,7 +17,7 @@ import org.apache.tools.ant.taskdefs.condition.Os plugins { - id("nessie-conventions-server8") + id("nessie-conventions-server") id("nessie-jacoco") } diff --git a/testing/azurite-container/build.gradle.kts b/testing/azurite-container/build.gradle.kts index b02e31dde4b..12d1daa035c 100644 --- a/testing/azurite-container/build.gradle.kts +++ b/testing/azurite-container/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - Azurite testcontainer" } diff --git a/testing/gcs-container/build.gradle.kts b/testing/gcs-container/build.gradle.kts index 2c5c03db4ac..50843a3800a 100644 --- a/testing/gcs-container/build.gradle.kts +++ b/testing/gcs-container/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - GCS testcontainer" } diff --git a/testing/keycloak-container/build.gradle.kts b/testing/keycloak-container/build.gradle.kts index e091653d2c9..414c82593b8 100644 --- a/testing/keycloak-container/build.gradle.kts +++ b/testing/keycloak-container/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - Keycloak testcontainer" } diff --git a/testing/minio-container/build.gradle.kts b/testing/minio-container/build.gradle.kts index 943325dc678..c77e96ee119 100644 --- a/testing/minio-container/build.gradle.kts +++ b/testing/minio-container/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - Minio testcontainer" } diff --git a/testing/nessie-container/build.gradle.kts b/testing/nessie-container/build.gradle.kts index 81ac105feb9..2106d0c5221 100644 --- a/testing/nessie-container/build.gradle.kts +++ b/testing/nessie-container/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - Nessie testcontainer" } diff --git a/testing/object-storage-mock/build.gradle.kts b/testing/object-storage-mock/build.gradle.kts index e047fd59752..854e6dc5b18 100644 --- a/testing/object-storage-mock/build.gradle.kts +++ b/testing/object-storage-mock/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - S3/ADLS/GCS object storage mock" } diff --git a/testing/trino-container/build.gradle.kts b/testing/trino-container/build.gradle.kts index bfb08c7945e..f49c98350d4 100644 --- a/testing/trino-container/build.gradle.kts +++ b/testing/trino-container/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -plugins { id("nessie-conventions-iceberg") } +plugins { id("nessie-conventions-server") } publishingHelper { mavenName = "Nessie - Trino testcontainer" } diff --git a/tools/content-generator/build.gradle.kts b/tools/content-generator/build.gradle.kts index 799a82c2cf3..897b916b848 100644 --- a/tools/content-generator/build.gradle.kts +++ b/tools/content-generator/build.gradle.kts @@ -18,7 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { alias(libs.plugins.nessie.run) - id("nessie-conventions-server") + id("nessie-conventions-client") id("nessie-jacoco") id("nessie-shadow-jar") id("nessie-license-report") diff --git a/tools/server-admin/build.gradle.kts b/tools/server-admin/build.gradle.kts index d3918444965..cf103f6c00b 100644 --- a/tools/server-admin/build.gradle.kts +++ b/tools/server-admin/build.gradle.kts @@ -31,13 +31,6 @@ val quarkusRunner by description = "Used to reference the generated runner-jar (either fast-jar or uber-jar)" } -// Need to use :nessie-model-quarkus instead of :nessie-model here, because Quarkus w/ -// resteasy-reactive does not work well with multi-release jars, but as long as we support Java 8 -// for clients, we have to live with :nessie-model producing an MR-jar. See -// https://github.com/quarkusio/quarkus/issues/40236 and -// https://github.com/projectnessie/nessie/issues/8390. -configurations.all { exclude(group = "org.projectnessie.nessie", module = "nessie-model") } - dependencies { implementation(project(":nessie-quarkus-common")) implementation(project(":nessie-quarkus-config")) @@ -47,7 +40,7 @@ dependencies { implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-transfer")) implementation(project(":nessie-versioned-transfer-proto")) - implementation(project(":nessie-model-quarkus")) + implementation(project(":nessie-model")) implementation(project(":nessie-notice")) implementation(project(":nessie-catalog-service-transfer")) diff --git a/tools/storage/uri/build.gradle.kts b/tools/storage/uri/build.gradle.kts index 606ea22a54d..304c8bb16fd 100644 --- a/tools/storage/uri/build.gradle.kts +++ b/tools/storage/uri/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-iceberg") + id("nessie-conventions-server") id("nessie-jacoco") } diff --git a/versioned/spi/build.gradle.kts b/versioned/spi/build.gradle.kts index 6b6c1516ce3..c82a7d6ff8c 100644 --- a/versioned/spi/build.gradle.kts +++ b/versioned/spi/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - id("nessie-conventions-server8") + id("nessie-conventions-server") id("nessie-jacoco") }