Skip to content

Commit b872714

Browse files
mikereichemikereiche
authored
Revert to single-module. (#1583)
Closed #1582.
1 parent 8d99a39 commit b872714

File tree

471 files changed

+317
-1090
lines changed

Some content is hidden

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

471 files changed

+317
-1090
lines changed

‎pom.xml

Lines changed: 317 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>org.springframework.data</groupId>
7-
<artifactId>spring-data-couchbase-parent</artifactId>
7+
<artifactId>spring-data-couchbase</artifactId>
88
<version>5.0.0-SNAPSHOT</version>
9-
<packaging>pom</packaging>
109

11-
<name>Spring Data Couchbase Parent</name>
10+
<name>Spring Data Couchbase</name>
1211
<description>Spring Data integration for Couchbase</description>
1312
<url>https://github.com/spring-projects/spring-data-couchbase</url>
1413

@@ -18,24 +17,234 @@
1817
<version>3.0.0-SNAPSHOT</version>
1918
</parent>
2019

21-
<modules>
22-
<module>spring-data-couchbase</module>
23-
<module>spring-data-couchbase-distribution</module>
24-
</modules>
25-
2620
<properties>
2721
<couchbase>3.3.4</couchbase>
2822
<couchbase.osgi>3.3.4</couchbase.osgi>
2923
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
3024
<java-module-name>spring.data.couchbase</java-module-name>
25+
<hibernate.validator>7.0.1.Final</hibernate.validator>
26+
<apt>1.1.3</apt>
27+
<querydsl>5.0.0</querydsl>
28+
<mysema.querydsl>3.7.4</mysema.querydsl>
29+
<couchbase.encryption>3.1.0</couchbase.encryption>
30+
<jodatime>2.10.13</jodatime>
31+
<jackson-joda>2.13.4</jackson-joda>
32+
<jakarta.el>4.0.0</jakarta.el>
3133
</properties>
3234

35+
<dependencyManagement>
36+
<dependencies>
37+
<dependency>
38+
<groupId>org.testcontainers</groupId>
39+
<artifactId>testcontainers-bom</artifactId>
40+
<version>${testcontainers}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
44+
</dependencies>
45+
</dependencyManagement>
46+
3347
<dependencies>
48+
49+
<dependency>
50+
<groupId>com.querydsl</groupId>
51+
<artifactId>querydsl-apt</artifactId>
52+
<version>${querydsl}</version>
53+
<scope>provided</scope>
54+
</dependency>
55+
56+
<dependency>
57+
<groupId>org.springframework</groupId>
58+
<artifactId>spring-context-support</artifactId>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.springframework</groupId>
63+
<artifactId>spring-web</artifactId>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>org.springframework</groupId>
68+
<artifactId>spring-tx</artifactId>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>${project.groupId}</groupId>
73+
<artifactId>spring-data-commons</artifactId>
74+
<version>${springdata.commons}</version>
75+
</dependency>
76+
3477
<dependency>
3578
<groupId>com.couchbase.client</groupId>
3679
<artifactId>java-client</artifactId>
3780
<version>${couchbase}</version>
3881
</dependency>
82+
83+
<!-- CDI -->
84+
<dependency>
85+
<groupId>jakarta.enterprise</groupId>
86+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
87+
<version>${cdi}</version>
88+
<scope>provided</scope>
89+
<optional>true</optional>
90+
</dependency>
91+
92+
<dependency>
93+
<groupId>org.springframework</groupId>
94+
<artifactId>spring-test</artifactId>
95+
<version>${spring}</version>
96+
<scope>test</scope>
97+
</dependency>
98+
99+
<dependency>
100+
<groupId>org.hibernate.validator</groupId>
101+
<artifactId>hibernate-validator</artifactId>
102+
<version>7.0.1.Final</version>
103+
<scope>test</scope>
104+
</dependency>
105+
106+
<dependency>
107+
<groupId>org.apache.httpcomponents</groupId>
108+
<artifactId>httpclient</artifactId>
109+
<version>4.5.13</version>
110+
<scope>test</scope>
111+
</dependency>
112+
113+
<dependency>
114+
<groupId>io.projectreactor</groupId>
115+
<artifactId>reactor-test</artifactId>
116+
<scope>test</scope>
117+
</dependency>
118+
119+
<dependency>
120+
<groupId>com.fasterxml.jackson.datatype</groupId>
121+
<artifactId>jackson-datatype-joda</artifactId>
122+
<version>${jackson-joda}</version>
123+
<scope>test</scope>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>com.fasterxml.jackson.core</groupId>
128+
<artifactId>jackson-databind</artifactId>
129+
</dependency>
130+
131+
<dependency>
132+
<groupId>joda-time</groupId>
133+
<artifactId>joda-time</artifactId>
134+
<version>${jodatime}</version>
135+
<optional>true</optional>
136+
</dependency>
137+
138+
<dependency>
139+
<groupId>org.testcontainers</groupId>
140+
<artifactId>testcontainers</artifactId>
141+
<scope>test</scope>
142+
</dependency>
143+
144+
<!-- JSR 303 Validation -->
145+
<dependency>
146+
<groupId>jakarta.validation</groupId>
147+
<artifactId>jakarta.validation-api</artifactId>
148+
<version>${validation}</version>
149+
<optional>true</optional>
150+
</dependency>
151+
152+
<dependency>
153+
<groupId>jakarta.el</groupId>
154+
<artifactId>jakarta.el-api</artifactId>
155+
<version>${jakarta.el}</version>
156+
<scope>provided</scope>
157+
<optional>true</optional>
158+
</dependency>
159+
160+
<dependency>
161+
<groupId>org.glassfish</groupId>
162+
<artifactId>jakarta.el</artifactId>
163+
<version>${jakarta.el}</version>
164+
<scope>provided</scope>
165+
<optional>true</optional>
166+
</dependency>
167+
168+
<!-- CDI -->
169+
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
170+
<dependency>
171+
<groupId>org.apache.geronimo.specs</groupId>
172+
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
173+
<version>1.0.1</version>
174+
<scope>test</scope>
175+
</dependency>
176+
177+
<dependency>
178+
<groupId>javax.interceptor</groupId>
179+
<artifactId>javax.interceptor-api</artifactId>
180+
<version>1.2.1</version>
181+
<scope>test</scope>
182+
</dependency>
183+
184+
<dependency>
185+
<groupId>org.apache.openwebbeans</groupId>
186+
<artifactId>openwebbeans-se</artifactId>
187+
<version>${webbeans}</version>
188+
<scope>test</scope>
189+
</dependency>
190+
191+
<dependency>
192+
<groupId>com.couchbase.mock</groupId>
193+
<artifactId>CouchbaseMock</artifactId>
194+
<version>1.5.25</version>
195+
<scope>test</scope>
196+
</dependency>
197+
198+
<dependency>
199+
<groupId>com.squareup.okhttp3</groupId>
200+
<artifactId>okhttp</artifactId>
201+
<version>4.8.1</version>
202+
<scope>test</scope>
203+
</dependency>
204+
205+
<dependency>
206+
<groupId>com.squareup.okhttp3</groupId>
207+
<artifactId>okhttp-tls</artifactId>
208+
<version>4.8.1</version>
209+
<scope>test</scope>
210+
</dependency>
211+
212+
<!-- Kotlin extension -->
213+
<dependency>
214+
<groupId>org.jetbrains.kotlin</groupId>
215+
<artifactId>kotlin-stdlib</artifactId>
216+
<version>${kotlin}</version>
217+
<optional>true</optional>
218+
</dependency>
219+
220+
<dependency>
221+
<groupId>org.jetbrains.kotlin</groupId>
222+
<artifactId>kotlin-reflect</artifactId>
223+
<version>${kotlin}</version>
224+
<optional>true</optional>
225+
</dependency>
226+
227+
<dependency>
228+
<groupId>org.jetbrains.kotlin</groupId>
229+
<artifactId>kotlin-test</artifactId>
230+
<version>${kotlin}</version>
231+
<scope>test</scope>
232+
</dependency>
233+
234+
<dependency>
235+
<groupId>org.awaitility</groupId>
236+
<artifactId>awaitility</artifactId>
237+
<version>4.0.3</version>
238+
<scope>test</scope>
239+
</dependency>
240+
241+
<dependency>
242+
<groupId>com.couchbase.client</groupId>
243+
<artifactId>couchbase-encryption</artifactId>
244+
<version>${couchbase.encryption}</version>
245+
<scope>test</scope>
246+
</dependency>
247+
39248
</dependencies>
40249

41250
<repositories>
@@ -62,4 +271,104 @@
62271
</pluginRepository>
63272
</pluginRepositories>
64273

274+
<build>
275+
<plugins>
276+
<plugin>
277+
<groupId>org.apache.maven.plugins</groupId>
278+
<artifactId>maven-surefire-plugin</artifactId>
279+
<configuration>
280+
<useSystemClassLoader>false</useSystemClassLoader>
281+
<useFile>false</useFile>
282+
<includes>
283+
<include>**/*Test.java</include>
284+
<include>**/*Tests.java</include>
285+
</includes>
286+
<excludes>
287+
<exclude>**/*IntegrationTest.java</exclude>
288+
<exclude>**/*IntegrationTests.java</exclude>
289+
</excludes>
290+
</configuration>
291+
</plugin>
292+
<plugin>
293+
<groupId>org.apache.maven.plugins</groupId>
294+
<artifactId>maven-failsafe-plugin</artifactId>
295+
<configuration>
296+
<useModulePath>false</useModulePath>
297+
<includes>
298+
<include>**/*IntegrationTest.java</include>
299+
<include>**/*IntegrationTests.java</include>
300+
</includes>
301+
</configuration>
302+
<executions>
303+
<execution>
304+
<goals>
305+
<goal>integration-test</goal>
306+
<goal>verify</goal>
307+
</goals>
308+
</execution>
309+
</executions>
310+
</plugin>
311+
<plugin>
312+
<groupId>org.apache.maven.plugins</groupId>
313+
<artifactId>maven-jar-plugin</artifactId>
314+
<configuration>
315+
<archive>
316+
<manifestEntries>
317+
<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
318+
</manifestEntries>
319+
</archive>
320+
</configuration>
321+
</plugin>
322+
<plugin>
323+
<groupId>org.apache.maven.plugins</groupId>
324+
<artifactId>maven-assembly-plugin</artifactId>
325+
</plugin>
326+
<plugin>
327+
<groupId>org.asciidoctor</groupId>
328+
<artifactId>asciidoctor-maven-plugin</artifactId>
329+
</plugin>
330+
<plugin>
331+
<groupId>com.mysema.maven</groupId>
332+
<artifactId>apt-maven-plugin</artifactId>
333+
<version>${apt}</version>
334+
<dependencies>
335+
<dependency>
336+
<groupId>com.querydsl</groupId>
337+
<artifactId>querydsl-apt</artifactId>
338+
<version>${querydsl}</version>
339+
</dependency>
340+
</dependencies>
341+
<executions>
342+
<execution>
343+
<phase>generate-test-sources</phase>
344+
<goals>
345+
<goal>test-process</goal>
346+
</goals>
347+
<configuration>
348+
<outputDirectory>target/generated-test-sources</outputDirectory>
349+
<processor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</processor>
350+
</configuration>
351+
</execution>
352+
</executions>
353+
</plugin>
354+
<plugin>
355+
<groupId>org.codehaus.mojo</groupId>
356+
<artifactId>build-helper-maven-plugin</artifactId>
357+
<version>3.0.0</version>
358+
<executions>
359+
<execution>
360+
<phase>generate-test-sources</phase>
361+
<goals>
362+
<goal>add-source</goal>
363+
</goals>
364+
<configuration>
365+
<sources>
366+
<source>target/generated-test-sources</source>
367+
</sources>
368+
</configuration>
369+
</execution>
370+
</executions>
371+
</plugin>
372+
</plugins>
373+
</build>
65374
</project>

‎spring-data-couchbase-distribution/pom.xml

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)