Merge branch 'master' into feat/azure-gh

bakdata · Feb 6, 2024 · 59862de · 59862de
2 parents 4d2631c + 9a67ab6
commit 59862de
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Change Log
 
+## [1.1.11](https://github.com/bakdata/gradle-plugins/tree/1.1.11) (2024-01-29)
+[Full Changelog](https://github.com/bakdata/gradle-plugins/compare/1.1.10...1.1.11)
+
+**Merged pull requests:**
+
+- Update Jacoco for Java 21 compatibility [\#32](https://github.com/bakdata/gradle-plugins/pull/32) ([@philipp94831](https://github.com/philipp94831))
+
+## [1.1.10](https://github.com/bakdata/gradle-plugins/tree/1.1.10) (2024-01-29)
+[Full Changelog](https://github.com/bakdata/gradle-plugins/compare/1.1.9...1.1.10)
+
+**Merged pull requests:**
+
+- Update SonarQube Plugin [\#25](https://github.com/bakdata/gradle-plugins/pull/25) ([@philipp94831](https://github.com/philipp94831))
+
+## [1.1.9](https://github.com/bakdata/gradle-plugins/tree/1.1.9) (2024-01-10)
+[Full Changelog](https://github.com/bakdata/gradle-plugins/compare/1.1.8...1.1.9)
+
+
+## [1.1.8](https://github.com/bakdata/gradle-plugins/tree/1.1.8) (2024-01-10)
+[Full Changelog](https://github.com/bakdata/gradle-plugins/compare/1.1.7...1.1.8)
+
+**Closed issues:**
+
+- docs? [\#22](https://github.com/bakdata/gradle-plugins/issues/22)
+
+**Merged pull requests:**
+
+- Configure staging profile ID for Nexus release [\#31](https://github.com/bakdata/gradle-plugins/pull/31) ([@philipp94831](https://github.com/philipp94831))
+
 ## [1.1.7](https://github.com/bakdata/gradle-plugins/tree/1.1.7) (2021-09-02)
 [Full Changelog](https://github.com/bakdata/gradle-plugins/compare/1.1.6...1.1.7)
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
     // release
     id("net.researchgate.release") version "2.6.0"
     // eat your own dog food - apply the plugins to this plugin project
-    id("com.bakdata.sonar") version "1.1.6"
-    id("com.bakdata.sonatype") version "1.1.6"
+    id("com.bakdata.sonar") version "1.1.7"
+    id("com.bakdata.sonatype") version "1.1.7"
     id("org.hildan.github.changelog") version "0.8.0"
 }
 
@@ -94,3 +94,6 @@ if (!version.toString().endsWith("-SNAPSHOT")) {
         }
     }
 }
+
+val sonarqube by tasks
+sonarqube.enabled = false //FIXME requires Java 17
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-version=1.1.8-SNAPSHOT
+version=1.1.12-SNAPSHOT
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/sonar/build.gradle.kts b/sonar/build.gradle.kts
@@ -7,7 +7,7 @@ apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 description = "Configures sonar for multi project setups for all jvm languages"
 
 dependencies {
-    implementation( "org.sonarsource.scanner.gradle", "sonarqube-gradle-plugin", "3.3")
+    implementation( "org.sonarsource.scanner.gradle", "sonarqube-gradle-plugin", "3.4.0.2513")
 }
 
 tasks.withType<Test> {

diff --git a/sonar/src/main/kotlin/com/bakdata/gradle/SonarPlugin.kt b/sonar/src/main/kotlin/com/bakdata/gradle/SonarPlugin.kt
@@ -68,7 +68,7 @@ class SonarPlugin : Plugin<Project> {
 
                     project.configure<JacocoPluginExtension> {
                         // smaller versions won't work with kotlin properly
-                        toolVersion = "0.8.3"
+                        toolVersion = "0.8.11"
                     }
 
                     tasks.withType<JacocoReport> {

diff --git a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt
@@ -119,6 +119,7 @@ class SonatypePlugin : Plugin<Project> {
             // first try to set all settings, even if not given (yet)
             project.configure<NexusStagingExtension> {
                 packageGroup = "com.bakdata"
+                stagingProfileId = "8412378836ed9c"
                 username = getOverriddenSetting(SonatypeSettings::osshrUsername)
                 password = getOverriddenSetting(SonatypeSettings::osshrPassword)
                 getOverriddenSetting(SonatypeSettings::nexusUrl)?.let { serverUrl = it }

diff --git a/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt b/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt
@@ -210,7 +210,7 @@ internal class SonatypePluginIT {
     companion object {
         private const val TEST_GROUP: String = "com.bakdata"
 
-        private const val PROFILE_ID: Int = 7
+        private const val PROFILE_ID: String = "8412378836ed9c"
 
         private const val STAGING_ID: Int = 5