<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>1.3</version>
+ <version>2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>aspectj-main</id>
<goals>
- <goal>compile</goal>
- <goal>test-compile</goal>
+ <goal>run</goal>
</goals>
- </execution>
- </executions>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <includes>
- <include>**/cdm/**/*.java</include>
- <include>**/*.aj</include>
- </includes>
- </configuration>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="iajc" classname="org.aspectj.tools.ant.taskdefs.AjcTask">
+ <classpath refid="maven.plugin.classpath"/>
+ </taskdef>
+ <iajc destDir="target/classes" verbose="false" source="1.5">
+ <classpath refid="maven.plugin.classpath"/>
+ <classpath refid="maven.compile.classpath"/>
+ <sourceroots>
+ <pathelement location="src/main/java"/>
+ </sourceroots>
+ </iajc>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>aspectj-test</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-test-sources</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="iajc" classname="org.aspectj.tools.ant.taskdefs.AjcTask">
+ <classpath refid="maven.plugin.classpath"/>
+ </taskdef>
+ <iajc destDir="target/test-classes" verbose="false" source="1.5">
+ <classpath refid="maven.plugin.classpath"/>
+ <classpath refid="maven.compile.classpath"/>
+ <classpath refid="maven.test.classpath"/>
+ <sourceroots>
+ <pathelement location="src/test/java"/>
+ </sourceroots>
+ </iajc>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ </dependencies>
</plugin>
<!-- JAXB Schema compiler task (xjc) not used at this point -->
</build>
<dependencies>
-
<dependency>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-commons</artifactId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>aspectj</groupId>
+ <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-envers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ </dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils</artifactId>
- <version>1.0</version>
- <!--<scope>test</scope>-->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<exclusion>\r
<groupId>cglib</groupId>\r
<artifactId>cglib-full</artifactId>\r
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate</artifactId>
</exclusion>\r
</exclusions>\r
</dependency>
-
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.lsid</groupId>
+ <artifactId>lsid-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
<!-- joda-time perhaps needed in future for JAXB binding -->
<!--
<dependency>