diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 617a629a7ce..8721f3d0bf0 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1380,7 +1380,7 @@ bom {
 			]
 		}
 	}
-	library("Postgresql", "42.2.12") {
+	library("Postgresql", "42.2.13") {
 		group("org.postgresql") {
 			modules = [
 				"postgresql"
diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle
index c181fadcfd1..9865d7a78f8 100644
--- a/spring-boot-project/spring-boot-devtools/build.gradle
+++ b/spring-boot-project/spring-boot-devtools/build.gradle
@@ -60,7 +60,10 @@ dependencies {
 	testImplementation("org.hsqldb:hsqldb")
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-core")
-	testImplementation("org.postgresql:postgresql")
+	testImplementation("org.postgresql:postgresql") {
+		exclude group: "org.osgi"
+		exclude group: "com.github.waffle", module: "waffle-jna"
+	}
 	testImplementation("org.springframework:spring-test")
 	testImplementation("org.springframework:spring-webmvc")
 	testImplementation("org.springframework:spring-websocket")
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
index d5641f0cc89..533a4136c32 100644
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -97,7 +97,10 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mariadb.jdbc:mariadb-java-client")
 	testImplementation("org.mockito:mockito-core")
-	testImplementation("org.postgresql:postgresql")
+	testImplementation("org.postgresql:postgresql") {
+		exclude group: "org.osgi"
+		exclude group: "com.github.waffle", module: "waffle-jna"
+	}
 	testImplementation("org.springframework:spring-context-support")
 	testImplementation("org.springframework.data:spring-data-redis")
 	testImplementation("org.springframework.data:spring-data-r2dbc")
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle
index 77880bfc9a1..0b79b8c87d0 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle
@@ -11,7 +11,10 @@ dependencies {
 
 	runtimeOnly("io.r2dbc:r2dbc-postgresql")
 	runtimeOnly("org.flywaydb:flyway-core")
-	runtimeOnly("org.postgresql:postgresql")
+	runtimeOnly("org.postgresql:postgresql") {
+		exclude group: "org.osgi"
+		exclude group: "com.github.waffle", module: "waffle-jna"
+	}
 	runtimeOnly("org.springframework:spring-jdbc")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle
index e62c90ff74a..ed91ba28859 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle
@@ -11,7 +11,10 @@ dependencies {
 
 	runtimeOnly("io.r2dbc:r2dbc-postgresql")
 	runtimeOnly("org.liquibase:liquibase-core")
-	runtimeOnly("org.postgresql:postgresql")
+	runtimeOnly("org.postgresql:postgresql") {
+		exclude group: "org.osgi"
+		exclude group: "com.github.waffle", module: "waffle-jna"
+	}
 	runtimeOnly("org.springframework:spring-jdbc")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))