more tests

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

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 19e03efc31015d57a0bf7a48a005fb5dab34a518..c1ff4e01b4d43392990949558202d445c86214e6 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>2.1</version>
+    <version>2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-model</artifactId>
@@ -17,63 +19,69 @@
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-<!--        <executions>-->
-<!--          <execution>-->
-<!--            <id>aspectj-main</id>-->
-<!--            <phase>process-sources</phase>-->
-<!--            <goals>-->
-<!--              <goal>run</goal>-->
-<!--            </goals>-->
-<!--            <configuration>-->
-<!--              <tasks>-->
-<!--                <taskdef classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">-->
-<!--                  <classpath refid="maven.plugin.classpath" />-->
-<!--                </taskdef>-->
-<!--                <iajc verbose="false" source="1.5" destDir="target/classes">-->
-<!--                  <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>-->
-<!--            <phase>process-test-sources</phase>-->
-<!--            <goals>-->
-<!--              <goal>run</goal>-->
-<!--            </goals>-->
-<!--            <configuration>-->
-<!--              <tasks>-->
-<!--                <taskdef classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">-->
-<!--                  <classpath refid="maven.plugin.classpath" />-->
-<!--                </taskdef>-->
-<!--                <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>
+        <executions>
+          
+          <execution>
+            <id>aspectj-main</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <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 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>
+            <id>aspectj-test</id>
+            <phase>process-test-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <taskdef classname="org.aspectj.tools.ant.taskdefs.AjcTask" name="iajc">
+                  <classpath refid="maven.plugin.classpath" />
+                </taskdef>
+                <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>
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.5.4</version>
+            <version>1.6.3</version>
           </dependency>
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.5.4</version>
+            <version>1.6.3</version>
           </dependency>
-        </dependencies>
+      </dependencies>
       </plugin>
     </plugins>
   </build>
@@ -130,13 +138,21 @@
       <groupId>org.unitils</groupId>
       <artifactId>unitils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.jdbc</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
+      <artifactId>org.springframework.test</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
+      <artifactId>org.springframework.aspects</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sf.opencsv</groupId>
@@ -145,6 +161,10 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
+    </dependency>
+       <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
@@ -189,5 +209,25 @@
       <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>
\ No newline at end of file