X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/345e604957076409c04088f61d72a2ea73c1d1d1..8b00105b5882dc9e8606ce6cd4933d4dc7a5cd0a:/pom.xml?ds=sidebyside

diff --git a/pom.xml b/pom.xml
index 3ecb0134ee..9931adadc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>4.5.1-SNAPSHOT</version>
+  <version>5.3.0-SNAPSHOT</version>
   <name>CDM Library</name>
   <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
   <url>http://cybertaxonomy.eu/cdmlib/</url>
@@ -21,10 +21,11 @@
     <module>cdmlib-remote</module>
     <module>cdmlib-print</module>
     <module>cdmlib-remote-webapp</module>
+    <module>cdmlib-cache</module>
   </modules>
   <properties>    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.codelevel>1.7</java.codelevel>
+    <java.codelevel>1.8</java.codelevel>
     <spring.version>4.2.4.RELEASE</spring.version>
     <spring-security.version>4.0.3.RELEASE</spring-security.version>
     <spring-security-oauth2.version>2.0.11.RELEASE</spring-security-oauth2.version>
@@ -46,12 +47,13 @@
 	<jaxb.version>2.2.11</jaxb.version>
 	<cglib.version>3.2.0</cglib.version>
 	<aspectj.version>1.8.8</aspectj.version>
+    <javadoc.opts>-Xdoclint:none</javadoc.opts>
   </properties>
   
   <scm>
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>
-    <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</developerConnection>
-    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib</url>
+    <connection>scm:git:https://dev.e-taxonomy.eu/git/cdmlib.git</connection>
+    <developerConnection>scm:git:ssh://git@dev.e-taxonomy.eu/var/git/cdmlib.git</developerConnection>
+    <url>https://dev.e-taxonomy.eu/gitweb/cdmlib.git/tree</url>
   </scm>
   
   <prerequisites>
@@ -87,27 +89,9 @@
   </licenses>
   <organization>
     <name>EDIT</name>
-    <url>http://www.e-taxonomy.eu/</url>
+    <url>https://cybertaxonomy.eu/</url>
   </organization>
   <developers>
-    <developer>
-      <!-- your SVN account id please! -->
-      <id>ben.clark</id>
-      <name>
-                Ben Clark
-            </name>
-      <email>b.clark [at] kew.org</email>
-      <organization>
-                Royal Botanic Gardens, Kew
-            </organization>
-      <organizationUrl>http://www.kew.org/computing/</organizationUrl>
-      <timezone>0</timezone>
-      <roles>
-        <role>Architect</role>
-        <role>Java Developer</role>
-      </roles>
-      <url />
-    </developer>
     <developer>
       <!-- your SVN account id please! -->
       <id>a.kohlbecker</id>
@@ -129,11 +113,11 @@
     </developer>
     <developer>
       <!-- your SVN account id please! -->
-      <id>c.mathew</id>
+      <id>k.luther</id>
       <name>
-                Cherian Mathew 
+                Katja Luther
             </name>
-      <email>c.mathew [at] bgbm.org</email>
+      <email>k.luther [at] bgbm.org</email>
       <organization>
                 Botanical Garden Botanical Museum Berlin
             </organization>
@@ -146,37 +130,37 @@
     </developer>
     <developer>
       <!-- your SVN account id please! -->
-      <id>k.luther</id>
+      <id>a.mueller</id>
       <name>
-                Katja Luther
+                Andreas Müller
             </name>
-      <email>k.luther [at] bgbm.org</email>
+      <email>a.mueller [at] bgbm.org</email>
       <organization>
                 Botanical Garden Botanical Museum Berlin
             </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
+        <role>Architect</role>
         <role>Java Developer</role>
+        <role>Release Manager</role>
       </roles>
       <url />
     </developer>
-    <developer>
+	   <developer>
       <!-- your SVN account id please! -->
-      <id>a.mueller</id>
+      <id>p.plitzner</id>
       <name>
-                Andreas Müller
+               Patrick Plitzner
             </name>
-      <email>a.mueller [at] bgbm.org</email>
+      <email>p.plitzner [at] bgbm.org</email>
       <organization>
                 Botanical Garden Botanical Museum Berlin
             </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
-        <role>Architect</role>
         <role>Java Developer</role>
-        <role>Release Manager</role>
       </roles>
       <url />
     </developer>
@@ -185,7 +169,7 @@
     </contributors -->
   <issueManagement>
     <system>Trac</system>
-    <url>http://dev.e-taxonomy.eu/trac/</url>
+    <url>https://dev.e-taxonomy.eu/redmine/projects/edit</url>
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
@@ -225,7 +209,7 @@
     <!-- the cdm internal repository -->
     <repository>
       <id>EditRepository</id>
-      <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>http://cybertaxonomy.eu/mavenrepo/</url>
     </repository>
     <!-- apache incubating repository -->
     <repository>
@@ -287,11 +271,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+		<version>2.3.2</version> 
         <configuration>
           <source>${java.codelevel}</source>
           <target>${java.codelevel}</target>
           <encoding>UTF-8</encoding>  <!-- necessary? should be covered by project. properties source encoding -->
+		  <!-- to increase stacksize see #6404 -->
         </configuration>
       </plugin>
       <plugin>
@@ -328,7 +313,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.3</version>
         <configuration>
           <locales>en</locales>
           <outputEncoding>UTF-8</outputEncoding>
@@ -360,6 +345,7 @@
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <executions>
           <execution>
@@ -443,8 +429,8 @@
           <fromDir>${project.build.directory}/docbkx/</fromDir>
           <includes>**/*</includes>
           <excludes />
-          <url>scpexe://wp5.e-taxonomy.eu</url>
-          <serverId>wp5.e-taxonomy.eu</serverId>
+          <url>scpexe://cybertaxonomy.eu</url>
+          <serverId>cybertaxonomy.eu</serverId>
           <toDir>var/www/wp5.e-taxonomy.eu/cdmlib/reference/${project.version}</toDir>
         </configuration>
         <executions>
@@ -528,6 +514,15 @@
         <version>1.0-beta-2</version>
       </extension>
     </extensions>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
+      </plugins>  
+    </pluginManagement>
   </build>
   <reporting>
     <plugins>
@@ -538,6 +533,7 @@
         <version>2.7</version>
         <configuration>
           <detectLinks>true</detectLinks>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
       </plugin>
       <plugin>
@@ -615,15 +611,15 @@
   <!-- DISTRIBUTION MANAGEMENT -->
   <distributionManagement>
     <site>
-      <id>wp5.e-taxonomy.eu</id>
+      <id>cybertaxonomy.eu</id>
       <name>CDM Library Website</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/</url>
+      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/</url>
     </site>
     <repository>
       <uniqueVersion>false</uniqueVersion>
-      <id>wp5.e-taxonomy.eu</id>
+      <id>cybertaxonomy.eu</id>
       <name>Edit Maven Repository</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
       <layout>default</layout>
     </repository>
   </distributionManagement>
@@ -902,6 +898,11 @@
         <artifactId>commons-lang</artifactId>
         <version>2.6</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.5</version>
+      </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
@@ -1529,7 +1530,12 @@
         <groupId>ojdbc</groupId>
         <artifactId>ojdbc</artifactId>
         <version>14</version>
-    </dependency>   -->      
-    </dependencies>
+        </dependency>   -->      
+      <dependency>
+        <groupId>com.taskadapter</groupId>
+        <artifactId>redmine-java-api</artifactId>
+        <version>3.1.0</version>
+      </dependency>
+    </dependencies>    
   </dependencyManagement>
 </project>