Skip to content

Commit dbbafb2

Browse files
committed
Polishing.
Reorder dependencies. See #756
1 parent b35c7cb commit dbbafb2

File tree

2 files changed

+47
-50
lines changed

2 files changed

+47
-50
lines changed

spring-data-jdbc/pom.xml

+47-43
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
<project.root>${basedir}/..</project.root>
2424
</properties>
2525

26-
<inceptionYear>2017</inceptionYear>
27-
2826
<dependencyManagement>
2927
<dependencies>
3028
<dependency>
@@ -90,6 +88,15 @@
9088
<optional>true</optional>
9189
</dependency>
9290

91+
<dependency>
92+
<groupId>org.liquibase</groupId>
93+
<artifactId>liquibase-core</artifactId>
94+
<version>${liquibase.version}</version>
95+
<optional>true</optional>
96+
</dependency>
97+
98+
<!-- JDBC Drivers -->
99+
93100
<dependency>
94101
<groupId>com.h2database</groupId>
95102
<artifactId>h2</artifactId>
@@ -104,26 +111,6 @@
104111
<scope>test</scope>
105112
</dependency>
106113

107-
<dependency>
108-
<groupId>org.awaitility</groupId>
109-
<artifactId>awaitility</artifactId>
110-
<version>${awaitility.version}</version>
111-
<scope>test</scope>
112-
</dependency>
113-
114-
<dependency>
115-
<groupId>org.assertj</groupId>
116-
<artifactId>assertj-core</artifactId>
117-
<version>${assertj}</version>
118-
<scope>test</scope>
119-
<exclusions>
120-
<exclusion>
121-
<groupId>net.bytebuddy</groupId>
122-
<artifactId>byte-buddy</artifactId>
123-
</exclusion>
124-
</exclusions>
125-
</dependency>
126-
127114
<dependency>
128115
<groupId>mysql</groupId>
129116
<artifactId>mysql-connector-java</artifactId>
@@ -166,67 +153,84 @@
166153
<scope>test</scope>
167154
</dependency>
168155

156+
<!-- Test dependencies -->
157+
169158
<dependency>
170-
<groupId>org.testcontainers</groupId>
171-
<artifactId>mysql</artifactId>
159+
<groupId>org.awaitility</groupId>
160+
<artifactId>awaitility</artifactId>
161+
<version>${awaitility.version}</version>
162+
<scope>test</scope>
163+
</dependency>
164+
165+
<dependency>
166+
<groupId>org.assertj</groupId>
167+
<artifactId>assertj-core</artifactId>
168+
<version>${assertj}</version>
172169
<scope>test</scope>
173170
<exclusions>
174171
<exclusion>
175-
<groupId>org.slf4j</groupId>
176-
<artifactId>jcl-over-slf4j</artifactId>
172+
<groupId>net.bytebuddy</groupId>
173+
<artifactId>byte-buddy</artifactId>
177174
</exclusion>
178175
</exclusions>
179176
</dependency>
180177

181178
<dependency>
182-
<groupId>org.testcontainers</groupId>
183-
<artifactId>postgresql</artifactId>
179+
<groupId>org.jmolecules.integrations</groupId>
180+
<artifactId>jmolecules-spring</artifactId>
181+
<version>${jmolecules-integration}</version>
184182
<scope>test</scope>
185183
</dependency>
186184

187185
<dependency>
188-
<groupId>org.testcontainers</groupId>
189-
<artifactId>mariadb</artifactId>
186+
<groupId>com.tngtech.archunit</groupId>
187+
<artifactId>archunit</artifactId>
188+
<version>${archunit.version}</version>
190189
<scope>test</scope>
191190
</dependency>
192191

192+
<!-- Testcontainers -->
193+
193194
<dependency>
194195
<groupId>org.testcontainers</groupId>
195-
<artifactId>mssqlserver</artifactId>
196+
<artifactId>mysql</artifactId>
196197
<scope>test</scope>
198+
<exclusions>
199+
<exclusion>
200+
<groupId>org.slf4j</groupId>
201+
<artifactId>jcl-over-slf4j</artifactId>
202+
</exclusion>
203+
</exclusions>
197204
</dependency>
198205

199206
<dependency>
200207
<groupId>org.testcontainers</groupId>
201-
<artifactId>db2</artifactId>
208+
<artifactId>postgresql</artifactId>
202209
<scope>test</scope>
203210
</dependency>
204211

205212
<dependency>
206213
<groupId>org.testcontainers</groupId>
207-
<artifactId>oracle-xe</artifactId>
214+
<artifactId>mariadb</artifactId>
208215
<scope>test</scope>
209216
</dependency>
210217

211218
<dependency>
212-
<groupId>org.jmolecules.integrations</groupId>
213-
<artifactId>jmolecules-spring</artifactId>
214-
<version>${jmolecules-integration}</version>
219+
<groupId>org.testcontainers</groupId>
220+
<artifactId>mssqlserver</artifactId>
215221
<scope>test</scope>
216222
</dependency>
217223

218224
<dependency>
219-
<groupId>com.tngtech.archunit</groupId>
220-
<artifactId>archunit</artifactId>
221-
<version>${archunit.version}</version>
225+
<groupId>org.testcontainers</groupId>
226+
<artifactId>db2</artifactId>
222227
<scope>test</scope>
223228
</dependency>
224229

225230
<dependency>
226-
<groupId>org.liquibase</groupId>
227-
<artifactId>liquibase-core</artifactId>
228-
<version>${liquibase.version}</version>
229-
<optional>true</optional>
231+
<groupId>org.testcontainers</groupId>
232+
<artifactId>oracle-xe</artifactId>
233+
<scope>test</scope>
230234
</dependency>
231235

232236
</dependencies>

spring-data-relational/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@
5050
<artifactId>spring-core</artifactId>
5151
</dependency>
5252

53-
<dependency>
54-
<groupId>org.liquibase</groupId>
55-
<artifactId>liquibase-core</artifactId>
56-
<version>${liquibase.version}</version>
57-
<optional>true</optional>
58-
</dependency>
59-
6053
<dependency>
6154
<groupId>com.google.code.findbugs</groupId>
6255
<artifactId>jsr305</artifactId>

0 commit comments

Comments
 (0)