8 files changed, 17 insertions, 15 deletions

diff --git a/build.gradle b/build.gradle
index 086e899a..329b1cdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,9 @@
 plugins {
         id 'eclipse'
-        id 'org.sonarqube'
+        id 'refinery-sonarqube'
 }
 
 allprojects {
         group = 'tools.refinery'
         version = '0.0.0-SNAPSHOT'
-
-        sonarqube.properties {
-                // Make sure `exclusions` is a List in every subproject
-                property 'sonar.exclusions', []
-        }
-}
-
-sonarqube.properties {
-        property 'sonar.projectKey', 'graphs4value_refinery'
-        property 'sonar.organization', 'graphs4value'
-        property 'sonar.host.url', 'https://sonarcloud.io'
 }
diff --git a/buildSrc/src/main/groovy/refinery-jmh.gradle b/buildSrc/src/main/groovy/refinery-jmh.gradle
index 553c469b..48e0c133 100644
--- a/buildSrc/src/main/groovy/refinery-jmh.gradle
+++ b/buildSrc/src/main/groovy/refinery-jmh.gradle
@@ -1,6 +1,6 @@
 plugins {
-        id 'org.sonarqube'
         id 'refinery-java-conventions'
+        id 'refinery-sonarqube'
 }
 
 configurations {
diff --git a/buildSrc/src/main/groovy/refinery-sonarqube.gradle b/buildSrc/src/main/groovy/refinery-sonarqube.gradle
new file mode 100644
index 00000000..d84f4ada
--- /dev/null
+++ b/buildSrc/src/main/groovy/refinery-sonarqube.gradle
@@ -0,0 +1,8 @@
+plugins {
+        id 'org.sonarqube'
+}
+
+sonarqube.properties {
+        // Make sure `exclusions` is a List in every subproject
+        property 'sonar.exclusions', []
+}
diff --git a/buildSrc/src/main/groovy/refinery-xtend.gradle b/buildSrc/src/main/groovy/refinery-xtend.gradle
index 9281ab1f..9186dbc5 100644
--- a/buildSrc/src/main/groovy/refinery-xtend.gradle
+++ b/buildSrc/src/main/groovy/refinery-xtend.gradle
@@ -1,7 +1,7 @@
 plugins {
-        id 'org.sonarqube'
         id 'org.xtext.xtend'
         id 'refinery-java-conventions'
+        id 'refinery-sonarqube'
 }
 
 sourceSets {
diff --git a/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle b/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle
index a91d723e..0c7c82f0 100644
--- a/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle
@@ -1,6 +1,6 @@
 plugins {
-        id 'org.sonarqube'
         id 'refinery-java-conventions'
+        id 'refinery-sonarqube'
 }
 
 sourceSets {
diff --git a/gradle.properties b/gradle.properties
index cacf39a5..713ba6a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,5 @@
 nodeVersion=16.13.0
+systemProp.sonar.projectKey=graphs4value_refinery
+systemProp.sonar.organization=graphs4value
+systemProp.sonar.host.url=https://sonarcloud.io
 yarnVersion=1.22.17
diff --git a/language-model/build.gradle b/language-model/build.gradle
index 4c30e62f..2cbddddb 100644
--- a/language-model/build.gradle
+++ b/language-model/build.gradle
@@ -2,6 +2,7 @@ plugins {
         id 'java-test-fixtures'
         id 'refinery-java-library'
         id 'refinery-mwe2'
+        id 'refinery-sonarqube'
 }
 
 dependencies {
diff --git a/language/build.gradle b/language/build.gradle
index 7f956a47..f7574ecc 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -2,6 +2,7 @@ plugins {
         id 'java-test-fixtures'
         id 'refinery-java-library'
         id 'refinery-mwe2'
+        id 'refinery-sonarqube'
         id 'refinery-xtend'
         id 'refinery-xtext-conventions'
 }