Skip to content

Commit

Permalink
fix broken pom imports
Browse files Browse the repository at this point in the history
  • Loading branch information
daviddenton committed Feb 7, 2024
1 parent 1d7da6f commit 94eeaae
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 27 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
This list is not intended to be all-encompassing - it will document major and breaking API
changes with their rationale when appropriate:

### v5.13.4.1
- **http4k-*** : Fix broken POM dependencies.

### v5.13.4.0
- **http4k-*** : Upgrade some dependency versions
- **http4k-contract** : Support for data4k progressive data models with field metadata via delegate properties
Expand Down
4 changes: 2 additions & 2 deletions http4k-contract/jsonschema/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies {
api(project(":http4k-format-core"))

implementation(project(":http4k-format-jackson"))
implementation("dev.forkhandles:values4k:2.13.4.0")
implementation("dev.forkhandles:data4k:2.13.4.0")
implementation("dev.forkhandles:values4k:_")
implementation("dev.forkhandles:data4k:_")
implementation("org.jetbrains.kotlin:kotlin-reflect")

testImplementation(project(":http4k-core"))
Expand Down
10 changes: 5 additions & 5 deletions http4k-contract/openapi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@ dependencies {
api(project(":http4k-core"))
api(project(":http4k-contract-jsonschema"))

implementation("dev.forkhandles:values4k")
implementation("dev.forkhandles:values4k:_")
implementation(project(":http4k-security-oauth"))
implementation(project(":http4k-format-jackson"))
implementation(project(":http4k-multipart"))

testImplementation("dev.forkhandles:values4k")
testImplementation("dev.forkhandles:values4k:_")
testImplementation(project(":http4k-format-jackson"))
testImplementation(project(":http4k-format-argo"))
testImplementation(project(":http4k-testing-approval"))
testImplementation(testFixtures(project(":http4k-core")))
testImplementation(testFixtures(project(":http4k-security-oauth")))
}

task generateOpenApi3AutoClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
tasks.register('generateOpenApi3AutoClient', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
generatorName = "kotlin"
outputDir = "."
validateSpec = false
inputSpec = "$projectDir/src/test/resources/org/http4k/contract/openapi/v3/OpenApi3AutoTest.renders as expected.approved".toString()
inputs.file(inputSpec)
}

task generateOpenApi3Client(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
tasks.register('generateOpenApi3Client', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
generatorName = "kotlin"
outputDir = "."
validateSpec = false
Expand All @@ -36,7 +36,7 @@ task generateOpenApi3Client(type: org.openapitools.generator.gradle.plugin.tasks
mustRunAfter(generateOpenApi3AutoClient)
}

task generateOpenApi2Client(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
tasks.register('generateOpenApi2Client', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
generatorName = "kotlin"
outputDir = "."
validateSpec = false
Expand Down
10 changes: 5 additions & 5 deletions http4k-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ dependencies {

implementation("javax.servlet:javax.servlet-api:_")
implementation("jakarta.servlet:jakarta.servlet-api:_")
implementation("dev.forkhandles:result4k:2.13.4.0")
implementation("dev.forkhandles:values4k:2.13.4.0")
implementation("dev.forkhandles:result4k:_")
implementation("dev.forkhandles:values4k:_")

testImplementation(Testing.junit.jupiter.params)

testFixturesImplementation("javax.servlet:javax.servlet-api:_")
testFixturesImplementation("jakarta.servlet:jakarta.servlet-api:_")
testFixturesImplementation("dev.forkhandles:result4k:2.13.4.0")
testFixturesImplementation("dev.forkhandles:values4k:2.13.4.0")
testFixturesImplementation("dev.forkhandles:result4k:_")
testFixturesImplementation("dev.forkhandles:values4k:_")
testFixturesApi(project(":http4k-client-apache"))
testFixturesApi(project(":http4k-testing-approval"))
testFixturesApi(project(":http4k-testing-hamkrest"))
testFixturesApi(project(":http4k-format-jackson"))
testFixturesApi(project(":http4k-client-websocket"))
testFixturesApi(project(":http4k-server-apache"))
testFixturesApi("dev.forkhandles:mock4k:2.13.4.0")
testFixturesApi("dev.forkhandles:mock4k:_")
testFixturesApi("org.webjars:swagger-ui:_")
}
6 changes: 3 additions & 3 deletions http4k-format/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ description = "Http4k Format supporting code"
dependencies {
api(project(":http4k-core"))
api(project(":http4k-realtime-core"))
implementation("dev.forkhandles:values4k:2.13.4.0")
implementation("dev.forkhandles:values4k:_")

testImplementation("dev.forkhandles:values4k:2.13.4.0")
testImplementation("dev.forkhandles:values4k:_")
testImplementation(project(":http4k-core"))
testImplementation(project(":http4k-jsonrpc"))
testImplementation(project(":http4k-testing-hamkrest"))

testFixturesImplementation("dev.forkhandles:values4k:2.13.4.0")
testFixturesImplementation("dev.forkhandles:values4k:_")
testFixturesImplementation(testFixtures(project(":http4k-core")))
testFixturesImplementation(testFixtures(project(":http4k-contract")))
testFixturesImplementation(testFixtures(project(":http4k-jsonrpc")))
Expand Down
4 changes: 2 additions & 2 deletions http4k-format/jackson/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies {
api("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("io.cloudevents:cloudevents-core:_")
implementation("io.cloudevents:cloudevents-json-jackson:_")
implementation("dev.forkhandles:values4k:2.13.4.0")
implementation("dev.forkhandles:data4k:2.13.4.0")
implementation("dev.forkhandles:values4k:_")
implementation("dev.forkhandles:data4k:_")

testImplementation(project(":http4k-core"))
testImplementation(project(":http4k-contract"))
Expand Down
2 changes: 1 addition & 1 deletion http4k-format/kondor-json/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
testImplementation(project(":http4k-core"))
testImplementation(project(":http4k-contract"))
testImplementation(project(":http4k-jsonrpc"))
testImplementation("dev.forkhandles:values4k:2.13.4.0")
testImplementation("dev.forkhandles:values4k:_")
testImplementation(testFixtures(project(":http4k-core")))
testImplementation(testFixtures(project(":http4k-format-core")))
testImplementation(testFixtures(project(":http4k-contract")))
Expand Down
2 changes: 1 addition & 1 deletion http4k-format/moshi-yaml/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
api("org.yaml:snakeyaml:_")

testImplementation(project(":http4k-core"))
testImplementation("dev.forkhandles:values4k:2.13.4.0")
testImplementation("dev.forkhandles:values4k:_")
testImplementation(testFixtures(project(":http4k-core")))
testImplementation(testFixtures(project(":http4k-format-core")))
}
2 changes: 1 addition & 1 deletion http4k-format/moshi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
api(project(":http4k-realtime-core"))
api(Square.moshi)
api(Square.moshi.kotlinReflect)
implementation("dev.forkhandles:values4k:2.13.4.0")
implementation("dev.forkhandles:values4k:_")

testImplementation(project(":http4k-core"))
testImplementation(Square.moshi)
Expand Down
2 changes: 1 addition & 1 deletion http4k-htmx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api(project(":http4k-core"))
api("org.webjars.npm:htmx.org:_")
api("org.webjars.npm:hyperscript.org:_")
api("dev.forkhandles:values4k:2.13.4.0")
api("dev.forkhandles:values4k:_")

testImplementation(testFixtures(project(":http4k-core")))
}
2 changes: 1 addition & 1 deletion http4k-security/oauth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
api(project(":http4k-format-moshi")) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect")
}
api("dev.forkhandles:result4k:2.13.4.0")
api("dev.forkhandles:result4k:_")
testImplementation(project(":http4k-format-jackson"))
testImplementation(testFixtures(project(":http4k-core")))
testImplementation("commons-codec:commons-codec:_")
Expand Down
2 changes: 1 addition & 1 deletion http4k-serverless/lambda/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
testFixturesApi(project(":http4k-client-okhttp"))

testFixturesApi("com.amazonaws:aws-lambda-java-events:_")
testFixturesApi("dev.forkhandles:result4k:2.13.4.0")
testFixturesApi("dev.forkhandles:result4k:_")
testFixturesApi(testFixtures(project(":http4k-core")))
testFixturesApi(testFixtures(project(":http4k-serverless-core")))
testFixturesImplementation(testFixtures(project(":http4k-aws")))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ dependencies {
api(project(":http4k-client-okhttp"))
api(testFixtures(project(":http4k-core")))
api(testFixtures(project(":http4k-serverless-core")))
testImplementation("dev.forkhandles:bunting4k:2.13.4.0")
testImplementation("dev.forkhandles:bunting4k:_")
testImplementation(testFixtures(project(":http4k-core")))
}
2 changes: 1 addition & 1 deletion http4k-webhook/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Http4k Standard webhooks support"

dependencies {
api(project(":http4k-core"))
api("dev.forkhandles:values4k:2.13.4.0")
api("dev.forkhandles:values4k:_")
api(project(":http4k-format-core"))

testImplementation(project(":http4k-format-jackson"))
Expand Down
12 changes: 10 additions & 2 deletions versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,21 @@ version.com.google.code.gson..gson=2.10.1

version.com.graphql-java..graphql-java=21.3

version.dev.forkhandles..data4k=2.13.0.0

version.dev.forkhandles..bunting4k=2.13.0.0

version.com.microsoft.azure.functions..azure-functions-java-library=3.1.0

version.com.microsoft.playwright..playwright=1.41.2

version.com.natpryce..hamkrest=1.8.0.1

version.dev.forkhandles..forkhandles-bom=2.13.0.0
version.dev.forkhandles..values4k=2.13.0.0

version.dev.forkhandles..result4k=2.13.0.0

version.dev.forkhandles..mock4k=2.13.0.0

## [blocked - 0.0.3] incompatible API (JSON headers as map vs Json object)
version.com.tencentcloudapi..scf-java-events=0.0.2
Expand Down Expand Up @@ -155,7 +163,7 @@ version.kotlin=1.9.22

version.kotlinx.serialization=1.6.2

version.ktor=2.3.8
version.ktor=2.3.8

version.moshi=1.15.1

Expand Down

0 comments on commit 94eeaae

Please sign in to comment.