BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug in NomenclaturalCode
[cdmlib.git] / cdmlib-model / pom.xml
diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index c43630e0fa97ecfde9c7d4453d4fa2ed86f9446f..a125464de975ded11f7e5c9042e0fd5c5da3c61d 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -1,122 +1,230 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?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"
-   -->\r
-  <parent>\r
-    <artifactId>cdmParent</artifactId>\r
-    <groupId>eu.etaxonomy</groupId>\r
-    <version>0.4</version>\r
-    <relativePath>../cdmParent/pom.xml</relativePath>\r
-  </parent>\r
-  <modelVersion>4.0.0</modelVersion>\r
-  <artifactId>cdmlib-model</artifactId>\r
-  <name>EDIT Common Data Model Library - Domain Model</name>\r
-  <version>0.4.5</version>\r
-  <description>The domain model java implementation of EDIT's Common Data Model</description>\r
-  <scm>\r
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-model/</connection>\r
-    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-model/</developerConnection>\r
-    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-model/</url>\r
-  </scm>\r
-  <build>\r
+  -->
+  <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>\r
-        <artifactId>maven-compiler-plugin</artifactId>\r
-        <configuration>\r
-          <source>1.5</source>\r
-          <target>1.5</target>\r
-        </configuration>\r
-      </plugin>\r
-      <plugin>\r
-        <artifactId>maven-surefire-plugin</artifactId>\r
-        <configuration>\r
-          <includes>\r
-            <include>**/*Test.java</include>\r
-          </includes>\r
-         </configuration>\r
-      </plugin>\r
-      <plugin>\r
-        <artifactId>maven-antrun-plugin</artifactId>\r
-        <executions>\r
-          <execution>\r
-            <phase>generate-resources</phase>\r
-            <goals>\r
-              <goal>run</goal>\r
-            </goals>\r
-            <configuration>\r
-              <tasks />\r
-            </configuration>\r
-          </execution>\r
-        </executions>\r
-      </plugin>\r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-source-plugin</artifactId>\r
-        <executions>\r
-          <execution>\r
-            <id>attach-sources</id>\r
-            <phase>verify</phase>\r
-            <goals>\r
-              <goal>jar</goal>\r
-            </goals>\r
-          </execution>\r
-        </executions>\r
-      </plugin>\r
-      <plugin>\r
-        <groupId>org.codehaus.mojo</groupId>\r
-        <artifactId>aspectj-maven-plugin</artifactId>\r
-        <executions>\r
-          <execution>\r
-            <goals>\r
-              <goal>compile</goal>\r
-              <goal>test-compile</goal>\r
-            </goals>\r
-          </execution>\r
-        </executions>\r
-        <configuration>\r
-          <source>1.5</source>\r
-          <target>1.5</target>\r
-          <includes>\r
-            <include>**/cdm/**/*.java</include>\r
-            <include>**/*.aj</include>\r
-          </includes>\r
-        </configuration>\r
-      </plugin>\r
-    </plugins>\r
-  </build>\r
-  <dependencies>\r
-       <dependency>\r
-               <groupId>eu.etaxonomy</groupId>\r
-               <artifactId>cdmlib-commons</artifactId>\r
-               <version>0.4.5</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>aspectj</groupId>\r
-               <artifactId>aspectjrt</artifactId>\r
-               <version>1.5.2a</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>org.hibernate</groupId>\r
-               <artifactId>hibernate-annotations</artifactId>\r
-               <version>3.3.0.ga</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>org.springframework</groupId>\r
-               <artifactId>spring-jdbc</artifactId>\r
-               <version>2.5</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>org.springframework</groupId>\r
-               <artifactId>spring-test</artifactId>\r
-               <version>2.5</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>net.sf.opencsv</groupId>\r
-               <artifactId>opencsv</artifactId>\r
-               <version>1.8</version>\r
-       </dependency>\r
-  </dependencies>\r
-</project>\r
-\r
+      <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>
+        <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>
+      <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>\r
+      <groupId>joda-time</groupId>\r
+      <artifactId>joda-time</artifactId>    \r
+    </dependency>\r
+    <dependency>\r
+      <groupId>joda-time</groupId>\r
+      <artifactId>joda-time-hibernate</artifactId>\r
+      <exclusions>\r
+        <exclusion>\r
+          <artifactId>ehcache</artifactId>\r
+          <groupId>ehcache</groupId>\r
+        </exclusion>\r
+        <exclusion>\r
+          <groupId>cglib</groupId>\r
+          <artifactId>cglib-full</artifactId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </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>
+