Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 7525254

Browse files
onobcjvalkeal
authored andcommitted
Add h2 dependency back in
1 parent 9190f70 commit 7525254

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

spring-cloud-dataflow-server-core/pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@
119119
</exclusion>
120120
</exclusions>
121121
</dependency>
122+
<dependency>
123+
<groupId>com.h2database</groupId>
124+
<artifactId>h2</artifactId>
125+
<optional>true</optional>
126+
<scope>provided</scope>
127+
</dependency>
122128
<dependency>
123129
<groupId>org.springframework.boot</groupId>
124130
<artifactId>spring-boot-starter-test</artifactId>
@@ -138,11 +144,6 @@
138144
<artifactId>jsonassert</artifactId>
139145
<scope>test</scope>
140146
</dependency>
141-
<dependency>
142-
<groupId>com.h2database</groupId>
143-
<artifactId>h2</artifactId>
144-
<optional>true</optional>
145-
</dependency>
146147
<dependency>
147148
<groupId>com.oracle.ojdbc</groupId>
148149
<artifactId>ojdbc8</artifactId>

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/config/H2ServerConfigurationTests.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.cloud.dataflow.server.config;
1818

19-
import java.net.BindException;
20-
2119
import org.h2.tools.Server;
2220
import org.junit.jupiter.api.Test;
2321

@@ -112,16 +110,6 @@ void serverDoesNotStartWhenUrlIsH2ButInvalidForm() {
112110
.hasMessage("Port value out of range: 99999"));
113111
}
114112

115-
@Test
116-
void serverDoesNotStartWhenPortIsReserved() {
117-
runner.withPropertyValues(
118-
"spring.datasource.url=jdbc:h2:tcp://localhost:1/mem:dataflow",
119-
"spring.dataflow.embedded.database.enabled=true")
120-
.run(context -> assertThat(context)
121-
.getFailure().getRootCause().isInstanceOf(BindException.class)
122-
.hasMessageStartingWith("Permission denied"));
123-
}
124-
125113
@Test
126114
void serverDoesNotStartWhenH2NotOnClasspath() {
127115
runner.withClassLoader(new FilteredClassLoader(Server.class)).

spring-cloud-dataflow-server/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<groupId>io.fabric8</groupId>
4444
<artifactId>kubernetes-client</artifactId>
4545
</dependency>
46+
<dependency>
47+
<groupId>com.h2database</groupId>
48+
<artifactId>h2</artifactId>
49+
</dependency>
4650
<dependency>
4751
<groupId>org.springframework.boot</groupId>
4852
<artifactId>spring-boot-starter-test</artifactId>
@@ -118,11 +122,6 @@
118122
<artifactId>mssqlserver</artifactId>
119123
<scope>test</scope>
120124
</dependency>
121-
<dependency>
122-
<groupId>com.h2database</groupId>
123-
<artifactId>h2</artifactId>
124-
<scope>test</scope>
125-
</dependency>
126125
</dependencies>
127126

128127
<build>

0 commit comments

Comments
 (0)