<parent>
<artifactId>cdmlib-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>3.0.4</version>
- <relativePath>pom.xml</relativePath>
+ <version>3.2.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</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/tags/cdmlib/cdmlib-parent-3.0.4/cdmlib-model</connection>
- <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.0.4/cdmlib-model</developerConnection>
- <url>scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.0.4/cdmlib-model</url>
+ <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-model/</connection>
+ <developerConnection>scm:svn:http://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>
<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">
+ <iajc verbose="false" source="${java.codelevel}" destDir="target/classes" aspectPathRef="aspectPath">
<classpath refid="maven.plugin.classpath" />
<classpath refid="maven.compile.classpath" />
<sourceroots>
<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">
+ <iajc verbose="false" source="${java.codelevel}" destDir="target/test-classes">
<classpath refid="maven.plugin.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.test.classpath" />
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.6.3</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.3</version>
+ <version>1.7.1</version>
</dependency>
</dependencies>
</plugin>
<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>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- </dependency>
+<!-- Part of hibernate-core since 3.6 -->
+<!-- <dependency> -->
+<!-- <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>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
+ <artifactId>hibernate-search-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-core</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-database</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-dbmaintainer</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-dbunit</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-easymock</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-mock</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-inject</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-orm</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- <exclusions> -->
+<!-- <exclusion> -->
+<!-- <groupId>javax.persistence</groupId> -->
+<!-- <artifactId>persistence-api</artifactId> -->
+<!-- </exclusion> -->
+<!-- </exclusions> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.unitils</groupId> -->
+<!-- <artifactId>unitils-spring</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.jdbc</artifactId>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<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>
- <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>
+ <groupId>org.jadira.usertype</groupId>
+ <artifactId>usertype.jodatime</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<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.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file