X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/5e692cf16882c6c73eed83d16765a8878d4ff422..58ed6b7d27c127e0485cad3464bde896da3c47de:/pom.xml

diff --git a/pom.xml b/pom.xml
index 40e8e132b..084411417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,11 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.2.3</maven>
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>5.9.1</version>
+  <version>5.15.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -18,17 +18,19 @@
   <properties>
     <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>5.9.0</cdmlib.version>
+    <cdmlib.version>5.15.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <!-- Increasing tycho above 0.22.0 will fail for the macosx build because 
       for higher version numbers tycho needs to be build against Eclipse Mars or 
       higher -->
     <tycho.version>1.0.0</tycho.version>
-    <taxeditor.version>5.9.0</taxeditor.version>
+    <taxeditor.version>5.15.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>
     <javadoc.opts>-Xdoclint:none</javadoc.opts>
+    <httpcomponents.version>4.5.11</httpcomponents.version>
+    <jetty-version>9.4.26.v20200117</jetty-version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -46,6 +48,13 @@
     <module>eu.etaxonomy.taxeditor.feature.platform</module>
     <module>eu.etaxonomy.taxeditor.feature</module>
     <module>eu.etaxonomy.taxeditor</module>
+    <!-- 
+        By now tests come after the product build!
+        
+        The original reason for this is unclear, but 
+        momentarily the test ProgressMonitorServiceTest.testMonitLongRunningMethodWithException()
+        frequently fails for unknown reasons and would block building the products.
+    -->
     <module>eu.etaxonomy.taxeditor.test</module>
   </modules>
   <scm>
@@ -352,7 +361,7 @@
             <id>attach-sources</id>
             <phase>verify</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>jar-no-fork</goal>
             </goals>
           </execution>
         </executions>
@@ -531,6 +540,11 @@
         <artifactId>itextpdf</artifactId>
         <version>5.5.8</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpcomponents.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>