Skip to content

Commit 29097c9

Browse files
committed
Revert "Mark CouchbaseAnnotationProcessor for auto-discovery. (#1871)"
This reverts commit 8b87abb.
1 parent 7f22e6c commit 29097c9

File tree

3 files changed

+26
-77
lines changed

3 files changed

+26
-77
lines changed

pom.xml

+26-31
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<springdata.commons>3.0.13-SNAPSHOT</springdata.commons>
2424
<java-module-name>spring.data.couchbase</java-module-name>
2525
<hibernate.validator>7.0.1.Final</hibernate.validator>
26+
<apt>1.1.3</apt>
27+
<querydsl>5.0.0</querydsl>
2628
<mysema.querydsl>3.7.4</mysema.querydsl>
2729
<couchbase.encryption>3.1.0</couchbase.encryption>
2830
<jodatime>2.10.13</jodatime>
@@ -247,37 +249,6 @@
247249

248250
<build>
249251
<plugins>
250-
<plugin>
251-
<groupId>org.apache.maven.plugins</groupId>
252-
<artifactId>maven-compiler-plugin</artifactId>
253-
<dependencies>
254-
<dependency>
255-
<groupId>com.querydsl</groupId>
256-
<artifactId>querydsl-apt</artifactId>
257-
<version>${querydsl}</version>
258-
</dependency>
259-
</dependencies>
260-
<configuration>
261-
<proc>none</proc>
262-
</configuration>
263-
<executions>
264-
<execution>
265-
<id>test-annotation-processing</id>
266-
<phase>generate-test-sources</phase>
267-
<goals>
268-
<goal>testCompile</goal>
269-
</goals>
270-
<configuration>
271-
<proc>only</proc>
272-
<annotationProcessors>
273-
<annotationProcessor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</annotationProcessor>
274-
</annotationProcessors>
275-
<generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
276-
</configuration>
277-
</execution>
278-
</executions>
279-
</plugin>
280-
281252
<plugin>
282253
<groupId>org.apache.maven.plugins</groupId>
283254
<artifactId>maven-surefire-plugin</artifactId>
@@ -321,6 +292,30 @@
321292
<groupId>org.asciidoctor</groupId>
322293
<artifactId>asciidoctor-maven-plugin</artifactId>
323294
</plugin>
295+
<plugin>
296+
<groupId>com.mysema.maven</groupId>
297+
<artifactId>apt-maven-plugin</artifactId>
298+
<version>${apt}</version>
299+
<dependencies>
300+
<dependency>
301+
<groupId>com.querydsl</groupId>
302+
<artifactId>querydsl-apt</artifactId>
303+
<version>${querydsl}</version>
304+
</dependency>
305+
</dependencies>
306+
<executions>
307+
<execution>
308+
<phase>generate-test-sources</phase>
309+
<goals>
310+
<goal>test-process</goal>
311+
</goals>
312+
<configuration>
313+
<outputDirectory>target/generated-test-sources</outputDirectory>
314+
<processor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</processor>
315+
</configuration>
316+
</execution>
317+
</executions>
318+
</plugin>
324319
</plugins>
325320
</build>
326321

src/main/asciidoc/repository.adoc

-45
Original file line numberDiff line numberDiff line change
@@ -30,51 +30,6 @@ public class Config extends AbstractCouchbaseConfiguration {
3030

3131
An advanced usage is described in <<couchbase.repository.multibucket>>.
3232

33-
[[couchbase.repository.configuration.dsl]]
34-
=== QueryDSL Configuration
35-
Spring Data Couchbase supports QueryDSL for building type-safe queries. To enable code generation you need to set `spring-data-couchbase` as annotation processor on your project.
36-
37-
.Maven Configuration Example
38-
====
39-
[source,xml]
40-
----
41-
<build>
42-
<plugins>
43-
<plugin>
44-
<groupId>org.apache.maven.plugins</groupId>
45-
<artifactId>maven-compiler-plugin</artifactId>
46-
<version>[compiler-plugin-version]</version>
47-
<configuration>
48-
<annotationProcessorPaths>
49-
<!-- path to the annotation processor -->
50-
<path>
51-
<groupId>com.querydsl</groupId>
52-
<artifactId>querydsl-apt</artifactId>
53-
<version>[version]</version>
54-
</path>
55-
<path>
56-
<groupId>org.springframework.data</groupId>
57-
<artifactId>spring-data-couchbase</artifactId>
58-
<version>[version]</version>
59-
</path>
60-
</annotationProcessorPaths>
61-
</configuration>
62-
</plugin>
63-
</plugins>
64-
</build>
65-
66-
----
67-
====
68-
69-
.Gradle Configuration Example
70-
====
71-
[source,groovy]
72-
----
73-
annotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}'
74-
annotationProcessor 'org.springframework.data:spring-data-couchbase:${springDataCouchbaseVersion}'
75-
----
76-
====
77-
7833
[[couchbase.repository.usage]]
7934
== Usage
8035

src/main/resources/META-INF/services/javax.annotation.processing.Processor

-1
This file was deleted.

0 commit comments

Comments
 (0)