Updating develop poms back to pre merge state
[cdmlib.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index c581b41eaa8d75e18ac77aca20c97bb8ba7f92e1..580492a8df10c8edebd5b78c4b4cee693666905b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>4.9.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>
@@ -12,7 +12,8 @@
   <modules>
     <module>cdmlib-commons</module>
     <module>cdmlib-model</module>
-       <module>cdmlib-test</module>
+       <module>cdmlib-db</module>
+    <module>cdmlib-test</module>
     <module>cdmlib-persistence</module>
     <module>cdmlib-services</module>
     <module>cdmlib-ext</module>
   </modules>
   <properties>    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.codelevel>1.6</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>
+    <spring-cloud.version>1.1.3.RELEASE</spring-cloud.version>
        <hibernate.version>5.0.7.Final</hibernate.version>
        <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
     <hibernate-search.version>5.5.2.Final</hibernate-search.version>
@@ -34,7 +37,6 @@
     <hsqldb.version>2.3.3</hsqldb.version>
        <!-- <hsqldb.version>1.8.0.10</hsqldb.version>  -->
        <!-- 1.8.0.10, 1.9.0-rc6 (manually build only for debugging) -->
-       <mysql.version>5.1.38</mysql.version>
     <httpcomponents.version>4.5.1</httpcomponents.version>
     <doxia.version>1.6</doxia.version>
     <poi.version>3.13</poi.version>
        <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>
     <maven>3.0.5</maven>
   </prerequisites>
   
-  <mailingLists>
-    <mailingList>
-      <name>dev-edit</name>
-      <subscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/suboptions/dev-edit
+    <mailingLists>
+        <mailingList>
+            <name>EDIT Platform Developers</name>
+            <subscribe>
+                https://lists.fu-berlin.de/listinfo/editplatformdevelopers#subscribe
             </subscribe>
-      <unsubscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/signoff/dev-edit
+            <unsubscribe>
+                https://lists.fu-berlin.de/listinfo/editplatformdevelopers#options
             </unsubscribe>
-      <post>dev-edit@mnhn.fr</post>
-      <archive>https://listes.mnhn.fr/wwsympa.fcgi/arc/dev-edit</archive>
-    </mailingList>
-    <mailingList>
-      <name>cdm-edit</name>
-      <post>cdm-edit@mnhn.fr</post>
-      <subscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/suboptions/cdm-edit
+        </mailingList>
+        <mailingList>
+            <name>EDIT User</name>
+            <subscribe>
+                https://lists.fu-berlin.de/listinfo/edituser#subscribe
             </subscribe>
-      <unsubscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/signoff/cdm-edit
+            <unsubscribe>
+                https://lists.fu-berlin.de/listinfo/edituser#options
             </unsubscribe>
-      <archive>https://listes.mnhn.fr/wwsympa.fcgi/arc/cdm-edit</archive>
-    </mailingList>
-  </mailingLists>
+        </mailingList>
+    </mailingLists>
   <licenses>
     <license>
       <name>Mozilla Public License Version 1.1</name>
     </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>
     <!-- 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>
       <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>
       <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>
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <executions>
           <execution>
           <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>
         <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>
         <version>2.7</version>
         <configuration>
           <detectLinks>true</detectLinks>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
       </plugin>
       <plugin>
   <!-- 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>
         <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>
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <version>2.0.2</version>
+        <!-- 
+            WARNING: do not upgrade to later versions 2.0.x of xml-apis
+            since these are effectivly reloated to the early beta version
+            1.0.b2
+        -->
+        <version>1.4.01</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
           version in cdm-server pom.xml must be changed 
           the same otherwise db connections through jndi 
           will not work!
+                 NOTE: not so critical anymore as we use cdmlib-db
+                 now for both projects
         -->
         <version>0.9.5.2</version>
       </dependency>
         <artifactId>spring-security-web</artifactId>
         <version>${spring-security.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.springframework.security.oauth</groupId>
+      <artifactId>spring-security-oauth2</artifactId>
+        <version>${spring-security-oauth2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-security</artifactId>
+        <version>${spring-security.version}</version>
+      </dependency>
 
       <!-- ******* SERVLET/JSP/JSF ******* -->
       <dependency>
         <artifactId>javax.servlet-api</artifactId>
         <version>3.1.0</version>
       </dependency>
-      <!-- ******* DATABASES DRIVER ******* -->
-      <dependency>
-        <!-- SQL Server and Sybase -->
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>1.3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>mysql</groupId>
-        <artifactId>mysql-connector-java</artifactId>
-        <version>${mysql.version}</version>
-      </dependency>
-         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4-1206-jdbc4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
-      </dependency>
-      <!--for sqlserver2008 and sqlserver2005 -->
-      <dependency>
-        <groupId>com.microsoft.sqlserver</groupId>
-        <artifactId>jdbc4</artifactId>
-        <version>2.0</version>
-      </dependency>
 
-      <dependency>
-        <groupId>oracle</groupId>
-        <artifactId>ojdbc14</artifactId>
-        <version>10.2.0.4.0</version>
-      </dependency>
-         <!--    <dependency>
-               <groupId>ojdbc</groupId>
-               <artifactId>ojdbc</artifactId>
-               <version>14</version>
-       </dependency>   -->
-      <dependency>
-        <groupId>com.h2database</groupId>
-        <artifactId>h2</artifactId>
-        <!-- <version>1.1.115</version> -->
-        <version>1.4.190</version>
-      </dependency>
       <!-- yourkit profiler api controller (used in ..) -->
       <dependency>
         <groupId>com.yourkit</groupId>
         <artifactId>yjp-controller-api-redist</artifactId>
-        <version>9.0.8</version>
-        <!-- <version>10.0.6</version> TODO find repo or put into our own -->
+        <version>2015-build-15086</version>
         <scope>test</scope>
       </dependency>
       <!-- For Validation -->
                <version>${hibernate-validator.version}</version>
          </dependency>
          
-      <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
-        <version>2.1.4</version>
-      </dependency>
       <!-- for ikey-plus -->
       <dependency>
         <groupId>identificationKeyAPI</groupId>
       </dependency> 
       <!-- END of dependencies for swagger-springmvc, added explicitely -->
       <dependency>
-          <groupId>io.springfox</groupId>
-          <artifactId>springfox-swagger2</artifactId>
-          <version>2.3.1</version>
+        <groupId>io.springfox</groupId>
+        <artifactId>springfox-swagger2</artifactId>
+        <version>2.4.0</version>
+      </dependency>
+      
+      <!-- ******* DATABASES DRIVER ******* -->
+      <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>5.1.38</version>
+      </dependency>
+      <dependency>
+         <groupId>org.postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+         <version>9.4-1206-jdbc4</version>
+      </dependency>
+         <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>1.4.190</version>
+      </dependency>
+      <!--for sqlserver2008 and sqlserver2005 -->
+      <dependency>
+        <groupId>com.microsoft.sqlserver</groupId>
+        <artifactId>jdbc4</artifactId>
+        <version>2.0</version>
+      </dependency>
+         <dependency>
+        <groupId>org.hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>${hsqldb.version}</version>
+      </dependency>
+      <dependency>
+        <!-- SQL Server and Sybase -->
+        <groupId>net.sourceforge.jtds</groupId>
+        <artifactId>jtds</artifactId>
+        <version>1.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>oracle</groupId>
+        <artifactId>ojdbc14</artifactId>
+        <version>10.2.0.4.0</version>
       </dependency>
+      <!--    <dependency>
+        <groupId>ojdbc</groupId>
+        <artifactId>ojdbc</artifactId>
+        <version>14</version>
+    </dependency>   -->      
     </dependencies>
   </dependencyManagement>
 </project>