cleanup

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

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 55b45176666689e7136e46c5ed6ef9d816a2ac27..46ec49cb412ef52eb129bb18f130bf5a6be4f868 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.32.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,62 +48,95 @@
               <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>
     </plugins>
+       <pluginManagement>
+               <plugins>
+                       <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                       <plugin>
+                               <groupId>org.eclipse.m2e</groupId>
+                               <artifactId>lifecycle-mapping</artifactId>
+                               <version>1.0.0</version>
+                               <configuration>
+                                       <lifecycleMappingMetadata>
+                                               <pluginExecutions>
+                                                       <pluginExecution>
+                                                               <pluginExecutionFilter>
+                                                                       <groupId>
+                                                                               org.apache.maven.plugins
+                                                                       </groupId>
+                                                                       <artifactId>
+                                                                               maven-antrun-plugin
+                                                                       </artifactId>
+                                                                       <versionRange>
+                                                                               [3.0.0,)
+                                                                       </versionRange>
+                                                                       <goals>
+                                                                               <goal>run</goal>
+                                                                       </goals>
+                                                               </pluginExecutionFilter>
+                                                               <action>
+                                                                       <ignore />
+                                                               </action>
+                                                       </pluginExecution>
+                                               </pluginExecutions>
+                                       </lifecycleMappingMetadata>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </pluginManagement>
   </build>
   <dependencies>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</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>
-    </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>
@@ -148,7 +181,7 @@
     </dependency>
     <dependency>
                <groupId>org.jadira.usertype</groupId>
-               <artifactId>usertype.jodatime</artifactId>
+               <artifactId>usertype.core</artifactId>
        </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
@@ -171,31 +204,38 @@
       <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 https://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.validator</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>
       <artifactId>jackson-annotations</artifactId>
-  </dependency>
+    </dependency>
+    <dependency>
+      <groupId>org.passay</groupId>
+      <artifactId>passay</artifactId>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file