X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/c4e56bf58f7eb089d7afd4950f20cca76ba0b9bb..e5668830c56900b331ec08172b150bbfdc2bce1e:/pom.xml

diff --git a/pom.xml b/pom.xml
index 3c632cc8f2..c596a25ac1 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.1.1-SNAPSHOT</version>
+  <version>4.11.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>
@@ -24,9 +24,11 @@
   </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>
@@ -35,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>
@@ -45,12 +46,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>
@@ -184,7 +186,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>
@@ -224,7 +226,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>
@@ -286,11 +288,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>
@@ -327,7 +330,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>
@@ -359,6 +362,7 @@
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <executions>
           <execution>
@@ -442,8 +446,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>
@@ -527,6 +531,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>
@@ -537,6 +550,7 @@
         <version>2.7</version>
         <configuration>
           <detectLinks>true</detectLinks>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
       </plugin>
       <plugin>
@@ -614,15 +628,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>
@@ -901,6 +915,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>
@@ -1097,7 +1116,12 @@
       <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>
@@ -1253,6 +1277,8 @@
           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>
@@ -1368,6 +1394,16 @@
         <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>
@@ -1469,38 +1505,38 @@
         <version>2.4.0</version>
       </dependency>
       
-            <!-- ******* DATABASES DRIVER ******* -->
-      <!-- 
-            IMPORTANT:
-            Any driver dependency listed here must be excluded from the 
-            cdmlib-remote depedency in cdmlib-remote-webapp
-       -->
-      <dependency>
-        <!-- SQL Server and Sybase -->
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>1.3.1</version>
-      </dependency>
+      <!-- ******* DATABASES DRIVER ******* -->
       <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
-        <version>${mysql.version}</version>
+        <version>5.1.38</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>
+        <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>
@@ -1511,14 +1547,7 @@
         <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>
-      
+    </dependency>   -->      
     </dependencies>
   </dependencyManagement>
 </project>