Skip to content

Commit b53437b

Browse files
mp911demp911de
committed
#60 - Use R2DBC's BOM for dependency management.
1 parent 4423e03 commit b53437b

File tree

1 file changed

+119
-111
lines changed

1 file changed

+119
-111
lines changed

‎pom.xml

+119-111
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45

56
<modelVersion>4.0.0</modelVersion>
@@ -31,11 +32,7 @@
3132
<hsqldb.version>2.4.1</hsqldb.version>
3233
<postgresql.version>42.2.5</postgresql.version>
3334
<mssql-jdbc.version>7.1.2.jre8-preview</mssql-jdbc.version>
34-
<r2dbc.version>1.0.0.M7</r2dbc.version>
35-
<r2dbc-spi.version>${r2dbc.version}</r2dbc-spi.version>
36-
<r2dbc-postgresql.version>${r2dbc.version}</r2dbc-postgresql.version>
37-
<r2dbc-h2.version>${r2dbc.version}</r2dbc-h2.version>
38-
<r2dbc-mssql.version>${r2dbc.version}</r2dbc-mssql.version>
35+
<r2dbc-releasetrain.version>Arabba-M7</r2dbc-releasetrain.version>
3936
<reactive-streams.version>1.0.1</reactive-streams.version>
4037
<testcontainers.version>1.10.1</testcontainers.version>
4138

@@ -68,107 +65,17 @@
6865
</developer>
6966
</developers>
7067

71-
<profiles>
72-
<profile>
73-
<id>release</id>
74-
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.jfrog.buildinfo</groupId>
78-
<artifactId>artifactory-maven-plugin</artifactId>
79-
<inherited>false</inherited>
80-
</plugin>
81-
</plugins>
82-
</build>
83-
</profile>
84-
85-
<profile>
86-
<id>no-jacoco</id>
87-
<build>
88-
<plugins>
89-
<plugin>
90-
<groupId>org.jacoco</groupId>
91-
<artifactId>jacoco-maven-plugin</artifactId>
92-
<executions>
93-
<execution>
94-
<id>jacoco-initialize</id>
95-
<phase>none</phase>
96-
</execution>
97-
</executions>
98-
</plugin>
99-
</plugins>
100-
</build>
101-
102-
</profile>
103-
104-
<profile>
105-
<id>all-dbs</id>
106-
<build>
107-
<plugins>
108-
<plugin>
109-
<groupId>org.apache.maven.plugins</groupId>
110-
<artifactId>maven-surefire-plugin</artifactId>
111-
<executions>
112-
<execution>
113-
<id>mysql-test</id>
114-
<phase>test</phase>
115-
<goals>
116-
<goal>test</goal>
117-
</goals>
118-
<configuration>
119-
<includes>
120-
<include>**/*IntegrationTests.java</include>
121-
</includes>
122-
<excludes>
123-
<exclude>**/*HsqlIntegrationTests.java</exclude>
124-
</excludes>
125-
<systemPropertyVariables>
126-
<spring.profiles.active>mysql</spring.profiles.active>
127-
</systemPropertyVariables>
128-
</configuration>
129-
</execution>
130-
<execution>
131-
<id>postgres-test</id>
132-
<phase>test</phase>
133-
<goals>
134-
<goal>test</goal>
135-
</goals>
136-
<configuration>
137-
<includes>
138-
<include>**/*IntegrationTests.java</include>
139-
</includes>
140-
<excludes>
141-
<exclude>**/*HsqlIntegrationTests.java</exclude>
142-
</excludes>
143-
<systemPropertyVariables>
144-
<spring.profiles.active>postgres</spring.profiles.active>
145-
</systemPropertyVariables>
146-
</configuration>
147-
</execution>
148-
<execution>
149-
<id>mariadb-test</id>
150-
<phase>test</phase>
151-
<goals>
152-
<goal>test</goal>
153-
</goals>
154-
<configuration>
155-
<includes>
156-
<include>**/*IntegrationTests.java</include>
157-
</includes>
158-
<excludes>
159-
<exclude>**/*HsqlIntegrationTests.java</exclude>
160-
</excludes>
161-
<systemPropertyVariables>
162-
<spring.profiles.active>mariadb</spring.profiles.active>
163-
</systemPropertyVariables>
164-
</configuration>
165-
</execution>
166-
</executions>
167-
</plugin>
168-
</plugins>
169-
</build>
170-
</profile>
171-
</profiles>
68+
<dependencyManagement>
69+
<dependencies>
70+
<dependency>
71+
<groupId>io.r2dbc</groupId>
72+
<artifactId>r2dbc-bom</artifactId>
73+
<version>${r2dbc-releasetrain.version}</version>
74+
<type>pom</type>
75+
<scope>import</scope>
76+
</dependency>
77+
</dependencies>
78+
</dependencyManagement>
17279

17380
<dependencies>
17481

@@ -212,7 +119,6 @@
212119
<dependency>
213120
<groupId>io.r2dbc</groupId>
214121
<artifactId>r2dbc-spi</artifactId>
215-
<version>${r2dbc-spi.version}</version>
216122
</dependency>
217123

218124
<dependency>
@@ -250,21 +156,18 @@
250156
<dependency>
251157
<groupId>io.r2dbc</groupId>
252158
<artifactId>r2dbc-postgresql</artifactId>
253-
<version>${r2dbc-postgresql.version}</version>
254159
<scope>test</scope>
255160
</dependency>
256161

257162
<dependency>
258163
<groupId>io.r2dbc</groupId>
259164
<artifactId>r2dbc-h2</artifactId>
260-
<version>${r2dbc-h2.version}</version>
261165
<scope>test</scope>
262166
</dependency>
263167

264168
<dependency>
265169
<groupId>io.r2dbc</groupId>
266170
<artifactId>r2dbc-mssql</artifactId>
267-
<version>${r2dbc-mssql.version}</version>
268171
<scope>test</scope>
269172
</dependency>
270173

@@ -369,6 +272,111 @@
369272
</plugins>
370273
</build>
371274

275+
<profiles>
276+
<profile>
277+
<id>release</id>
278+
<build>
279+
<plugins>
280+
<plugin>
281+
<groupId>org.jfrog.buildinfo</groupId>
282+
<artifactId>artifactory-maven-plugin</artifactId>
283+
<inherited>false</inherited>
284+
</plugin>
285+
</plugins>
286+
</build>
287+
</profile>
288+
289+
<profile>
290+
<id>no-jacoco</id>
291+
<build>
292+
<plugins>
293+
<plugin>
294+
<groupId>org.jacoco</groupId>
295+
<artifactId>jacoco-maven-plugin</artifactId>
296+
<executions>
297+
<execution>
298+
<id>jacoco-initialize</id>
299+
<phase>none</phase>
300+
</execution>
301+
</executions>
302+
</plugin>
303+
</plugins>
304+
</build>
305+
306+
</profile>
307+
308+
<profile>
309+
<id>all-dbs</id>
310+
<build>
311+
<plugins>
312+
<plugin>
313+
<groupId>org.apache.maven.plugins</groupId>
314+
<artifactId>maven-surefire-plugin</artifactId>
315+
<executions>
316+
<execution>
317+
<id>mysql-test</id>
318+
<phase>test</phase>
319+
<goals>
320+
<goal>test</goal>
321+
</goals>
322+
<configuration>
323+
<includes>
324+
<include>**/*IntegrationTests.java</include>
325+
</includes>
326+
<excludes>
327+
<exclude>**/*HsqlIntegrationTests.java</exclude>
328+
</excludes>
329+
<systemPropertyVariables>
330+
<spring.profiles.active>mysql
331+
</spring.profiles.active>
332+
</systemPropertyVariables>
333+
</configuration>
334+
</execution>
335+
<execution>
336+
<id>postgres-test</id>
337+
<phase>test</phase>
338+
<goals>
339+
<goal>test</goal>
340+
</goals>
341+
<configuration>
342+
<includes>
343+
<include>**/*IntegrationTests.java</include>
344+
</includes>
345+
<excludes>
346+
<exclude>**/*HsqlIntegrationTests.java</exclude>
347+
</excludes>
348+
<systemPropertyVariables>
349+
<spring.profiles.active>postgres
350+
</spring.profiles.active>
351+
</systemPropertyVariables>
352+
</configuration>
353+
</execution>
354+
<execution>
355+
<id>mariadb-test</id>
356+
<phase>test</phase>
357+
<goals>
358+
<goal>test</goal>
359+
</goals>
360+
<configuration>
361+
<includes>
362+
<include>**/*IntegrationTests.java</include>
363+
</includes>
364+
<excludes>
365+
<exclude>**/*HsqlIntegrationTests.java</exclude>
366+
</excludes>
367+
<systemPropertyVariables>
368+
<spring.profiles.active>mariadb
369+
</spring.profiles.active>
370+
</systemPropertyVariables>
371+
</configuration>
372+
</execution>
373+
</executions>
374+
</plugin>
375+
</plugins>
376+
</build>
377+
</profile>
378+
</profiles>
379+
372380
<repositories>
373381
<repository>
374382
<id>spring-libs-snapshot</id>

0 commit comments

Comments
 (0)