Skip to content

Commit 9a42776

Browse files
mp911demp911de
committed
Import Spring Data R2DBC module into Spring Data Relational.
Closes #1179
1 parent 824885e commit 9a42776

26 files changed

+184
-1301
lines changed

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ target/
22
.idea/
33
.settings/
44
*.iml
5+
.flattened-pom.xml
56
.project
67
.classpath
78
.springBeans
89
.sonar4clipse
910
*.sonar4clipseExternals
1011
*.graphml
12+
*.json
1113

1214
#prevent license accepting file to get accidentially commited to git
1315
container-license-acceptance.txt

Diff for: ‎Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ pipeline {
7070
script {
7171
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7272
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
73-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
73+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-relational-non-root ' +
7474
'-Dartifactory.server=https://repo.spring.io ' +
7575
"-Dartifactory.username=${ARTIFACTORY_USR} " +
7676
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
7777
"-Dartifactory.staging-repository=libs-snapshot-local " +
78-
"-Dartifactory.build-name=spring-data-jdbc " +
78+
"-Dartifactory.build-name=spring-data-relational " +
7979
"-Dartifactory.build-number=${BUILD_NUMBER} " +
8080
'-Dmaven.test.skip=true clean deploy -U -B'
8181
}

Diff for: ‎pom.xml

+12-139
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<modules>
5050
<module>spring-data-relational</module>
5151
<module>spring-data-jdbc</module>
52+
<module>spring-data-r2dbc</module>
5253
<module>spring-data-jdbc-distribution</module>
5354
</modules>
5455

@@ -64,6 +65,17 @@
6465
</roles>
6566
<timezone>+1</timezone>
6667
</developer>
68+
<developer>
69+
<id>mpaluch</id>
70+
<name>Mark Paluch</name>
71+
<email>mpaluch(at)pivotal.io</email>
72+
<organization>Pivotal Software, Inc.</organization>
73+
<organizationUrl>https://pivotal.io</organizationUrl>
74+
<roles>
75+
<role>Project Lead</role>
76+
</roles>
77+
<timezone>+1</timezone>
78+
</developer>
6779
<developer>
6880
<id>gregturn</id>
6981
<name>Greg L. Turnquist</name>
@@ -98,145 +110,6 @@
98110

99111
</profile>
100112

101-
<profile>
102-
<id>all-dbs</id>
103-
<build>
104-
<plugins>
105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-surefire-plugin</artifactId>
108-
<executions>
109-
<execution>
110-
<id>h2-test</id>
111-
<phase>test</phase>
112-
<goals>
113-
<goal>test</goal>
114-
</goals>
115-
<configuration>
116-
<includes>
117-
<include>**/*IntegrationTests.java</include>
118-
</includes>
119-
<excludes>
120-
<exclude>**/*HsqlIntegrationTests.java</exclude>
121-
</excludes>
122-
<systemPropertyVariables>
123-
<spring.profiles.active>h2</spring.profiles.active>
124-
</systemPropertyVariables>
125-
</configuration>
126-
</execution>
127-
<execution>
128-
<id>mysql-test</id>
129-
<phase>test</phase>
130-
<goals>
131-
<goal>test</goal>
132-
</goals>
133-
<configuration>
134-
<includes>
135-
<include>**/*IntegrationTests.java</include>
136-
</includes>
137-
<excludes>
138-
<exclude>**/*HsqlIntegrationTests.java</exclude>
139-
</excludes>
140-
<systemPropertyVariables>
141-
<spring.profiles.active>mysql</spring.profiles.active>
142-
</systemPropertyVariables>
143-
</configuration>
144-
</execution>
145-
<execution>
146-
<id>postgres-test</id>
147-
<phase>test</phase>
148-
<goals>
149-
<goal>test</goal>
150-
</goals>
151-
<configuration>
152-
<includes>
153-
<include>**/*IntegrationTests.java</include>
154-
</includes>
155-
<excludes>
156-
<exclude>**/*HsqlIntegrationTests.java</exclude>
157-
</excludes>
158-
<systemPropertyVariables>
159-
<spring.profiles.active>postgres</spring.profiles.active>
160-
</systemPropertyVariables>
161-
</configuration>
162-
</execution>
163-
<execution>
164-
<id>mariadb-test</id>
165-
<phase>test</phase>
166-
<goals>
167-
<goal>test</goal>
168-
</goals>
169-
<configuration>
170-
<includes>
171-
<include>**/*IntegrationTests.java</include>
172-
</includes>
173-
<excludes>
174-
<exclude>**/*HsqlIntegrationTests.java</exclude>
175-
</excludes>
176-
<systemPropertyVariables>
177-
<spring.profiles.active>mariadb</spring.profiles.active>
178-
</systemPropertyVariables>
179-
</configuration>
180-
</execution>
181-
<execution>
182-
<id>db2-test</id>
183-
<phase>test</phase>
184-
<goals>
185-
<goal>test</goal>
186-
</goals>
187-
<configuration>
188-
<includes>
189-
<include>**/*IntegrationTests.java</include>
190-
</includes>
191-
<excludes>
192-
<exclude>**/*HsqlIntegrationTests.java</exclude>
193-
</excludes>
194-
<systemPropertyVariables>
195-
<spring.profiles.active>db2</spring.profiles.active>
196-
</systemPropertyVariables>
197-
</configuration>
198-
</execution>
199-
<execution>
200-
<id>oracle-test</id>
201-
<phase>test</phase>
202-
<goals>
203-
<goal>test</goal>
204-
</goals>
205-
<configuration>
206-
<includes>
207-
<include>**/*IntegrationTests.java</include>
208-
</includes>
209-
<excludes>
210-
<exclude>**/*HsqlIntegrationTests.java</exclude>
211-
</excludes>
212-
<systemPropertyVariables>
213-
<spring.profiles.active>oracle</spring.profiles.active>
214-
</systemPropertyVariables>
215-
</configuration>
216-
</execution>
217-
<execution>
218-
<id>mssql-test</id>
219-
<phase>test</phase>
220-
<goals>
221-
<goal>test</goal>
222-
</goals>
223-
<configuration>
224-
<includes>
225-
<include>**/*IntegrationTests.java</include>
226-
</includes>
227-
<excludes>
228-
<exclude>**/*HsqlIntegrationTests.java</exclude>
229-
</excludes>
230-
<systemPropertyVariables>
231-
<spring.profiles.active>mssql</spring.profiles.active>
232-
</systemPropertyVariables>
233-
</configuration>
234-
</execution>
235-
</executions>
236-
</plugin>
237-
</plugins>
238-
</build>
239-
</profile>
240113
<profile>
241114
<id>ignore-missing-license</id>
242115
<build>

Diff for: ‎spring-data-jdbc/pom.xml

+143
Original file line numberDiff line numberDiff line change
@@ -265,4 +265,147 @@
265265

266266
</dependencies>
267267

268+
269+
<profiles>
270+
<profile>
271+
<id>all-dbs</id>
272+
<build>
273+
<plugins>
274+
<plugin>
275+
<groupId>org.apache.maven.plugins</groupId>
276+
<artifactId>maven-surefire-plugin</artifactId>
277+
<executions>
278+
<execution>
279+
<id>h2-test</id>
280+
<phase>test</phase>
281+
<goals>
282+
<goal>test</goal>
283+
</goals>
284+
<configuration>
285+
<includes>
286+
<include>**/*IntegrationTests.java</include>
287+
</includes>
288+
<excludes>
289+
<exclude>**/*HsqlIntegrationTests.java</exclude>
290+
</excludes>
291+
<systemPropertyVariables>
292+
<spring.profiles.active>h2</spring.profiles.active>
293+
</systemPropertyVariables>
294+
</configuration>
295+
</execution>
296+
<execution>
297+
<id>mysql-test</id>
298+
<phase>test</phase>
299+
<goals>
300+
<goal>test</goal>
301+
</goals>
302+
<configuration>
303+
<includes>
304+
<include>**/*IntegrationTests.java</include>
305+
</includes>
306+
<excludes>
307+
<exclude>**/*HsqlIntegrationTests.java</exclude>
308+
</excludes>
309+
<systemPropertyVariables>
310+
<spring.profiles.active>mysql</spring.profiles.active>
311+
</systemPropertyVariables>
312+
</configuration>
313+
</execution>
314+
<execution>
315+
<id>postgres-test</id>
316+
<phase>test</phase>
317+
<goals>
318+
<goal>test</goal>
319+
</goals>
320+
<configuration>
321+
<includes>
322+
<include>**/*IntegrationTests.java</include>
323+
</includes>
324+
<excludes>
325+
<exclude>**/*HsqlIntegrationTests.java</exclude>
326+
</excludes>
327+
<systemPropertyVariables>
328+
<spring.profiles.active>postgres</spring.profiles.active>
329+
</systemPropertyVariables>
330+
</configuration>
331+
</execution>
332+
<execution>
333+
<id>mariadb-test</id>
334+
<phase>test</phase>
335+
<goals>
336+
<goal>test</goal>
337+
</goals>
338+
<configuration>
339+
<includes>
340+
<include>**/*IntegrationTests.java</include>
341+
</includes>
342+
<excludes>
343+
<exclude>**/*HsqlIntegrationTests.java</exclude>
344+
</excludes>
345+
<systemPropertyVariables>
346+
<spring.profiles.active>mariadb</spring.profiles.active>
347+
</systemPropertyVariables>
348+
</configuration>
349+
</execution>
350+
<execution>
351+
<id>db2-test</id>
352+
<phase>test</phase>
353+
<goals>
354+
<goal>test</goal>
355+
</goals>
356+
<configuration>
357+
<includes>
358+
<include>**/*IntegrationTests.java</include>
359+
</includes>
360+
<excludes>
361+
<exclude>**/*HsqlIntegrationTests.java</exclude>
362+
</excludes>
363+
<systemPropertyVariables>
364+
<spring.profiles.active>db2</spring.profiles.active>
365+
</systemPropertyVariables>
366+
</configuration>
367+
</execution>
368+
<execution>
369+
<id>oracle-test</id>
370+
<phase>test</phase>
371+
<goals>
372+
<goal>test</goal>
373+
</goals>
374+
<configuration>
375+
<includes>
376+
<include>**/*IntegrationTests.java</include>
377+
</includes>
378+
<excludes>
379+
<exclude>**/*HsqlIntegrationTests.java</exclude>
380+
</excludes>
381+
<systemPropertyVariables>
382+
<spring.profiles.active>oracle</spring.profiles.active>
383+
</systemPropertyVariables>
384+
</configuration>
385+
</execution>
386+
<execution>
387+
<id>mssql-test</id>
388+
<phase>test</phase>
389+
<goals>
390+
<goal>test</goal>
391+
</goals>
392+
<configuration>
393+
<includes>
394+
<include>**/*IntegrationTests.java</include>
395+
</includes>
396+
<excludes>
397+
<exclude>**/*HsqlIntegrationTests.java</exclude>
398+
</excludes>
399+
<systemPropertyVariables>
400+
<spring.profiles.active>mssql</spring.profiles.active>
401+
</systemPropertyVariables>
402+
</configuration>
403+
</execution>
404+
</executions>
405+
</plugin>
406+
</plugins>
407+
</build>
408+
</profile>
409+
</profiles>
410+
268411
</project>

Diff for: ‎spring-data-r2dbc/.github/PULL_REQUEST_TEMPLATE.md

-11
This file was deleted.

0 commit comments

Comments
 (0)