aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2025-02-07 11:04:12 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2025-02-07 11:04:12 +0100
commit4357a3efbcab5a78236d662413e17ff61d937c0b (patch)
tree3dcd34c0f3a6ed813bada403a98050668e4d6188
parentec14ff1dbf54789864305b0113d124f5581903d5 (diff)
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 <Fiete.Ostkamp@telekom.de>
-rw-r--r--asdc-controller/pom.xml5
-rw-r--r--pom.xml17
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
@@ -224,6 +224,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
diff --git a/pom.xml b/pom.xml
index f2e0fa127e..5470fef206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>5.1</version>
+ <version>4.0.0.4121</version>
</plugin>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
@@ -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 @@
<skipBuild>${docker.skip.build}</skipBuild>
<skipPush>${docker.skip.push}</skipPush>
<dockerHost>${docker.newHost}</dockerHost>
- <!-- 1. Update address to your local docker VM. 2. Add IP to
+ <!-- 1. Update address to your local docker VM. 2. Add IP to
your NO_PROXY environment variable -->
<certPath>${docker.host.cert.path}</certPath>
- <!-- Add -Ddocker.host.cert.pat="path to your local certs directory"
+ <!-- Add -Ddocker.host.cert.pat="path to your local certs directory"
to maven build command -->
<pushRegistry>${dockerPushRepo}</pushRegistry>
- <!-- Update .m2/settings.xml Add server id settings.dockerRepository,
+ <!-- Update .m2/settings.xml Add server id settings.dockerRepository,
username, and password -->
<pullRegistry>${dockerPullRepo}</pullRegistry>
- <!-- If docker repo is not public. Update .m2/settings.xml Add
+ <!-- If docker repo is not public. Update .m2/settings.xml Add
server id settings.dockerRepository, username, and password -->
<images>
<image>
@@ -768,6 +768,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -873,6 +874,7 @@
<groupId>com.googlecode.junit-toolbox</groupId>
<artifactId>junit-toolbox</artifactId>
<version>2.4</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
@@ -937,6 +939,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${springboot.version}</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>