Browse Source

DATAMONGO-1045 - Tweak AspectJ setup in cross-store module to be able to build against Spring 4.1.

Added an aop.xml to only compile explicitly listed aspects in the cross-store module. This is needed as Spring 4.1 includes a new aspect for JavaEE 7 JCache support that has optional dependencies which we don't have in the classpath. Trying to compile all aspects contained in spring-aspects will result in ClassNotFoundExceptions for the aspects with missing dependencies.
pull/223/head
Oliver Gierke 11 years ago
parent
commit
a31e72ff06
  1. 7
      spring-data-mongodb-cross-store/aop.xml
  2. 11
      spring-data-mongodb-cross-store/pom.xml

7
spring-data-mongodb-cross-store/aop.xml

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<aspectj>
<aspects>
<aspect name="org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect" />
<aspect name="org.springframework.data.mongodb.crossstore.MongoDocumentBacking" />
</aspects>
</aspectj>

11
spring-data-mongodb-cross-store/pom.xml

@ -2,22 +2,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId> <artifactId>spring-data-mongodb-parent</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version> <version>1.6.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>spring-data-mongodb-cross-store</artifactId> <artifactId>spring-data-mongodb-cross-store</artifactId>
<name>Spring Data MongoDB - Cross-Store Support</name> <name>Spring Data MongoDB - Cross-Store Support</name>
<properties> <properties>
<jpa>1.0.0.Final</jpa> <jpa>1.0.0.Final</jpa>
<hibernate>3.6.10.Final</hibernate> <hibernate>3.6.10.Final</hibernate>
</properties> </properties>
<dependencies> <dependencies>
<!-- Spring --> <!-- Spring -->
@ -126,10 +126,11 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId> <artifactId>spring-aspects</artifactId>
</aspectLibrary> </aspectLibrary>
</aspectLibraries> </aspectLibraries>
<complianceLevel>${source.level}</complianceLevel> <complianceLevel>${source.level}</complianceLevel>
<source>${source.level}</source> <source>${source.level}</source>
<target>${source.level}</target> <target>${source.level}</target>
<xmlConfigured>aop.xml</xmlConfigured>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

Loading…
Cancel
Save