Skip to content

Commit cdb33f1

Browse files
mikereichemikereiche
committed
Refactor spring-data-couchbase into modules.
This allows pulling CouchbaseAnnotationProcessor into its own module so that javax.inject is not needed as a dependency for spring-data-couchbase. Closes #1989.
1 parent 756a8c5 commit cdb33f1

File tree

566 files changed

+2335
-259
lines changed

Some content is hidden

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

566 files changed

+2335
-259
lines changed

‎pom.xml‎

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

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

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

1415
<parent>
@@ -17,14 +18,12 @@
1718
<version>3.4.0-SNAPSHOT</version>
1819
</parent>
1920

21+
2022
<properties>
2123
<couchbase>3.7.4</couchbase>
2224
<springdata.commons>3.4.0-SNAPSHOT</springdata.commons>
2325
<java-module-name>spring.data.couchbase</java-module-name>
2426
<hibernate.validator>7.0.1.Final</hibernate.validator>
25-
<couchbase.encryption>3.1.0</couchbase.encryption>
26-
<jodatime>2.10.13</jodatime>
27-
<jackson-joda>2.13.4</jackson-joda>
2827
<jakarta.el>4.0.0</jakarta.el>
2928
</properties>
3029

@@ -42,53 +41,6 @@
4241

4342
<dependencies>
4443

45-
<dependency>
46-
<groupId>com.querydsl</groupId>
47-
<artifactId>querydsl-apt</artifactId>
48-
<version>${querydsl}</version>
49-
<classifier>jakarta</classifier>
50-
<exclusions>
51-
<exclusion>
52-
<groupId>javax.inject</groupId>
53-
<artifactId>javax.inject</artifactId>
54-
</exclusion>
55-
</exclusions>
56-
</dependency>
57-
58-
<dependency>
59-
<groupId>javax.inject</groupId>
60-
<artifactId>javax.inject</artifactId>
61-
<version>1</version>
62-
<scope>test</scope>
63-
</dependency>
64-
65-
<dependency>
66-
<groupId>org.springframework</groupId>
67-
<artifactId>spring-context-support</artifactId>
68-
</dependency>
69-
70-
<dependency>
71-
<groupId>org.springframework</groupId>
72-
<artifactId>spring-web</artifactId>
73-
</dependency>
74-
75-
<dependency>
76-
<groupId>org.springframework</groupId>
77-
<artifactId>spring-tx</artifactId>
78-
</dependency>
79-
80-
<dependency>
81-
<groupId>${project.groupId}</groupId>
82-
<artifactId>spring-data-commons</artifactId>
83-
<version>${springdata.commons}</version>
84-
</dependency>
85-
86-
<dependency>
87-
<groupId>com.couchbase.client</groupId>
88-
<artifactId>java-client</artifactId>
89-
<version>${couchbase}</version>
90-
</dependency>
91-
9244
<!-- CDI -->
9345
<dependency>
9446
<groupId>jakarta.enterprise</groupId>
@@ -125,6 +77,7 @@
12577
<scope>test</scope>
12678
</dependency>
12779

80+
<!--
12881
<dependency>
12982
<groupId>com.fasterxml.jackson.datatype</groupId>
13083
<artifactId>jackson-datatype-joda</artifactId>
@@ -136,13 +89,16 @@
13689
<groupId>com.fasterxml.jackson.core</groupId>
13790
<artifactId>jackson-databind</artifactId>
13891
</dependency>
92+
-->
13993

94+
<!--
14095
<dependency>
14196
<groupId>joda-time</groupId>
14297
<artifactId>joda-time</artifactId>
14398
<version>${jodatime}</version>
14499
<optional>true</optional>
145100
</dependency>
101+
-->
146102

147103
<dependency>
148104
<groupId>org.testcontainers</groupId>
@@ -151,6 +107,7 @@
151107
</dependency>
152108

153109
<!-- JSR 303 Validation -->
110+
<!--
154111
<dependency>
155112
<groupId>jakarta.validation</groupId>
156113
<artifactId>jakarta.validation-api</artifactId>
@@ -165,14 +122,17 @@
165122
<scope>provided</scope>
166123
<optional>true</optional>
167124
</dependency>
125+
-->
168126

127+
<!--
169128
<dependency>
170129
<groupId>org.glassfish</groupId>
171130
<artifactId>jakarta.el</artifactId>
172131
<version>${jakarta.el}</version>
173132
<scope>provided</scope>
174133
<optional>true</optional>
175134
</dependency>
135+
-->
176136

177137
<!-- CDI -->
178138
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
@@ -247,116 +207,96 @@
247207
<scope>test</scope>
248208
</dependency>
249209

210+
<!--
250211
<dependency>
251212
<groupId>com.couchbase.client</groupId>
252213
<artifactId>couchbase-encryption</artifactId>
253214
<version>${couchbase.encryption}</version>
254215
<scope>test</scope>
255216
</dependency>
217+
-->
256218

257219
</dependencies>
258220

221+
<modules>
222+
<module>spring-data-couchbase</module>
223+
<module>spring-data-couchbase-querydsl</module>
224+
<module>spring-data-couchbase-testutils</module>
225+
</modules>
226+
259227
<build>
260228
<plugins>
261229
<plugin>
262-
<groupId>org.apache.maven.plugins</groupId>
263-
<artifactId>maven-compiler-plugin</artifactId>
264-
<configuration>
265-
<proc>none</proc>
266-
</configuration>
267-
<executions>
268-
<execution>
269-
<id>test-annotation-processing</id>
270-
<phase>generate-test-sources</phase>
271-
<goals>
272-
<goal>testCompile</goal>
273-
</goals>
274-
<configuration>
275-
<proc>only</proc>
276-
<annotationProcessors>
277-
<annotationProcessor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</annotationProcessor>
278-
</annotationProcessors>
279-
<generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
280-
<compilerArgs>
281-
<arg>-Aquerydsl.logInfo=true</arg>
282-
</compilerArgs>
283-
</configuration>
284-
</execution>
285-
</executions>
286-
</plugin>
287-
288-
<plugin>
289-
<groupId>org.apache.maven.plugins</groupId>
290230
<artifactId>maven-surefire-plugin</artifactId>
231+
<version>3.3.0</version>
291232
<configuration>
292-
<useSystemClassLoader>false</useSystemClassLoader>
293-
<useFile>false</useFile>
233+
<trimStackTrace>false</trimStackTrace>
294234
<includes>
235+
<include>**/*.scala</include>
236+
<include>**/*Spec.class</include>
295237
<include>**/*Test.java</include>
296-
<include>**/*Tests.java</include>
297238
</includes>
298-
<excludes>
299-
<exclude>**/*IntegrationTest.java</exclude>
300-
<exclude>**/*IntegrationTests.java</exclude>
301-
</excludes>
239+
<excludedGroups>flaky</excludedGroups>
302240
</configuration>
303241
</plugin>
304242
<plugin>
305243
<groupId>org.apache.maven.plugins</groupId>
306244
<artifactId>maven-failsafe-plugin</artifactId>
245+
<version>3.3.0</version>
246+
</plugin>
247+
<plugin>
248+
<groupId>org.apache.maven.plugins</groupId>
249+
<artifactId>maven-compiler-plugin</artifactId>
250+
<!--
251+
<version>3.13.0</version>
252+
-->
253+
</plugin>
254+
<!--
255+
<plugin>
256+
<groupId>org.apache.maven.plugins</groupId>
257+
<artifactId>maven-checkstyle-plugin</artifactId>
258+
<version>3.1.2</version>
259+
<dependencies>
260+
<dependency>
261+
<groupId>com.puppycrawl.tools</groupId>
262+
<artifactId>checkstyle</artifactId>
263+
<version>9.3</version>
264+
</dependency>
265+
</dependencies>
307266
<configuration>
308-
<useModulePath>false</useModulePath>
309-
<includes>
310-
<include>**/*IntegrationTest.java</include>
311-
<include>**/*IntegrationTests.java</include>
312-
</includes>
267+
<headerLocation>config/checkstyle/checkstyle-header.txt</headerLocation>
268+
<configLocation>config/checkstyle/checkstyle-basic.xml</configLocation>
269+
<suppressionsLocation>config/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
270+
<consoleOutput>true</consoleOutput>
271+
<failsOnError>true</failsOnError>
272+
<linkXRef>false</linkXRef>
313273
</configuration>
314274
<executions>
315275
<execution>
276+
<id>validate</id>
277+
<phase>validate</phase>
316278
<goals>
317-
<goal>integration-test</goal>
318-
<goal>verify</goal>
279+
<goal>check</goal>
319280
</goals>
320281
</execution>
321282
</executions>
322283
</plugin>
284+
-->
285+
<!-- Want java-fit-performer to be executable. Maven complains if use exec:java target as the dependencies of
286+
module aren't executable. The workaround appears to be this - disable execution by default. -->
323287
<plugin>
324-
<groupId>org.apache.maven.plugins</groupId>
325-
<artifactId>maven-assembly-plugin</artifactId>
326-
</plugin>
327-
<plugin>
328-
<groupId>org.apache.maven.plugins</groupId>
329-
<artifactId>maven-javadoc-plugin</artifactId>
288+
<groupId>org.codehaus.mojo</groupId>
289+
<artifactId>exec-maven-plugin</artifactId>
290+
<version>1.3.2</version>
330291
<configuration>
331-
<legacyMode>true</legacyMode>
292+
<skip>true</skip>
293+
<executable>java</executable>
332294
</configuration>
333295
</plugin>
334296
</plugins>
335297
</build>
336298

337299
<profiles>
338-
<profile>
339-
<id>antora-process-resources</id>
340-
<build>
341-
<resources>
342-
<resource>
343-
<directory>src/main/antora/resources/antora-resources</directory>
344-
<filtering>true</filtering>
345-
</resource>
346-
</resources>
347-
</build>
348-
</profile>
349-
<profile>
350-
<id>antora</id>
351-
<build>
352-
<plugins>
353-
<plugin>
354-
<groupId>org.antora</groupId>
355-
<artifactId>antora-maven-plugin</artifactId>
356-
</plugin>
357-
</plugins>
358-
</build>
359-
</profile>
360300
</profiles>
361301

362302
<repositories>

0 commit comments

Comments
 (0)