Skip to content

Commit

Permalink
Merge branch 'main' into feat/azure-gh
Browse files Browse the repository at this point in the history
  • Loading branch information
yannick-roeder committed Feb 6, 2024
2 parents 5537485 + df87f15 commit f69c4bc
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 29 deletions.
19 changes: 14 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# Change Log

## [1.0.2](https://github.com/bakdata/kserve-client/tree/1.0.2) (2024-01-26)
[View commits](https://github.com/bakdata/kserve-client/compare/1.0.1...1.0.2)

**Merged pull requests:**

- Update dependencies [\#9](https://github.com/bakdata/kserve-client/pull/9) ([@philipp94831](https://github.com/philipp94831))
- Set link to blog post [\#6](https://github.com/bakdata/kserve-client/pull/6) ([@JakobEdding](https://github.com/JakobEdding))

## [1.0.1](https://github.com/bakdata/kserve-client/tree/1.0.1) (2022-06-03)
[Full Changelog](https://github.com/bakdata/kserve-client/compare/1.0.0...1.0.1)
[View commits](https://github.com/bakdata/kserve-client/compare/1.0.0...1.0.1)

**Merged pull requests:**

- Fix package namespace in readme [\#5](https://github.com/bakdata/kserve-client/pull/5) ([@jakob-ed](https://github.com/jakob-ed))
- Update dependencies jackson\-databind, jsoup [\#4](https://github.com/bakdata/kserve-client/pull/4) ([@jakob-ed](https://github.com/jakob-ed))
- Fix package namespace in readme [\#5](https://github.com/bakdata/kserve-client/pull/5) ([@JakobEdding](https://github.com/JakobEdding))
- Update dependencies jackson\-databind, jsoup [\#4](https://github.com/bakdata/kserve-client/pull/4) ([@JakobEdding](https://github.com/JakobEdding))

## [1.0.0](https://github.com/bakdata/kserve-client/tree/1.0.0) (2022-06-01)
[View commits](https://github.com/bakdata/kserve-client/compare/c473888baa1173f779b244cd7d5ebd53dff1a0c7...1.0.0)

**Merged pull requests:**

- Make gradlew executable [\#3](https://github.com/bakdata/kserve-client/pull/3) ([@philipp94831](https://github.com/philipp94831))
- Fix gradle build config for release [\#2](https://github.com/bakdata/kserve-client/pull/2) ([@jakob-ed](https://github.com/jakob-ed))
- Add kserve\-client [\#1](https://github.com/bakdata/kserve-client/pull/1) ([@jakob-ed](https://github.com/jakob-ed))
- Fix gradle build config for release [\#2](https://github.com/bakdata/kserve-client/pull/2) ([@JakobEdding](https://github.com/JakobEdding))
- Add kserve\-client [\#1](https://github.com/bakdata/kserve-client/pull/1) ([@JakobEdding](https://github.com/JakobEdding))
29 changes: 9 additions & 20 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import net.researchgate.release.GitAdapter.GitConfig
import net.researchgate.release.ReleaseExtension

description = "A Java client for KServe inference services."

plugins {
`java-library`
id("net.researchgate.release") version "2.8.1"
id("net.researchgate.release") version "3.0.2"
id("com.bakdata.sonar") version "1.1.11"
id("com.bakdata.sonatype") version "1.1.11"
id("org.hildan.github.changelog") version "0.8.0"
id("io.freefair.lombok") version "5.3.3.3"
id("org.hildan.github.changelog") version "1.12.1"
id("io.freefair.lombok") version "6.6.3"
id("java-test-fixtures")
}

Expand All @@ -24,24 +21,24 @@ repositories {
mavenCentral()
}

configure<JavaPluginConvention> {
configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

dependencies {
implementation(group = "org.jsoup", name = "jsoup", version = "1.15.1")
implementation(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.13.3")
implementation(group = "org.jsoup", name = "jsoup", version = "1.17.2")
implementation(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.16.1")
val okHttpVersion: String by project
implementation(group = "com.squareup.okhttp3", name = "okhttp", version = okHttpVersion)
implementation(group = "org.json", name = "json", version = "20211205")
implementation(group = "org.json", name = "json", version = "20231013")
implementation(group = "io.github.resilience4j", name = "resilience4j-retry", version = "1.7.1")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.25")
implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.10")

val junitVersion: String by project
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitVersion)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
testImplementation(group = "org.assertj", name = "assertj-core", version = "3.22.0")
testImplementation(group = "org.assertj", name = "assertj-core", version = "3.25.1")
testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = okHttpVersion)

testFixturesImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = okHttpVersion)
Expand Down Expand Up @@ -70,11 +67,3 @@ configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
sinceTag = findProperty("changelog.sinceTag")?.toString()
}

fun ReleaseExtension.git(configure: GitConfig.() -> Unit) = (getProperty("git") as GitConfig).configure()

release {
git {
requireBranch = "main"
}
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=1.0.2-SNAPSHOT
version=1.0.3-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=true
okHttpVersion=4.9.3
junitVersion=5.7.2
okHttpVersion=4.12.0
junitVersion=5.10.1
1 change: 0 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit f69c4bc

Please sign in to comment.