Skip to content

Commit

Permalink
Refactor spring-data-couchbase into modules.
Browse files Browse the repository at this point in the history 
This allows pulling CouchbaseAnnotationProcessor into its own module so
that javax.inject is not needed as a dependency for spring-data-couchbase.

Closes #1989.
  • Loading branch information
@mikereiche
mikereiche committed Oct 16, 2024
1 parent 756a8c5 commit cdb33f1
Show file tree
Hide file tree
Showing 566 changed files with 2,335 additions and 259 deletions.
188 changes: 64 additions & 124 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
<modelVersion>4.0.0</modelVersion>

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-couchbase</artifactId>
<artifactId>spring-data-couchbase-parent</artifactId>
<version>5.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data Couchbase</name>
<description>Spring Data integration for Couchbase</description>
<name>Spring Data Couchbase Parent</name>
<description>Spring Data integration for Couchbase - Parent</description>
<url>https://github.com/spring-projects/spring-data-couchbase</url>

<parent>
Expand All @@ -17,14 +18,12 @@
<version>3.4.0-SNAPSHOT</version>
</parent>


<properties>
<couchbase>3.7.4</couchbase>
<springdata.commons>3.4.0-SNAPSHOT</springdata.commons>
<java-module-name>spring.data.couchbase</java-module-name>
<hibernate.validator>7.0.1.Final</hibernate.validator>
<couchbase.encryption>3.1.0</couchbase.encryption>
<jodatime>2.10.13</jodatime>
<jackson-joda>2.13.4</jackson-joda>
<jakarta.el>4.0.0</jakarta.el>
</properties>

Expand All @@ -42,53 +41,6 @@

<dependencies>

<dependency>
<groupId>com.querydsl</groupId>
<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>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-data-commons</artifactId>
<version>${springdata.commons}</version>
</dependency>

<dependency>
<groupId>com.couchbase.client</groupId>
<artifactId>java-client</artifactId>
<version>${couchbase}</version>
</dependency>

<!-- CDI -->
<dependency>
<groupId>jakarta.enterprise</groupId>
Expand Down Expand Up @@ -125,6 +77,7 @@
<scope>test</scope>
</dependency>

<!--
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
Expand All @@ -136,13 +89,16 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
-->

<!--
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime}</version>
<optional>true</optional>
</dependency>
-->

<dependency>
<groupId>org.testcontainers</groupId>
Expand All @@ -151,6 +107,7 @@
</dependency>

<!-- JSR 303 Validation -->
<!--
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
Expand All @@ -165,14 +122,17 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
-->

<!--
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${jakarta.el}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
-->

<!-- CDI -->
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
Expand Down Expand Up @@ -247,116 +207,96 @@
<scope>test</scope>
</dependency>

<!--
<dependency>
<groupId>com.couchbase.client</groupId>
<artifactId>couchbase-encryption</artifactId>
<version>${couchbase.encryption}</version>
<scope>test</scope>
</dependency>
-->

</dependencies>

<modules>
<module>spring-data-couchbase</module>
<module>spring-data-couchbase-querydsl</module>
<module>spring-data-couchbase-testutils</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
</configuration>
<executions>
<execution>
<id>test-annotation-processing</id>
<phase>generate-test-sources</phase>
<goals>
<goal>testCompile</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>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
<includes>
<include>**/*.scala</include>
<include>**/*Spec.class</include>
<include>**/*Test.java</include>
<include>**/*Tests.java</include>
</includes>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*IntegrationTests.java</exclude>
</excludes>
<excludedGroups>flaky</excludedGroups>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!--
<version>3.13.0</version>
-->
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.2</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.3</version>
</dependency>
</dependencies>
<configuration>
<useModulePath>false</useModulePath>
<includes>
<include>**/*IntegrationTest.java</include>
<include>**/*IntegrationTests.java</include>
</includes>
<headerLocation>config/checkstyle/checkstyle-header.txt</headerLocation>
<configLocation>config/checkstyle/checkstyle-basic.xml</configLocation>
<suppressionsLocation>config/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
-->
<!-- Want java-fit-performer to be executable. Maven complains if use exec:java target as the dependencies of
module aren't executable. The workaround appears to be this - disable execution by default. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<legacyMode>true</legacyMode>
<skip>true</skip>
<executable>java</executable>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>antora-process-resources</id>
<build>
<resources>
<resource>
<directory>src/main/antora/resources/antora-resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</profile>
<profile>
<id>antora</id>
<build>
<plugins>
<plugin>
<groupId>org.antora</groupId>
<artifactId>antora-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
Expand Down
Loading

0 comments on commit cdb33f1

Please sign in to comment.