Skip to content

Commit 6a60c53

Browse files
mp911deschauder
mp911de
authored and
schauder
committed
DATAJDBC-272 - Split Spring Data JDBC project into modules.
1 parent 44fbba4 commit 6a60c53

File tree

199 files changed

+989
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+989
-210
lines changed

‎pom.xml‎

Lines changed: 9 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>org.springframework.data</groupId>
8-
<artifactId>spring-data-jdbc</artifactId>
8+
<artifactId>spring-data-relational-parent</artifactId>
99
<version>1.1.0.BUILD-SNAPSHOT</version>
10+
<packaging>pom</packaging>
1011

11-
<name>Spring Data JDBC</name>
12-
<description>Spring Data module for JDBC repositories.</description>
12+
<name>Spring Data Relational</name>
13+
<description>Spring Data module for Relational repositories.</description>
1314
<url>http://projects.spring.io/spring-data-jdbc</url>
1415

1516
<parent>
@@ -40,6 +41,11 @@
4041

4142
<inceptionYear>2017</inceptionYear>
4243

44+
<modules>
45+
<module>spring-data-relational</module>
46+
<module>spring-data-jdbc</module>
47+
</modules>
48+
4349
<developers>
4450
<developer>
4551
<id>schauder</id>
@@ -167,124 +173,6 @@
167173
</profile>
168174
</profiles>
169175

170-
<dependencies>
171-
172-
<dependency>
173-
<groupId>${project.groupId}</groupId>
174-
<artifactId>spring-data-commons</artifactId>
175-
<version>${springdata.commons}</version>
176-
</dependency>
177-
178-
<dependency>
179-
<groupId>org.springframework</groupId>
180-
<artifactId>spring-tx</artifactId>
181-
</dependency>
182-
183-
<dependency>
184-
<groupId>org.springframework</groupId>
185-
<artifactId>spring-context</artifactId>
186-
</dependency>
187-
188-
<dependency>
189-
<groupId>org.springframework</groupId>
190-
<artifactId>spring-beans</artifactId>
191-
</dependency>
192-
193-
<dependency>
194-
<groupId>org.springframework</groupId>
195-
<artifactId>spring-jdbc</artifactId>
196-
</dependency>
197-
198-
<dependency>
199-
<groupId>org.springframework</groupId>
200-
<artifactId>spring-core</artifactId>
201-
</dependency>
202-
203-
<dependency>
204-
<groupId>org.mybatis</groupId>
205-
<artifactId>mybatis-spring</artifactId>
206-
<version>${mybatis-spring.version}</version>
207-
<optional>true</optional>
208-
</dependency>
209-
210-
<dependency>
211-
<groupId>org.mybatis</groupId>
212-
<artifactId>mybatis</artifactId>
213-
<version>${mybatis.version}</version>
214-
<optional>true</optional>
215-
</dependency>
216-
217-
<dependency>
218-
<groupId>org.hsqldb</groupId>
219-
<artifactId>hsqldb</artifactId>
220-
<version>${hsqldb.version}</version>
221-
<scope>test</scope>
222-
</dependency>
223-
224-
<dependency>
225-
<groupId>org.assertj</groupId>
226-
<artifactId>assertj-core</artifactId>
227-
<version>${assertj-core.version}</version>
228-
<scope>test</scope>
229-
</dependency>
230-
231-
<dependency>
232-
<groupId>mysql</groupId>
233-
<artifactId>mysql-connector-java</artifactId>
234-
<version>${mysql-connector-java.version}</version>
235-
<scope>test</scope>
236-
</dependency>
237-
238-
<dependency>
239-
<groupId>org.postgresql</groupId>
240-
<artifactId>postgresql</artifactId>
241-
<version>${postgresql.version}</version>
242-
<scope>test</scope>
243-
</dependency>
244-
245-
<dependency>
246-
<groupId>org.mariadb.jdbc</groupId>
247-
<artifactId>mariadb-java-client</artifactId>
248-
<version>${mariadb-java-client.version}</version>
249-
<scope>test</scope>
250-
</dependency>
251-
252-
<dependency>
253-
<groupId>de.schauderhaft.degraph</groupId>
254-
<artifactId>degraph-check</artifactId>
255-
<version>${degraph-check.version}</version>
256-
<scope>test</scope>
257-
</dependency>
258-
259-
<dependency>
260-
<groupId>org.testcontainers</groupId>
261-
<artifactId>mysql</artifactId>
262-
<version>${testcontainers.version}</version>
263-
<scope>test</scope>
264-
<exclusions>
265-
<exclusion>
266-
<groupId>org.slf4j</groupId>
267-
<artifactId>jcl-over-slf4j</artifactId>
268-
</exclusion>
269-
</exclusions>
270-
</dependency>
271-
272-
<dependency>
273-
<groupId>org.testcontainers</groupId>
274-
<artifactId>postgresql</artifactId>
275-
<version>${testcontainers.version}</version>
276-
<scope>test</scope>
277-
</dependency>
278-
279-
<dependency>
280-
<groupId>org.testcontainers</groupId>
281-
<artifactId>mariadb</artifactId>
282-
<version>${testcontainers.version}</version>
283-
<scope>test</scope>
284-
</dependency>
285-
286-
</dependencies>
287-
288176
<build>
289177
<pluginManagement>
290178
<plugins>

‎spring-data-jdbc/pom.xml‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
<?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"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<artifactId>spring-data-jdbc</artifactId>
8+
<version>1.1.0.BUILD-SNAPSHOT</version>
9+
10+
<name>Spring Data JDBC</name>
11+
<description>Spring Data module for JDBC repositories.</description>
12+
<url>http://projects.spring.io/spring-data-jdbc</url>
13+
14+
<parent>
15+
<groupId>org.springframework.data</groupId>
16+
<artifactId>spring-data-relational-parent</artifactId>
17+
<version>1.1.0.BUILD-SNAPSHOT</version>
18+
</parent>
19+
20+
<properties>
21+
22+
<dist.key>DATAJDBC</dist.key>
23+
24+
<springdata.commons>2.2.0.BUILD-SNAPSHOT</springdata.commons>
25+
<java-module-name>spring.data.jdbc</java-module-name>
26+
<hsqldb.version>2.2.8</hsqldb.version>
27+
<mybatis.version>3.4.6</mybatis.version>
28+
<mybatis-spring.version>1.3.2</mybatis-spring.version>
29+
<mysql-connector-java.version>5.1.41</mysql-connector-java.version>
30+
<postgresql.version>42.0.0</postgresql.version>
31+
<mariadb-java-client.version>2.2.3</mariadb-java-client.version>
32+
</properties>
33+
34+
<inceptionYear>2017</inceptionYear>
35+
36+
<developers>
37+
<developer>
38+
<id>schauder</id>
39+
<name>Jens Schauder</name>
40+
<email>jschauder(at)pivotal.io</email>
41+
<organization>Pivotal Software, Inc.</organization>
42+
<organizationUrl>https://pivotal.io</organizationUrl>
43+
<roles>
44+
<role>Project Lead</role>
45+
</roles>
46+
<timezone>+1</timezone>
47+
</developer>
48+
<developer>
49+
<id>gregturn</id>
50+
<name>Greg L. Turnquist</name>
51+
<email>gturnquist(at)pivotal.io</email>
52+
<organization>Pivotal Software, Inc.</organization>
53+
<organizationUrl>https://pivotal.io</organizationUrl>
54+
<roles>
55+
<role>Project Contributor</role>
56+
</roles>
57+
<timezone>-6</timezone>
58+
</developer>
59+
<developer>
60+
<id>ogierke</id>
61+
<name>Oliver Gierke</name>
62+
<email>ogierke(at)pivotal.io</email>
63+
<organization>Pivotal Software, Inc.</organization>
64+
<organizationUrl>https://pivotal.io</organizationUrl>
65+
<roles>
66+
<role>Project Contributor</role>
67+
</roles>
68+
<timezone>+1</timezone>
69+
</developer>
70+
<developer>
71+
<id>mpaluch</id>
72+
<name>Mark Paluch</name>
73+
<email>mpaluch(at)pivotal.io</email>
74+
<organization>Pivotal Software, Inc.</organization>
75+
<organizationUrl>https://pivotal.io</organizationUrl>
76+
<roles>
77+
<role>Project Contributor</role>
78+
</roles>
79+
<timezone>+1</timezone>
80+
</developer>
81+
</developers>
82+
83+
<dependencies>
84+
85+
<dependency>
86+
<groupId>${project.groupId}</groupId>
87+
<artifactId>spring-data-relational</artifactId>
88+
<version>${project.version}</version>
89+
</dependency>
90+
91+
<dependency>
92+
<groupId>${project.groupId}</groupId>
93+
<artifactId>spring-data-commons</artifactId>
94+
<version>${springdata.commons}</version>
95+
</dependency>
96+
97+
<dependency>
98+
<groupId>org.springframework</groupId>
99+
<artifactId>spring-tx</artifactId>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>org.springframework</groupId>
104+
<artifactId>spring-context</artifactId>
105+
</dependency>
106+
107+
<dependency>
108+
<groupId>org.springframework</groupId>
109+
<artifactId>spring-beans</artifactId>
110+
</dependency>
111+
112+
<dependency>
113+
<groupId>org.springframework</groupId>
114+
<artifactId>spring-jdbc</artifactId>
115+
</dependency>
116+
117+
<dependency>
118+
<groupId>org.springframework</groupId>
119+
<artifactId>spring-core</artifactId>
120+
</dependency>
121+
122+
<dependency>
123+
<groupId>org.mybatis</groupId>
124+
<artifactId>mybatis-spring</artifactId>
125+
<version>${mybatis-spring.version}</version>
126+
<optional>true</optional>
127+
</dependency>
128+
129+
<dependency>
130+
<groupId>org.mybatis</groupId>
131+
<artifactId>mybatis</artifactId>
132+
<version>${mybatis.version}</version>
133+
<optional>true</optional>
134+
</dependency>
135+
136+
<dependency>
137+
<groupId>org.hsqldb</groupId>
138+
<artifactId>hsqldb</artifactId>
139+
<version>${hsqldb.version}</version>
140+
<scope>test</scope>
141+
</dependency>
142+
143+
<dependency>
144+
<groupId>org.assertj</groupId>
145+
<artifactId>assertj-core</artifactId>
146+
<version>${assertj-core.version}</version>
147+
<scope>test</scope>
148+
</dependency>
149+
150+
<dependency>
151+
<groupId>mysql</groupId>
152+
<artifactId>mysql-connector-java</artifactId>
153+
<version>${mysql-connector-java.version}</version>
154+
<scope>test</scope>
155+
</dependency>
156+
157+
<dependency>
158+
<groupId>org.postgresql</groupId>
159+
<artifactId>postgresql</artifactId>
160+
<version>${postgresql.version}</version>
161+
<scope>test</scope>
162+
</dependency>
163+
164+
<dependency>
165+
<groupId>org.mariadb.jdbc</groupId>
166+
<artifactId>mariadb-java-client</artifactId>
167+
<version>${mariadb-java-client.version}</version>
168+
<scope>test</scope>
169+
</dependency>
170+
171+
<dependency>
172+
<groupId>de.schauderhaft.degraph</groupId>
173+
<artifactId>degraph-check</artifactId>
174+
<version>${degraph-check.version}</version>
175+
<scope>test</scope>
176+
</dependency>
177+
178+
<dependency>
179+
<groupId>org.testcontainers</groupId>
180+
<artifactId>mysql</artifactId>
181+
<version>${testcontainers.version}</version>
182+
<scope>test</scope>
183+
<exclusions>
184+
<exclusion>
185+
<groupId>org.slf4j</groupId>
186+
<artifactId>jcl-over-slf4j</artifactId>
187+
</exclusion>
188+
</exclusions>
189+
</dependency>
190+
191+
<dependency>
192+
<groupId>org.testcontainers</groupId>
193+
<artifactId>postgresql</artifactId>
194+
<version>${testcontainers.version}</version>
195+
<scope>test</scope>
196+
</dependency>
197+
198+
<dependency>
199+
<groupId>org.testcontainers</groupId>
200+
<artifactId>mariadb</artifactId>
201+
<version>${testcontainers.version}</version>
202+
<scope>test</scope>
203+
</dependency>
204+
205+
</dependencies>
206+
207+
</project>

src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/FunctionCollector.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/FunctionCollector.java

File renamed without changes.

src/main/java/org/springframework/data/jdbc/core/IterableOfEntryToMapConverter.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/IterableOfEntryToMapConverter.java

File renamed without changes.

0 commit comments

Comments
 (0)