X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/76d5535dd94b8715c3cdad46b036c6e6fec908b5..4f5dceb78f940c9b0bf6af2898097c79b02031c8:/cdmlib-model/pom.xml

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index d857829859..c1ff4e01b4 100644
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"
-  -->
+<?xml version="1.0" encoding="UTF-8"?><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">
   <parent>
-    <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>2.0</version>
+    <groupId>eu.etaxonomy</groupId>
+    <version>2.4</version>
   </parent>
-
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-model</artifactId>
   <name>CDM Domain Model</name>
@@ -19,104 +15,78 @@
     <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-model/</developerConnection>
     <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-model/</url>
   </scm>
-  
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
+          
           <execution>
             <id>aspectj-main</id>
+            <phase>process-sources</phase>
             <goals>
               <goal>run</goal>
             </goals>
-            <phase>process-sources</phase>
             <configuration>
               <tasks>
-                <taskdef name="iajc" classname="org.aspectj.tools.ant.taskdefs.AjcTask">
-                  <classpath refid="maven.plugin.classpath"/>
+                <property name="spring.aspects.jar" value="${settings.localRepository}/org/springframework/org.springframework.aspects/${spring.version}/org.springframework.aspects-${spring.version}.jar"/>
+                <path id="aspectPath">
+                  <pathelement location="${spring.aspects.jar}"/>
+                </path>
+                <taskdef classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">
+                  <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 verbose="false" source="1.5" destDir="target/classes"
+                  aspectPathRef="aspectPath">
+                  <classpath refid="maven.plugin.classpath" />
+                  <classpath refid="maven.compile.classpath" />
+                  <sourceroots>
+                    <pathelement location="src/main/java" />
+                  </sourceroots>
                 </iajc>
               </tasks>
-          </configuration>
-        </execution>
-        <execution>
+            </configuration>
+          </execution>
+          <execution>
             <id>aspectj-test</id>
+            <phase>process-test-sources</phase>
             <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 classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">
+                  <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 verbose="false" source="1.5" destDir="target/test-classes">
+                  <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>
+      <dependencies>
           <dependency>
             <groupId>org.aspectj</groupId>
-			<artifactId>aspectjtools</artifactId>
-			<version>1.5.4</version>
+            <artifactId>aspectjtools</artifactId>
+            <version>1.6.3</version>
           </dependency>
           <dependency>
             <groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.5.4</version>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.6.3</version>
           </dependency>
-        </dependencies>
+      </dependencies>
       </plugin>
-      
-    <!-- JAXB Schema compiler task (xjc) not used at this point -->
-    <!--
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
-                  <classpath refid="maven.compile.classpath"/>
-                </taskdef>
-                <mkdir dir="target/generated-sources/java"/>
-                <xjc schema="src/main/resources/schema/cdm/cdm.xsd"
-                  extension="true"
-                  destdir="target/generated-sources/java">
-                  <depends dir="src/main/resources/schema" includes="cdm/cdm.xsd"/>
-                  <produces dir="target/generated-sources/java/eu/etaxonomy/cdm" includes="**/*.java"/>
-                </xjc>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    -->
-      
     </plugins>
   </build>
-  
   <dependencies>
-	<dependency>
+    <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-commons</artifactId>
     </dependency>
@@ -124,7 +94,7 @@
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
     </dependency>
-	    <dependency>
+    <dependency>
       <groupId>xml-resolver</groupId>
       <artifactId>xml-resolver</artifactId>
     </dependency>
@@ -156,53 +126,46 @@
       <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>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
+      <artifactId>org.springframework.jdbc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
+      <artifactId>org.springframework.test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.aspects</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sf.opencsv</groupId>
       <artifactId>opencsv</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi</artifactId>
     </dependency>
 	<dependency>
-	  <groupId>org.apache.poi</groupId>
-	  <artifactId>poi</artifactId>
-	</dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>    
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time-hibernate</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>ehcache</artifactId>
-          <groupId>ehcache</groupId>
-        </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib-full</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-    	<groupId>org.springframework.security</groupId>
-    	<artifactId>spring-security-core</artifactId>
-    </dependency>
-
-    <!-- joda-time perhaps needed in future for JAXB binding -->
-    <!--
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
@@ -216,13 +179,55 @@
           <groupId>ehcache</groupId>
         </exclusion>
         <exclusion>
-          <groupId>cglib</groupId>
           <artifactId>cglib-full</artifactId>
+          <groupId>cglib</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hibernate</artifactId>
+          <groupId>org.hibernate</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>hibernate</artifactId>
+          <groupId>hibernate</groupId>
         </exclusion>
       </exclusions>
     </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>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+	  <groupId>jdom</groupId>
+	  <artifactId>jdom</artifactId>
+	</dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>  
+    </dependency>
+    <dependency>
+	  <groupId>jdom</groupId>
+	  <artifactId>jdom</artifactId>
+    </dependency>
   </dependencies>
-  
-</project>
-
+</project>
\ No newline at end of file