Fix potential NPE

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index dfc37c48a9280e64aa4123150f79d44aecf9bc3a..739f758f77a63a9a9c600320c11a4eb81a07f9a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>4.2.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -17,13 +16,26 @@
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
-    <java.codelevel>1.6</java.codelevel>
+    <java.codelevel>1.7</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.5.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>4.2.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.5.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>4.2.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
+    <unitils.version>3.4.2</unitils.version>
+    <log4j.version>1.2.17</log4j.version>
+    <!-- data base driver related properties -->
+    <mysql.version>5.1.38</mysql.version>
+    <h2.version>1.4.190</h2.version>
+    <!-- 
+      IMPORTANT!!!
+      c3p0.version must exactly match the version as 
+      set in cdmlib-parent pom.xml
+    -->
+    <c3p0.version>0.9.5.2</c3p0.version>
+    <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->
+    <mchange-commons-java.version>0.2.11</mchange-commons-java.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -33,9 +45,13 @@
     <module>eu.etaxonomy.taxeditor.bulkeditor</module>
     <module>eu.etaxonomy.taxeditor.printpublisher</module>
     <module>eu.etaxonomy.taxeditor.help</module>
+    <module>eu.etaxonomy.taxeditor.molecular</module>
+    <module>eu.etaxonomy.taxeditor.molecular.lib</module>
+    <module>eu.etaxonomy.taxeditor.webapp</module>
     <module>eu.etaxonomy.taxeditor.application</module>
     <module>eu.etaxonomy.taxeditor.feature.platform</module>
     <module>eu.etaxonomy.taxeditor.feature</module>
+    <module>eu.etaxonomy.taxeditor.feature.jre.linux64</module>
     <module>eu.etaxonomy.taxeditor</module>
   </modules>
   <scm>
@@ -83,7 +99,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
     <developer>
       <!-- your SVN account id please! -->
@@ -101,7 +117,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
   </developers>
   <issueManagement>
@@ -137,44 +153,6 @@
         </repository>
       </repositories>
     </profile>
-    <profile>
-      <!-- Installs the jre bundle, which is done by 1) copying the jre directories 
-        as set in the ~/.m2/settings.xml to the corresponding folders in the feature 
-        dir 2) adding the -vm jre/bin option the eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -->
-
-      <id>bundleJre</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <id>checkJREBundleOS</id>
-                <phase>validate</phase>
-                <configuration>
-                  <target>
-                    <echo>Checking if JRE bundle can be configured</echo>
-                    <fail
-                      message="Copy of JRE folder possible only on Unix (and Unix like systems)">
-                     <condition>
-                        <not>                          
-                            <os family="unix" />                          
-                        </not>
-                      </condition>
-                    </fail>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <repositories>
     <!-- the cdm internal repository -->
@@ -266,8 +244,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
@@ -366,6 +344,29 @@
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>external.atlassian.jgitflow</groupId>
+        <artifactId>jgitflow-maven-plugin</artifactId>
+        <version>1.0-m6</version>
+        <configuration>
+          <pushHotfixes>true</pushHotfixes>
+          <pushReleases>true</pushReleases>
+          <enableSshAgent>true</enableSshAgent>
+          <allowSnapshots>true</allowSnapshots>
+          <allowUntracked>true</allowUntracked>
+        </configuration>
+        <dependencies>
+          <!-- 
+                upgrading dependency jsch.agent.version of jgit-flow plugin to 0.1.53 
+                in order have ssl key exchange algorithms compatible with openssh 6.7 
+             -->
+          <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.53</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
     <extensions>
       <extension>