[CALCITE-6174] Replace deprecations

apache · May 19, 2024 · a77f56b · a77f56b
1 parent 928491a
commit a77f56b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -44,9 +44,9 @@ node('ubuntu') {
       withEnv(["Path+JDK=$JAVA_JDK_17/bin","JAVA_HOME=$JAVA_JDK_17"]) {
         withCredentials([string(credentialsId: 'SONARCLOUD_TOKEN', variable: 'SONAR_TOKEN')]) {
           if ( env.BRANCH_NAME.startsWith("PR-") ) {
-            sh './gradlew --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Dsonar.pullrequest.branch=${CHANGE_BRANCH} -Dsonar.pullrequest.base=${CHANGE_TARGET} -Dsonar.pullrequest.key=${CHANGE_ID} -Dsonar.login=${SONAR_TOKEN}'
+            sh './gradlew --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 -Dsonar.pullrequest.branch=${CHANGE_BRANCH} -Dsonar.pullrequest.base=${CHANGE_TARGET} -Dsonar.pullrequest.key=${CHANGE_ID} -Dsonar.login=${SONAR_TOKEN}'
           } else {
-            sh './gradlew --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+            sh './gradlew --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
           }
         }
       }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,6 +25,7 @@ import com.github.vlsi.gradle.properties.dsl.props
 import com.github.vlsi.gradle.release.RepositoryType
 import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApisExtension
+import java.util.Locale
 import net.ltgt.gradle.errorprone.errorprone
 import org.apache.calcite.buildtools.buildext.dsl.ParenthesisBalancer
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
@@ -234,7 +235,7 @@ dependencies {
     }
     if (enableJacoco) {
         for (p in subprojects) {
-            if (!p.name.equals("bom")) {
+            if (p.name != "bom") {
                 jacocoAggregation(p)
             }
         }
@@ -504,7 +505,7 @@ allprojects {
     }
 
     plugins.withType<JavaPlugin> {
-        configure<JavaPluginConvention> {
+        configure<JavaPluginExtension> {
             sourceCompatibility = JavaVersion.VERSION_1_8
             targetCompatibility = JavaVersion.VERSION_1_8
         }
@@ -957,9 +958,11 @@ allprojects {
                             asNode()
                         }
                         name.set(
-                            (project.findProperty("artifact.name") as? String) ?: "Calcite ${project.name.capitalize()}"
+                            (project.findProperty("artifact.name") as? String) ?: "Calcite ${project.name.replaceFirstChar {
+                                if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}"
                         )
-                        description.set(project.description ?: "Calcite ${project.name.capitalize()}")
+                        description.set(project.description ?: "Calcite ${project.name.replaceFirstChar {
+                            if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}")
                         inceptionYear.set("2012")
                         url.set("https://calcite.apache.org")
                         licenses {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -19,6 +19,7 @@ import com.github.vlsi.gradle.crlf.CrLfSpec
 import com.github.vlsi.gradle.crlf.LineEndings
 import com.github.vlsi.gradle.ide.dsl.settings
 import com.github.vlsi.gradle.ide.dsl.taskTriggers
+import java.util.Locale
 
 plugins {
     kotlin("jvm")
@@ -272,15 +273,18 @@ val integTestAll by tasks.registering() {
 }
 
 for (db in listOf("h2", "mysql", "oracle", "postgresql")) {
-    val task = tasks.register("integTest" + db.capitalize(), Test::class) {
+    val task = tasks.register("integTest" + db.replaceFirstChar { if (it.isLowerCase()) it.titlecase(
+        Locale.getDefault()) else it.toString() }, Test::class) {
         group = LifecycleBasePlugin.VERIFICATION_GROUP
         description = "Executes integration JDBC tests with $db database"
         include("org/apache/calcite/test/JdbcAdapterTest.class")
         include("org/apache/calcite/test/JdbcTest.class")
         systemProperty("calcite.test.db", db)
         // Include the jars from the custom configuration to the classpath
         // otherwise the JDBC drivers for each DBMS will be missing
-        classpath = classpath + configurations.getAt("test" + db.capitalize())
+        classpath += configurations.getAt("test" + db.replaceFirstChar {
+            if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
+        })
     }
     integTestAll {
         dependsOn(task)

diff --git a/ubenchmark/build.gradle.kts b/ubenchmark/build.gradle.kts
@@ -44,7 +44,7 @@ tasks.withType<JavaExec>().configureEach {
         // At best jmh plugin should add the generated directories to the Gradle model, however,
         // currently it builds the jar only :-/
         // IntelliJ IDEA "execute main method" adds a JavaExec task, so we configure it
-        classpath(File(buildDir, "jmh-generated-classes"))
-        classpath(File(buildDir, "jmh-generated-resources"))
+        classpath(File(layout.buildDirectory.asFile.get(), "jmh-generated-classes"))
+        classpath(File(layout.buildDirectory.asFile.get(), "jmh-generated-resources"))
     }
 }