X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/49326e661a46389224da22ac3e24e41705cf80ae..288cb00cbc95b8344b5c2a709e8cfa1f08f835f2:/cdmlib-model/pom.xml

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 9dada7ca89..a125464de9 100644
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -1,112 +1,230 @@
-<?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>
-    <artifactId>cdmParent</artifactId>
-    <groupId>eu.etaxonomy</groupId>
-    <version>0.5.0</version>
-    <relativePath>../cdmParent/pom.xml</relativePath>
-  </parent>
-  
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cdmlib-model</artifactId>
-  <name>EDIT Common Data Model Library - Domain Model</name>
-  <version>0.5.0</version>
-  <description>The domain model java implementation of EDIT's Common Data Model</description>
-  <scm>
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-model/</connection>
-    <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-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <includes>
-            <include>**/cdm/**/*.java</include>
-            <include>**/*.aj</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <dependencies>
-  	<dependency>
-  		<groupId>eu.etaxonomy</groupId>
-  		<artifactId>cdmlib-commons</artifactId>
-  		<version>0.5.0</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>aspectj</groupId>
-  		<artifactId>aspectjrt</artifactId>
-  		<version>1.5.2a</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.hibernate</groupId>
-  		<artifactId>hibernate-annotations</artifactId>
-  		<version>3.3.0.ga</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>spring-jdbc</artifactId>
-  		<version>${spring.version}</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>spring-test</artifactId>
-  		<version>${spring.version}</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>net.sf.opencsv</groupId>
-  		<artifactId>opencsv</artifactId>
-  		<version>1.8</version>
-  	</dependency>
- <!--  	<dependency>-->
-<!--  		<groupId>javax.xml.bind</groupId>-->
-<!--  		<artifactId>jaxb-api</artifactId>-->
-<!--  		<version>2.0</version>-->
-<!--  	</dependency>-->
-  </dependencies>
-  <reporting>
-    <!-- The changes-maven-plugin plug-in uses a special XML file (src/changes/changes.xml) to track releases and changes in each release -->
-    <!-- 
+<?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>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cdmlib-model</artifactId>
+  <name>CDM Domain Model</name>
+  <description>The domain model java implementation of EDIT's Common Data Model</description>
+  <scm>
+    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-model/</connection>
+    <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>
+            <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"/>
+                </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 -->
+    <!--
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>changes-maven-plugin</artifactId>
+        <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>
     -->
-  </reporting>
-</project>
-
+      
+    </plugins>
+  </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>xml-resolver</groupId>
+      <artifactId>xml-resolver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jsr173_api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb1-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-xjc</artifactId>
+    </dependency>
+    <dependency>
+      <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-search</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.unitils</groupId>
+      <artifactId>unitils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</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 -->
+    <!--
+    <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>
+    -->
+  </dependencies>
+  
+</project>
+