Skip to content

Upgrade dependencies and refactor SwaggerCoverageRunner for Karate v2 compatibility #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sh4dy9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade dependencies and refactor SwaggerCoverageRunner for Karate v2 compatibility #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

plugins {
java
id("io.spring.dependency-management") version "1.0.11.RELEASE"
id("io.spring.dependency-management") version "1.1.6"
}

group = "com.github.viclovsky"
Expand All @@ -18,7 +18,7 @@ val root = rootProject.projectDir
val gradleScriptDir by extra("$root/gradle")

java {
sourceCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_21
}

configure(subprojects) {
Expand All @@ -31,7 +31,7 @@ configure(subprojects) {

configure<DependencyManagementExtension> {
imports {
mavenBom("com.fasterxml.jackson:jackson-bom:2.9.8")
mavenBom("com.fasterxml.jackson:jackson-bom:2.17.2")
}
dependencies {
dependency("org.freemarker:freemarker:2.3.31")
Expand All @@ -43,27 +43,27 @@ configure(subprojects) {
dependency("io.swagger.core.v3:swagger-models:2.2.0")
dependency("io.swagger.parser.v3:swagger-parser:2.0.32")

dependency("org.slf4j:slf4j-api:1.7.32")
dependency("ch.qos.logback:logback-classic:1.2.10")
dependency("org.slf4j:slf4j-api:2.0.13")
dependency("ch.qos.logback:logback-classic:1.5.6")

dependency("com.beust:jcommander:1.81")
dependency("junit:junit:4.13.2")
dependency("org.hamcrest:hamcrest:2.2")
dependency("com.jayway.jsonpath:json-path-assert:2.7.0")
dependency("io.rest-assured:rest-assured:4.4.0")
dependency("com.github.tomakehurst:wiremock:2.27.2")
dependency("com.fasterxml.jackson.core:jackson-core:2.12.3")
dependency("com.fasterxml.jackson.core:jackson-databind:2.12.3")
dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3")
dependency("com.fasterxml.jackson.core:jackson-annotations:2.12.3")
dependency("com.fasterxml.jackson.core:jackson-core:2.17.2")
dependency("com.fasterxml.jackson.core:jackson-databind:2.17.2")
dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2")
dependency("com.fasterxml.jackson.core:jackson-annotations:2.17.2")
dependency("org.springframework:spring-web:5.3.7")
dependency("com.intuit.karate:karate-core:1.2.0.RC1")
dependency("io.karatelabs:karate-core:2.0.0")
}
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

val sourceJar by tasks.creating(Jar::class) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=1.0-SNAPSHOT
version=1.5.1-karate-v2
1 change: 1 addition & 0 deletions gradle/maven-publish.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@ publishing {
}

signing {
required { !gradle.taskGraph.hasTask("publishToMavenLocal") && !gradle.taskGraph.allTasks.any { it.name.contains("MavenLocal") } }
sign publishing.publications
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 2 additions & 10 deletions swagger-coverage-karate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,7 @@ dependencies {
api(project(":swagger-coverage-commandline"))
implementation("io.swagger:swagger-models")
implementation("io.swagger.core.v3:swagger-models")
implementation("com.intuit.karate:karate-core")

//needed for karate runner
implementation("com.linecorp.armeria:armeria:1.14.1")
implementation("io.netty:netty-all:4.1.74.Final")
implementation("org.thymeleaf:thymeleaf:3.0.15.RELEASE")
implementation("io.github.classgraph:classgraph:4.8.108")
implementation("org.antlr:antlr4-runtime:4.9.3")
implementation("org.apache.httpcomponents:httpclient:4.5.13")
implementation("io.karatelabs:karate-core")

testImplementation("junit:junit")
testImplementation("org.hamcrest:hamcrest")
Expand All @@ -31,6 +23,6 @@ dependencies {

tasks {
test {
workingDir(buildDir)
workingDir(layout.buildDirectory.get().asFile)
}
}
Loading