Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-beans/spring-beans.gradle
#	spring-context/spring-context.gradle
#	spring-orm/spring-orm.gradle
#	spring-test/spring-test.gradle
#	spring-web/spring-web.gradle
#	spring-webflux/spring-webflux.gradle
This commit is contained in:
Juergen Hoeller
2023-08-02 01:04:31 +02:00
parent b9ae996dfc d250a5155a
commit 3b1af692cc
20 changed files with 178 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-jdbc/spring-jdbc.gradle
View File

@@ -8,11 +8,11 @@ dependencies {
api(project(":spring-tx"))
optional(project(":spring-context")) // for JndiDataSourceLookup
optional("jakarta.transaction:jakarta.transaction-api")
optional("org.hsqldb:hsqldb")
optional("com.h2database:h2")
optional("org.apache.derby:derby")
optional("org.apache.derby:derbyclient")
optional("org.apache.derby:derbytools")
optional("com.h2database:h2")
optional("org.hsqldb:hsqldb")
optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib")
testImplementation(testFixtures(project(":spring-beans")))