Bug in NomenclaturalCode

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

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 4da29659c46060ed92e4da57124b93501274ebf5..a125464de975ded11f7e5c9042e0fd5c5da3c61d 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>1.3</version>
+    <version>2.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -23,24 +23,64 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
+        <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
+            <id>aspectj-main</id>
             <goals>
-              <goal>compile</goal>
-              <goal>test-compile</goal>
+              <goal>run</goal>
             </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <includes>
-            <include>**/cdm/**/*.java</include>
-            <include>**/*.aj</include>
-          </includes>
-        </configuration>
+            <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 -->
@@ -76,7 +116,6 @@
   </build>
   
   <dependencies>
-
        <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-commons</artifactId>
@@ -110,13 +149,21 @@
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
     <dependency>
-      <groupId>aspectj</groupId>
+      <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>
@@ -129,6 +176,32 @@
       <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 -->
     <!--