From 4357a3efbcab5a78236d662413e17ff61d937c0b Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Fri, 7 Feb 2025 11:04:12 +0100 Subject: Reenable tests for the asdc-controller module - fix build warning about unresolvable sonar-maven-plugin - change dependency scope of mockito, junit-toolbox and spring-boot-starter-test to test Issue-ID: SO-4135 Change-Id: I06b42c856167586a3f68054e2b8e34bff4e1088f Signed-off-by: Fiete Ostkamp --- asdc-controller/pom.xml | 5 +++++ pom.xml | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index e2b0322d58..a17d1b0748 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -223,6 +223,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + commons-codec commons-codec diff --git a/pom.xml b/pom.xml index f2e0fa127e..5470fef206 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ org.codehaus.mojo sonar-maven-plugin - 5.1 + 4.0.0.4121 maven-scm-plugin @@ -411,13 +411,13 @@ f = new File( p ); if( f.exists() ) { break; - } + } p = "../" + p; } } if( f != null ) { String basePath = f.getCanonicalPath(); - basePath = basePath.substring( 0, basePath.lastIndexOf( File.separator ) ); + basePath = basePath.substring( 0, basePath.lastIndexOf( File.separator ) ); project.properties['base-path'] = basePath.replace( '\\' , '/'); log.info(' - used base path = ' + project.properties['base-path'] ); } else { @@ -578,16 +578,16 @@ ${docker.skip.build} ${docker.skip.push} ${docker.newHost} - ${docker.host.cert.path} - ${dockerPushRepo} - ${dockerPullRepo} - @@ -768,6 +768,7 @@ org.mockito mockito-core + test org.hamcrest @@ -873,6 +874,7 @@ com.googlecode.junit-toolbox junit-toolbox 2.4 + test @@ -937,6 +939,7 @@ org.springframework.boot spring-boot-starter-test ${springboot.version} + test com.vaadin.external.google -- cgit 1.2.3-korg