Database adapters - back to Java 8 (#6995)

SIGH, some things depend on Java 8, keeping database-adapter code compatible w/ J8.
projectnessie · Jun 6, 2023 · 90fc2dd · 90fc2dd
1 parent 5c2c151
commit 90fc2dd
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 24 deletions.
diff --git a/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts b/build-logic/src/main/kotlin/nessie-conventions-server8.gradle.kts
@@ -0,0 +1,31 @@
+/*
+ * 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<JavaCompile>().configureEach {
+  options.release.set(if (this.name == "compileJava") 8 else 11)
+}
diff --git 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-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
   alias(libs.plugins.annotations.stripper)
 }

diff --git a/servers/store-proto/build.gradle.kts b/servers/store-proto/build.gradle.kts
@@ -20,7 +20,7 @@ import com.google.protobuf.gradle.ProtobufExtract
 
 plugins {
   alias(libs.plugins.nessie.reflectionconfig)
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   alias(libs.plugins.protobuf)
 }
 

diff --git a/servers/store/build.gradle.kts b/servers/store/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
   alias(libs.plugins.annotations.stripper)
 }

diff --git a/versioned/persist/adapter/build.gradle.kts b/versioned/persist/adapter/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/bench/build.gradle.kts b/versioned/persist/bench/build.gradle.kts
@@ -17,7 +17,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-shadow-jar")
 }
 

diff --git a/versioned/persist/dynamodb-test/build.gradle.kts b/versioned/persist/dynamodb-test/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/dynamodb/build.gradle.kts b/versioned/persist/dynamodb/build.gradle.kts
@@ -17,7 +17,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/inmem-test/build.gradle.kts b/versioned/persist/inmem-test/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/inmem/build.gradle.kts b/versioned/persist/inmem/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/mongodb-test/build.gradle.kts b/versioned/persist/mongodb-test/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/mongodb/build.gradle.kts b/versioned/persist/mongodb/build.gradle.kts
@@ -17,7 +17,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/nontx-test/build.gradle.kts b/versioned/persist/nontx-test/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/nontx/build.gradle.kts b/versioned/persist/nontx/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/rocks-test/build.gradle.kts b/versioned/persist/rocks-test/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/rocks/build.gradle.kts b/versioned/persist/rocks/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/serialize-proto/build.gradle.kts b/versioned/persist/serialize-proto/build.gradle.kts
@@ -20,7 +20,7 @@ import com.google.protobuf.gradle.ProtobufExtract
 
 plugins {
   alias(libs.plugins.nessie.reflectionconfig)
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   alias(libs.plugins.protobuf)
 }
 

diff --git a/versioned/persist/serialize/build.gradle.kts b/versioned/persist/serialize/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/store/build.gradle.kts b/versioned/persist/store/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/testextension/build.gradle.kts b/versioned/persist/testextension/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("nessie-conventions-server") }
+plugins { id("nessie-conventions-server8") }
 
 extra["maven.name"] = "Nessie - Versioned - Persist - Testextension"
 

diff --git a/versioned/persist/tests/build.gradle.kts b/versioned/persist/tests/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("nessie-conventions-server") }
+plugins { id("nessie-conventions-server8") }
 
 extra["maven.name"] = "Nessie - Versioned - Persist - Tests"
 

diff --git a/versioned/persist/tx-test/build.gradle.kts b/versioned/persist/tx-test/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/persist/tx/build.gradle.kts b/versioned/persist/tx/build.gradle.kts
@@ -17,7 +17,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/spi/build.gradle.kts b/versioned/spi/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id("nessie-conventions-server")
+  id("nessie-conventions-server8")
   id("nessie-jacoco")
 }
 

diff --git a/versioned/tests/build.gradle.kts b/versioned/tests/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("nessie-conventions-server") }
+plugins { id("nessie-conventions-server8") }
 
 extra["maven.name"] = "Nessie - Versioned Store Integration Tests"