From 3d160e9827aed571c1e7ce653caa5939beda2d04 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 11:09:25 +0400 Subject: [PATCH] Corrected after review --- build.gradle | 3 --- cradle-admin-tool-http/build.gradle | 15 ++++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 7b7ddaf..01d370e 100644 --- a/build.gradle +++ b/build.gradle @@ -46,9 +46,6 @@ subprojects { testImplementation 'com.exactpro.th2:junit-jupiter-integration:0.0.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' - - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' } test { diff --git a/cradle-admin-tool-http/build.gradle b/cradle-admin-tool-http/build.gradle index 068ef36..38afec5 100644 --- a/cradle-admin-tool-http/build.gradle +++ b/cradle-admin-tool-http/build.gradle @@ -3,31 +3,28 @@ plugins { id 'com.exactpro.th2.gradle.component' } -ext { - jettyVersion = '9.4.54.v20240208' -} - dependencies { implementation project(':cradle-admin-tool-core') + implementation platform('org.eclipse.jetty:jetty-bom:9.4.54.v20240208') implementation("com.exactpro.th2:common:$commonVersion") { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } implementation "com.exactpro.th2:cradle-core:$cradleVersion" implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion" - implementation "org.eclipse.jetty:jetty-server:${jettyVersion}" - implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}" + implementation "org.eclipse.jetty:jetty-server" + implementation "org.eclipse.jetty:jetty-servlet" implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2' implementation 'org.apache.commons:commons-lang3' testImplementation project(':cradle-admin-tool-test') - testImplementation "org.eclipse.jetty:jetty-http:${jettyVersion}:tests" - testImplementation "org.eclipse.jetty:jetty-util:${jettyVersion}" + //noinspection DependencyNotationArgument + testImplementation group: "org.eclipse.jetty", name: "jetty-http", classifier: "tests" + testImplementation "org.eclipse.jetty:jetty-util" } application { - applicationName = 'service' mainClassName = "com.exactpro.th2.cradle.adm.http.Application" } \ No newline at end of file