Skip to content

Commit 6c2a4c9

Browse files
committed
More H2 for JDBC tests
* Upgrade to Spring Security 5.4.0
1 parent 71a273e commit 6c2a4c9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ext {
102102
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.0-SNAPSHOT'
103103
springKafkaVersion = '2.6.0'
104104
springRetryVersion = '1.3.0'
105-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0-RC1'
105+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0'
106106
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-SNAPSHOT'
107107
springWsVersion = '3.0.9.RELEASE'
108108
tomcatVersion = "9.0.37"

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests-context.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
1313
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
1414

15-
<jdbc:embedded-database id="dataSource" type="DERBY"/>
15+
<jdbc:embedded-database id="dataSource" type="H2"/>
1616

1717
<jdbc:initialize-database ignore-failures="DROPS">
18-
<jdbc:script location="org/springframework/integration/jdbc/schema-drop-derby.sql"/>
19-
<jdbc:script location="org/springframework/integration/jdbc/schema-derby.sql" />
18+
<jdbc:script location="org/springframework/integration/jdbc/schema-drop-h2.sql"/>
19+
<jdbc:script location="org/springframework/integration/jdbc/schema-h2.sql" />
2020
</jdbc:initialize-database>
2121

2222
<int-jdbc:message-store id="messageStore" data-source="dataSource"/>

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelOnePollerIntegrationTests-context.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
1212
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
1313

14-
<jdbc:embedded-database id="dataSource" type="DERBY" />
14+
<jdbc:embedded-database id="dataSource" type="H2" />
1515

1616
<jdbc:initialize-database ignore-failures="DROPS">
17-
<jdbc:script location="org/springframework/integration/jdbc/schema-drop-derby.sql"/>
18-
<jdbc:script location="org/springframework/integration/jdbc/schema-derby.sql" />
17+
<jdbc:script location="org/springframework/integration/jdbc/schema-drop-h2.sql"/>
18+
<jdbc:script location="org/springframework/integration/jdbc/schema-h2.sql" />
1919
</jdbc:initialize-database>
2020

2121
<int-jdbc:message-store id="messageStore"

0 commit comments

Comments
 (0)