diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index 3082cb3..6bf697b 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -8,7 +8,7 @@ on: jobs: build-and-publish: name: Java Gradle - uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.42.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.43.0 secrets: sonar-token: ${{ secrets.SONARCLOUD_TOKEN }} sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }} @@ -19,5 +19,4 @@ jobs: ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }} gradle-publish-key: ${{ secrets.GRADLE_PLUGIN_PUBLISH_KEY }} gradle-publish-secret: ${{ secrets.GRADLE_PLUGIN_PUBLISH_SECRET }} - github-username: ${{ secrets.GH_USERNAME }} github-token: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2e0e77a..84bacfd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ on: jobs: java-gradle-release: name: Java Gradle - uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.42.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.43.0 with: release-type: "${{ inputs.release-type }}" diff --git a/build.gradle.kts b/build.gradle.kts index 196f411..53647d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,9 @@ plugins { // release - id("net.researchgate.release") version "3.0.2" + id("com.bakdata.sonar") version "1.3.0" // eat your own dog food - apply the plugins to this plugin project id("com.bakdata.sonar") version "1.1.17" id("com.bakdata.sonatype") version "1.2.2" - id("org.hildan.github.changelog") version "1.13.1" id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false id("com.gradle.plugin-publish") version "1.2.1" apply false } @@ -38,12 +37,6 @@ configure { } } -configure { - githubUser = "bakdata" - futureVersionTag = findProperty("changelog.releaseVersion")?.toString() - sinceTag = findProperty("changelog.sinceTag")?.toString() -} - subprojects { apply(plugin = "java") @@ -88,11 +81,5 @@ subprojects { } } -release { - git { - requireBranch.set("master") - } -} - val sonarqube by tasks sonarqube.enabled = false //FIXME requires Java 17