From 5394afa4eb4febfa3a7bb7a37be7673350fad3ac Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Fri, 3 May 2024 16:11:41 +0200 Subject: [PATCH] Add Jackson dependency --- .github/workflows/build-and-publish.yaml | 3 +-- .github/workflows/release.yaml | 2 +- build.gradle.kts | 19 +++---------------- schema-registry-mock/build.gradle.kts | 2 ++ 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index 49defa2..8074368 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-library.yaml@1.42.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.43.0 with: java-version: 17 secrets: @@ -19,5 +19,4 @@ jobs: signing-password: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }} ossrh-password: ${{ secrets.SONATYPE_OSSRH_PASSWORD }} - github-username: ${{ secrets.GH_USERNAME }} github-token: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 857e236..d124b9c 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: java-version: 17 release-type: "${{ inputs.release-type }}" diff --git a/build.gradle.kts b/build.gradle.kts index 41e8e29..6ff6822 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,8 @@ plugins { // release - id("net.researchgate.release") version "3.0.2" - id("com.bakdata.sonar") version "1.1.17" - id("com.bakdata.sonatype") version "1.2.2" - id("org.hildan.github.changelog") version "2.2.0" + id("com.bakdata.release") version "1.4.0" + id("com.bakdata.sonar") version "1.4.0" + id("com.bakdata.sonatype") version "1.4.0" id("io.freefair.lombok") version "8.4" apply false } @@ -42,12 +41,6 @@ configure { } } -configure { - githubUser = "bakdata" - futureVersionTag = findProperty("changelog.releaseVersion")?.toString() - sinceTag = findProperty("changelog.sinceTag")?.toString() -} - subprojects { apply(plugin = "java-library") apply(plugin = "io.freefair.lombok") @@ -75,9 +68,3 @@ subprojects { "testImplementation"(group = "org.assertj", name = "assertj-core", version = "3.25.3") } } - -release { - git { - requireBranch.set("master") - } -} diff --git a/schema-registry-mock/build.gradle.kts b/schema-registry-mock/build.gradle.kts index d62ce0c..ef01440 100644 --- a/schema-registry-mock/build.gradle.kts +++ b/schema-registry-mock/build.gradle.kts @@ -7,6 +7,8 @@ dependencies { "api"(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion) implementation(group = "org.wiremock", name = "wiremock", version = "3.4.2") + // required because other dependencies use different Jackson versions if this library is used in test scope + api(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.15.3") val junit5Version: String by project testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)