Skip to content

Commit 5394afa

Browse files
committed
Add Jackson dependency
1 parent 336f2ea commit 5394afa

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

.github/workflows/build-and-publish.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
build-and-publish:
1010
name: Java Gradle
11-
uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.42.0
11+
uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.43.0
1212
with:
1313
java-version: 17
1414
secrets:
@@ -19,5 +19,4 @@ jobs:
1919
signing-password: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
2020
ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
2121
ossrh-password: ${{ secrets.SONATYPE_OSSRH_PASSWORD }}
22-
github-username: ${{ secrets.GH_USERNAME }}
2322
github-token: ${{ secrets.GH_TOKEN }}

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
java-gradle-release:
1818
name: Java Gradle
19-
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.42.0
19+
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.43.0
2020
with:
2121
java-version: 17
2222
release-type: "${{ inputs.release-type }}"

build.gradle.kts

+3-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
plugins {
22
// release
3-
id("net.researchgate.release") version "3.0.2"
4-
id("com.bakdata.sonar") version "1.1.17"
5-
id("com.bakdata.sonatype") version "1.2.2"
6-
id("org.hildan.github.changelog") version "2.2.0"
3+
id("com.bakdata.release") version "1.4.0"
4+
id("com.bakdata.sonar") version "1.4.0"
5+
id("com.bakdata.sonatype") version "1.4.0"
76
id("io.freefair.lombok") version "8.4" apply false
87
}
98

@@ -42,12 +41,6 @@ configure<com.bakdata.gradle.SonatypeSettings> {
4241
}
4342
}
4443

45-
configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
46-
githubUser = "bakdata"
47-
futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
48-
sinceTag = findProperty("changelog.sinceTag")?.toString()
49-
}
50-
5144
subprojects {
5245
apply(plugin = "java-library")
5346
apply(plugin = "io.freefair.lombok")
@@ -75,9 +68,3 @@ subprojects {
7568
"testImplementation"(group = "org.assertj", name = "assertj-core", version = "3.25.3")
7669
}
7770
}
78-
79-
release {
80-
git {
81-
requireBranch.set("master")
82-
}
83-
}

schema-registry-mock/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ dependencies {
77
"api"(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion)
88

99
implementation(group = "org.wiremock", name = "wiremock", version = "3.4.2")
10+
// required because other dependencies use different Jackson versions if this library is used in test scope
11+
api(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.15.3")
1012

1113
val junit5Version: String by project
1214
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)

0 commit comments

Comments
 (0)