cleanup

[cdmlib.git] / cdmlib-model / pom.xml

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index cac8739f3fd1b0bc3f656180fbcf320c7504963b..d55b24ed7403f5de0c011b3f93ad1f1d6d832617 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.18.0-SNAPSHOT</version>
+    <version>5.22.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -23,22 +23,22 @@
               <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>
@@ -48,32 +48,36 @@
               <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>
@@ -84,22 +88,20 @@
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-    </dependency>
     <dependency>
         <groupId>org.glassfish.jaxb</groupId>
         <artifactId>jaxb-runtime</artifactId>
     </dependency>
 <!--     <dependency> -->
-<!--         <groupId>org.glassfish.jaxb</groupId> -->
-<!--         <artifactId>jaxb-jxc</artifactId> -->
+<!--       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.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-envers</artifactId>