Merge remote-tracking branch 'upstream/main' into gradle-action

Author: trask

.github/workflows/build.yml

@@ -63,8 +63,6 @@ jobs:
           build
           -PtestJavaVersion=${{ matrix.test-java-version }}
           -Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: generate
         # Skip running on macos-latest which doesn't have docker

buildSrc/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
-  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.2")
+  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5")
   // Needed for japicmp but not automatically brought in for some reason.
   implementation("com.google.guava:guava:32.1.3-jre")
 }

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -36,7 +36,6 @@ tasks {
     with(options) {
       release.set(8)
 
-      //disable deprecation warnings for the protobuf module
       compilerArgs.addAll(
         listOf(
           // Fail build on any warning
@@ -77,8 +76,6 @@ tasks {
       breakIterator(true)
 
       addBooleanOption("html5", true)
-
-      links("https://docs.oracle.com/javase/8/docs/api/")
       addBooleanOption("Xdoclint:all,-missing", true)
     }
   }

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

settings.gradle.kts

@@ -1,13 +1,13 @@
 pluginManagement {
   plugins {
-    id("com.gradle.enterprise") version "3.14.1"
     id("de.undercouch.download") version "5.4.0"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("com.gradle.develocity") version "3.18.2"
   }
 }
 
 plugins {
-  id("com.gradle.enterprise")
+  id("com.gradle.develocity")
 }
 
 dependencyResolutionManagement {
@@ -17,47 +17,15 @@ dependencyResolutionManagement {
   }
 }
 
+develocity {
+  buildScan {
+    publishing.onlyIf { System.getenv("CI") != null }
+    termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+    termsOfUseAgree.set("yes")
+  }
+}
+
 rootProject.name = "semantic-conventions-java"
 include(":dependencyManagement")
 include(":semconv-incubating")
 include(":semconv")
-
-val gradleEnterpriseServer = "https://ge.opentelemetry.io"
-val isCI = System.getenv("CI") != null
-val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
-
-// if GE access key is not given and we are in CI, then we publish to scans.gradle.com
-val useScansGradleCom = isCI && geAccessKey.isEmpty()
-
-if (useScansGradleCom) {
-  gradleEnterprise {
-    buildScan {
-      termsOfServiceUrl = "https://gradle.com/terms-of-service"
-      termsOfServiceAgree = "yes"
-      isUploadInBackground = !isCI
-      publishAlways()
-
-      capture {
-        isTaskInputFiles = true
-      }
-    }
-  }
-} else {
-  gradleEnterprise {
-    server = gradleEnterpriseServer
-    buildScan {
-      isUploadInBackground = !isCI
-
-      this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
-      publishIfAuthenticated()
-      publishAlways()
-
-      capture {
-        isTaskInputFiles = true
-      }
-
-      gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }
-      gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) }
-    }
-  }
-}