From b1cb88abe8441c3940ed7af84f8e8bfa4a8bc449 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 26 Jun 2025 15:25:07 +0200 Subject: [PATCH] Remove hardcoded spring-security-web version in common pom - remove hardcoded version since the dependency should be managed by spring-boot Issue-ID: SO-4184 Signed-off-by: Fiete Ostkamp Change-Id: Ifcc33d065c3b458bb16664c6fac14bca868ba940 --- common/pom.xml | 5 ----- .../src/test/resources/application-test.yaml | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 4622cc7362..795e671695 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -106,11 +106,6 @@ failsafe 2.0.1 - - org.springframework.security - spring-security-web - 5.4.6 - org.mockito mockito-core diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml index bcd36b8643..1f779493fd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml @@ -1,10 +1,10 @@ # will be used as entry in DB to say SITE OFF/ON for healthcheck -server: +server: port: 8080 tomcat: max-threads: 50 - + mso: health: @@ -40,7 +40,7 @@ mso: endpoint: http://localhost:${wiremock.server.port} db: auth: Basic YnBlbDptc28tZGItMTUwNyE= - config: + config: path: /src/main/resources/ infra: default: @@ -88,7 +88,7 @@ mso: auth: B3705D6C2D521257CC2422ACCF03B001811ACC49F564DDB3A2CF2A1378B6D35A23CDCB696F2E1EDFBE6758DFE7C74B94F4A7DF84A0E2BB904935AC4D900D5597DF981ADE6CE1FF3AF993BED0 publisher: topic: test.operationalEnvironmentEvent - + spring: jersey: @@ -97,9 +97,9 @@ spring: jdbcUrl: jdbc:mariadb://localhost:3307/catalogdb username: root password: password - driver-class-name: org.mariadb.jdbc.Driver + driver-class-name: org.mariadb.jdbc.Driver initialization-mode: always - jpa: + jpa: generate-ddl: false show-sql: false hibernate: @@ -114,15 +114,17 @@ spring: username: test password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu' role: InfraPortal-Client + sleuth: + enabled: false request: datasource: jdbcUrl: jdbc:mariadb://localhost:3307/requestdb username: root password: password driver-class-name: org.mariadb.jdbc.Driver - + mariaDB4j: - dataDir: + dataDir: port: 3307 databaseName: catalogdb databaseName2: requestdb @@ -144,4 +146,3 @@ org: subnetCapability: config: file: src/test/resources/Onap3gppServiceInstancesTest/subnetCapability.json - -- 2.16.6