Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on javax.inject from querydsl. (#1992)

Browse Source 
To use querydsl, the spring application will need to add a dependency

    <dependency>
        <groupId>com.querydsl</groupId>
        <artifactId>querydsl-apt</artifactId>
        <version>${querydsl}</version>
        <classifier>jakarta</classifier>
        <scope>provided</scope>
    </dependency>

And explicitly specify CouchbasseAnnotationProcessor

    <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
        <executions>
            <execution>
                <id>annotation-processing</id>
                <phase>generate-sources</phase>
                <goals>
                    <goal>compile</goal>
                </goals>
                <configuration>
                    <proc>only</proc>
                    <annotationProcessors>
                        <annotationProcessor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</annotationProcessor>
                    </annotationProcessors>
                    <generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
                    <compilerArgs>
                        <arg>-Aquerydsl.logInfo=true</arg>
                    </compilerArgs>
                </configuration>
            </execution>
        </executions>
    </plugin>

Closes #1989.
This commit is contained in:
Michael Reiche
2024-10-17 10:17:08 -07:00
committed by mikereiche
parent 4369da073f
commit ea42b98c8b
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@@ -48,19 +48,7 @@
<artifactId>querydsl-apt</artifactId>
<version>${querydsl}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>test</scope>
<scope>provided</scope>
</dependency>
<dependency>
@@ -262,9 +250,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
</configuration>
<executions>
<execution>
<id>test-annotation-processing</id>

2
src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java
View File

@@ -79,7 +79,7 @@ public class CouchbaseAnnotationProcessor extends AbstractQuerydslProcessor {
return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS;
}
Configuration conf = createConfiguration(roundEnv);
Configuration conf = createConfiguration(roundEnv);
try {
conf.getTypeMappings();
} catch (NoClassDefFoundError cnfe ){

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

@@ -1 +0,0 @@
org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor