Skip to content

Commit

Permalink
Merge branch 'master' into renovate/pmd-7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
anasoid authored Sep 26, 2024
2 parents 4664930 + 0ef7a93 commit 4b35d79
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ subprojects {
dependencies {

// SLF4J as a facade over Log4j2 required dependencies
implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4j2Version")


//JMETER
Expand Down Expand Up @@ -157,7 +157,7 @@ subprojects {

testImplementation("org.xmlunit:xmlunit-core:$xmlunitVersion")
testImplementation("org.xmlunit:xmlunit-matchers:$xmlunitVersion")
testImplementation("com.github.tomakehurst:wiremock-jre8:$wiremockVersion")
testImplementation("org.wiremock:wiremock:$wiremockVersion")
testImplementation("ru.lanwen.wiremock:wiremock-junit5:$wiremockJunit5Version")
testImplementation("org.mockito:mockito-core:$mockitoVersion")
testImplementation("org.mockito:mockito-inline:$mockitoVersion")
Expand Down
7 changes: 3 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@

lombockVersion=1.18.34
junitVersion = 5.11.1
log4j2Version = 2.24.0
junitVersion=5.11.1
log4j2Version=2.24.0
commonsIoVersion=2.17.0
commonsLangVersion=3.17.0
jmeterVersion=5.6.3
commonsBeanutilsVersion=1.9.4
classgraphVersion=4.8.176
xmlunitVersion=2.10.0
wiremockVersion=2.35.2
wiremockVersion=3.9.1
wiremockJunit5Version=1.3.1
assertjCore=3.26.3
mockitoVersion=5.+
Expand Down
2 changes: 1 addition & 1 deletion jmc-test/jmc-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ dependencies {

implementation("org.xmlunit:xmlunit-core:$xmlunitVersion")
implementation("org.xmlunit:xmlunit-matchers:$xmlunitVersion")
implementation("com.github.tomakehurst:wiremock-jre8:$wiremockVersion")
implementation("org.wiremock:wiremock:$wiremockVersion")
implementation("ru.lanwen.wiremock:wiremock-junit5:$wiremockJunit5Version")
}

0 comments on commit 4b35d79

Please sign in to comment.