Merge branch 'master' into master-ribafish-fork

* master:
  Updated to latest develocity plugin supported and added CCUD gradle (eclipse#1315)
  Replaced deprecated jcenter with gradlePluginPortal repository (eclipse#1314)

# Conflicts:
#	org.eclipse.buildship.site/build.gradle

org.eclipse.buildship.site/build.gradle

@@ -3,10 +3,7 @@ apply plugin: 'org.hidetake.ssh'
 
 buildscript {
     repositories {
-        jcenter()
-        maven {
-            url = uri("https://plugins.gradle.org/m2/")
-        }
+        gradlePluginPortal()
     }
     dependencies {
         classpath 'org.hidetake:gradle-ssh-plugin:2.10.1'

settings.gradle

@@ -1,14 +1,17 @@
 // publish build scans from CI builds
 plugins {
-    id "com.gradle.enterprise" version "3.10"
+    id "com.gradle.develocity" version "3.17.6"
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
 }
 
-gradleEnterprise {
+
+def isCI = System.getenv('CI') != null
+
+develocity {
     server = "https://ge.gradle.org"
     buildScan {
-        boolean ci = System.getenv('CI') as boolean
-        publishAlwaysIf(ci)
-        uploadInBackground = !ci
+        publishing.onlyIf { isCI }
+        uploadInBackground = !isCI
     }
 }