<parent>
<artifactId>cdmlib-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>5.5.0</version>
+ <version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <property name="spring.aspects.jar" value="${settings.localRepository}/org/springframework/spring-aspects/${spring.version}/spring-aspects-${spring.version}.jar" />
- <path id="aspectPath">
- <pathelement location="${spring.aspects.jar}" />
- </path>
+ <target>
+ <path id="aspectPath" location="${settings.localRepository}/org/springframework/spring-aspects/${spring.version}/spring-aspects-${spring.version}.jar" />
<taskdef classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">
<classpath refid="maven.plugin.classpath" />
</taskdef>
<iajc verbose="false" source="${java.codelevel}" destDir="target/classes" aspectPathRef="aspectPath">
- <classpath refid="maven.plugin.classpath" />
- <classpath refid="maven.compile.classpath" />
+ <!-- see https://www.eclipse.org/aspectj/doc/released/devguide/antTasks-iajc.html#antTasks-iajc-paths -->
+ <classpath>
+ <path refid="maven.compile.classpath" />
+ <path refid="maven.plugin.classpath" />
+ </classpath>
<sourceroots>
<pathelement location="src/main/java" />
</sourceroots>
</iajc>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
+ <path id="aspectPath" location="${settings.localRepository}/org/springframework/spring-aspects/${spring.version}/spring-aspects-${spring.version}.jar" />
<taskdef classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">
<classpath refid="maven.plugin.classpath" />
</taskdef>
- <iajc verbose="false" source="${java.codelevel}" destDir="target/test-classes">
- <classpath refid="maven.plugin.classpath" />
- <classpath refid="maven.compile.classpath" />
- <classpath refid="maven.test.classpath" />
+ <iajc verbose="false" source="${java.codelevel}" destDir="target/test-classes" aspectPathRef="aspectPath">
+ <!-- see https://www.eclipse.org/aspectj/doc/released/devguide/antTasks-iajc.html#antTasks-iajc-paths -->
+ <classpath>
+ <path refid="maven.compile.classpath" />
+ <path refid="maven.plugin.classpath" />
+ <path refid="maven.test.classpath" />
+ </classpath>
<sourceroots>
<pathelement location="src/test/java" />
</sourceroots>
</iajc>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.8.8</version>
+ <version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.8.8</version>
+ <version>${aspectj.version}</version>
</dependency>
</dependencies>
</plugin>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-commons</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- replaced by jakarta.xml.bind-api, dependency of jaxb-runtime -->
+<!-- <groupId>javax.xml.bind</groupId> -->
+<!-- <artifactId>jaxb-api</artifactId> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- aspectjrt is subset of aspectjweaver which comes as dependency with spring-aspects -->
+<!-- <groupId>org.aspectj</groupId> -->
+<!-- <artifactId>aspectjrt</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
-<!-- these 3 are also required for hibernate validator according to http://hibernate.org/validator/documentation/getting-started/-->
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- </dependency>
+<!-- these 2 are also required for hibernate validator according to http://hibernate.org/validator/documentation/getting-started/
+ but cdmlib-model tests require only for javax.el -->
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator-cdi</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.hibernate.validator</groupId> -->
+<!-- <artifactId>hibernate-validator-cdi</artifactId> -->
+<!-- </dependency> -->
<!-- end validator -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>