aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2025-02-07 13:33:04 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2025-02-07 13:33:04 +0100
commit4ab3fb6904fae04ab1b8f9e01c40cc418bcda1f3 (patch)
tree2f210f8b14b6ed6ccd54f76d39416f25515b4406
parentec14ff1dbf54789864305b0113d124f5581903d5 (diff)
Reenable tests for the mso-catalog-db module
- add vintage engine dep for mso-catalog-db module - use https urls for repository urls since maven central is not accepting http connections anymore [0] [0] https://www.sonatype.com/blog/central-repository-moving-to-https Issue-ID: SO-4137 Change-Id: I0328575020d32db00f50b6ae57e888688b09a54b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
-rw-r--r--adapters/mso-requests-db-adapter/pom.xml4
-rw-r--r--deployment-configs/pom.xml2
-rw-r--r--mso-catalog-db/pom.xml5
-rw-r--r--pom.xml18
4 files changed, 17 insertions, 12 deletions
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 5d78f27ae2..066e3e6dc5 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -83,7 +83,7 @@
<pluginRepository>
<id>apache.snapshots</id>
<name>Maven Plugin Snapshots</name>
- <url>http://repository.apache.org/snapshots/</url>
+ <url>https://repository.apache.org/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -217,7 +217,7 @@
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
diff --git a/deployment-configs/pom.xml b/deployment-configs/pom.xml
index f540e5a8a1..c3ee2bc005 100644
--- a/deployment-configs/pom.xml
+++ b/deployment-configs/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>deployment-configs</artifactId>
<name>deployment-configs</name>
- <url>http://maven.apache.org</url>
+ <url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml
index 0285deab21..89651ece46 100644
--- a/mso-catalog-db/pom.xml
+++ b/mso-catalog-db/pom.xml
@@ -62,6 +62,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>ch.vorburger.mariaDB4j</groupId>
<artifactId>mariaDB4j</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index f2e0fa127e..cc9141ff57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
</description>
<organization>
<name>ONAP - SO</name>
- <url>http://www.onap.org/</url>
+ <url>https://www.onap.org/</url>
</organization>
<modules>
<module>deployment-configs</module>
@@ -118,11 +118,11 @@
<pluginRepositories>
<pluginRepository>
<id>central</id>
- <url>http://repo1.maven.org/maven2</url>
+ <url>https://repo1.maven.org/maven2</url>
</pluginRepository>
<pluginRepository>
<id>restlet</id>
- <url>http://maven.restlet.com</url>
+ <url>https://maven.restlet.com</url>
</pluginRepository>
<pluginRepository>
<id>onap-public</id>
@@ -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>