Drop support for Java 8

projectnessie · Aug 3, 2024 · 42924ca · 42924ca
1 parent 1ea47a0
commit 42924ca
Show file tree

Hide file tree

Showing 110 changed files with 108 additions and 415 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ as necessary. Empty sections will not end in the release notes.
 
 ### Upgrade notes
 
+- Support for Java 8 has been removed, even for Nessie clients
+
 ### Breaking changes
 
 ### New Features

diff --git 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-java11")
   id("nessie-jacoco")
 }
 

diff --git a/api/client/build.gradle.kts b/api/client/build.gradle.kts
@@ -17,9 +17,8 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-  id("nessie-conventions-client")
+  id("nessie-conventions-java11")
   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
diff --git a/api/model-quarkus/src/main b/api/model-quarkus/src/main
diff --git a/api/model/build.gradle.kts b/api/model/build.gradle.kts
@@ -20,9 +20,8 @@ import io.smallrye.openapi.gradleplugin.SmallryeOpenApiTask
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-  id("nessie-conventions-client")
+  id("nessie-conventions-java11")
   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<Test>("intTest").configure {
   dependsOn(generateOpenApiSpec)
   systemProperty(

diff --git 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-client.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-client.gradle.kts
diff --git a/...lin/nessie-conventions-iceberg.gradle.kts → ...tlin/nessie-conventions-java11.gradle.kts b/...lin/nessie-conventions-iceberg.gradle.kts → ...tlin/nessie-conventions-java11.gradle.kts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-// Java project using Apache Iceberg, Java 11
-
 plugins {
   `java-library`
   `maven-publish`

diff --git a/...lin/nessie-conventions-quarkus.gradle.kts → ...tlin/nessie-conventions-java17.gradle.kts b/...lin/nessie-conventions-quarkus.gradle.kts → ...tlin/nessie-conventions-java17.gradle.kts
diff --git a/build-logic/src/main/kotlin/nessie-conventions-server.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-server.gradle.kts
diff --git a/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts
diff --git a/build-logic/src/main/kotlin/nessie-conventions-spark.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-spark.gradle.kts
@@ -17,18 +17,11 @@
 // Scala project, Java 11
 
 plugins {
+  id("nessie-conventions-java11")
   scala
-  `maven-publish`
-  signing
-  id("nessie-common-base")
-  id("nessie-common-src")
-  id("nessie-java")
   id("nessie-scala")
-  id("nessie-testing")
 }
 
-tasks.withType<JavaCompile>().configureEach { options.release = 11 }
-
 tasks.withType<ScalaCompile>().configureEach {
   options.release = 11
   scalaCompileOptions.additionalParameters.add("-release:11")

diff --git a/catalog/files/api/build.gradle.kts b/catalog/files/api/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-java11")
   id("nessie-jacoco")
 }
 

diff --git a/catalog/files/impl/build.gradle.kts b/catalog/files/impl/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-java11")
   id("nessie-jacoco")
   alias(libs.plugins.jmh)
 }

diff --git 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-java11")
   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
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-client")
+  id("nessie-conventions-java11")
   id("nessie-jacoco")
 }
 

diff --git a/catalog/format/iceberg/build.gradle.kts b/catalog/format/iceberg/build.gradle.kts
@@ -15,9 +15,8 @@
  */
 
 plugins {
-  id("nessie-conventions-client")
+  id("nessie-conventions-java11")
   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
@@ -15,9 +15,8 @@
  */
 
 plugins {
-  id("nessie-conventions-client")
+  id("nessie-conventions-java11")
   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/secrets/api/build.gradle.kts b/catalog/secrets/api/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-java11")
   id("nessie-jacoco")
 }