diff --git a/pom.xml b/pom.xml
index 7924c63..6d00ab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
4.0.0
org.eclipse.ecsp
sql-dao
- 1.2.2
+ 1.3-SNAPSHOT
SQL DAO Library
DAO framework for SQL databases
@@ -82,18 +82,19 @@
2.22.0
3.13.0
- 1.1.0
+ 1.2.SPRING-SNAPSHOT
17
${java.version}
${java.version}
5.0.1
4.3.0
0.6.0
- 3.2.5
+ 4.0.2
+ 3.5.10
1.18.28
42.7.3
4.2.19
- 6.1.14
+ 7.0.3
${project.build.directory}/coverage-reports/jacoco-ut.exec
1.1.0
3.1.1
@@ -122,6 +123,19 @@
+
+
+ org.sonatype.central
+ https://central.sonatype.com/repository/maven-snapshots/
+
+ false
+
+
+ true
+
+
+
+
dash-licenses-releases
@@ -219,7 +233,7 @@
org.springframework.boot
spring-boot-starter-aop
- ${spring.boot.version}
+ ${springboot.aop}
org.springframework.boot
diff --git a/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java b/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java
index 92c7a10..dfc099e 100644
--- a/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java
+++ b/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java
@@ -49,10 +49,13 @@
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.mockito.Mockito;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import io.prometheus.client.CollectorRegistry;
@@ -68,7 +71,7 @@
*/
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = {PostgresDbConfig.class, DefaultPostgresDbCredentialsProvider.class,
- SqlDaoApplication.class })
+ SqlDaoApplication.class, PostgresDbConfigRefreshTest.TestConfig.class })
@TestPropertySource("/application-dao-refresh-test.properties")
class PostgresDbConfigRefreshTest {
@@ -81,7 +84,7 @@ class PostgresDbConfigRefreshTest {
@Qualifier("targetDataSources")
private Map targetDataSources;
- @SpyBean
+ @Autowired
private PostgresDbConfig config;
/** The postgresql container. */
@@ -124,4 +127,17 @@ static void tearUpPostgresServer() {
CollectorRegistry.defaultRegistry.clear();
postgresqlContainer.stop();
}
+
+ /**
+ * Test configuration to create a spy of PostgresDbConfig.
+ */
+ @TestConfiguration
+ static class TestConfig {
+
+ @Bean
+ @Primary
+ public PostgresDbConfig postgresDbConfig(PostgresDbConfig realConfig) {
+ return Mockito.spy(realConfig);
+ }
+ }
}