X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/e48f844ffd7317026172c81fbd2726b8e2bfb420..cabf56c785bd7201ba934e1fac695229a3ffe3d4:/pom.xml

diff --git a/pom.xml b/pom.xml
index 5faf642af..c298cba56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,25 +1,27 @@
 <?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.3.8-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
-  <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
-  <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/</url>
+  <description>The Taxonomic Editor for EDIT's platform for
+    cybertaxonomy
+  </description>
+  <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/
+  </url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.3.8-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
-    <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.3.8-SNAPSHOT</taxeditor.version>
+    <tycho.version>0.22.0</tycho.version>
+    <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
   </properties>
   <modules>
@@ -34,24 +36,26 @@
     <module>eu.etaxonomy.taxeditor.feature.platform</module>
     <module>eu.etaxonomy.taxeditor.feature</module>
     <module>eu.etaxonomy.taxeditor</module>
-
   </modules>
   <scm>
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/</connection>
-    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/taxeditor/</developerConnection>
+    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/
+    </connection>
+    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/taxeditor/
+    </developerConnection>
     <url>https://dev.e-taxonomy.eu/trac/browser/trunk/taxeditor/</url>
   </scm>
   <mailingLists>
     <mailingList>
       <name>EDIT Taxonomic Editor</name>
       <subscribe>
-				edit-taxonomic-editor+subscribe@googlegroups.com
-			</subscribe>
+        edit-taxonomic-editor+subscribe@googlegroups.com
+      </subscribe>
       <unsubscribe>
-				edit-taxonomic-editor+unsubscribe@googlegroups.com
-			</unsubscribe>
+        edit-taxonomic-editor+unsubscribe@googlegroups.com
+      </unsubscribe>
       <post>edit-taxonomic-editor@googlegroups.com</post>
-      <archive>http://groups.google.com/group/edit-taxonomic-editor/topics</archive>
+      <archive>http://groups.google.com/group/edit-taxonomic-editor/topics
+      </archive>
     </mailingList>
   </mailingLists>
   <licenses>
@@ -66,37 +70,37 @@
       <!-- your SVN account id please! -->
       <id>a.kohlbecker</id>
       <name>
-			Andreas Kohlbecker
-			</name>
+        Andreas Kohlbecker
+      </name>
       <email>a.kohlbecker [at] bgbm.org</email>
       <organization>
-				Botanic Garden Botanical Museum Berlin
-			</organization>
+        Botanic Garden Botanical Museum Berlin
+      </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
     <developer>
       <!-- your SVN account id please! -->
       <id>a.mueller</id>
       <name>
-				Andreas Müller
-			</name>
+        Andreas Müller
+      </name>
       <email>a.mueller [at] bgbm.org</email>
       <organization>
-				Botanic Garden Botanical Museum Berlin
-			</organization>
+        Botanic Garden Botanical Museum Berlin
+      </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
   </developers>
   <issueManagement>
@@ -105,7 +109,8 @@
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/</url>
+    <url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/
+    </url>
   </ciManagement>
   <!-- **** REPOSITORIES **** -->
   <profiles>
@@ -131,38 +136,6 @@
         </repository>
       </repositories>
     </profile>
-    <profile>
-      <!-- Upload the repo to the server -->
-      <id>uploadRepo</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>wagon-maven-plugin</artifactId>
-            <version>1.0-beta-3</version>
-            <!-- Problems with the wagon-maven-plugin have been encounterd 
-              on Windows, it should work properly on linux though. -->
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>upload</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <fromDir>eu.etaxonomy.taxeditor/target/repository</fromDir>
-              <url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/update/${update.dir}</url>
-              <includes>binary/*,content.jar,artifacts.jar,**/eu.etaxonomy.*.jar</includes>
-              <!-- Comment out the above and uncomment the below to upload 
-                all jars -->
-              <!-- <includes>**/*</includes> -->
-              <serverId>wp5.e-taxonomy.eu</serverId>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <repositories>
     <!-- the cdm internal repository -->
@@ -173,12 +146,17 @@
     <repository>
       <id>eclipse-indigo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/</url>
+      <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+      </url>
     </repository>
+    <!-- The nebula repository (retention period 2 years starting Q32014) 
+      set here is an archived one so as to have a stable version of the jar when 
+      building the editor . Refer to #4452 for details -->
     <repository>
       <id>eclipse-nebula</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/technology/nebula/snapshot/</url>
+      <url>http://download.eclipse.org/technology/nebula/archives/Q32014/release/
+      </url>
     </repository>
     <repository>
       <id>eclipse-swtbot</id>
@@ -349,7 +327,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>
@@ -436,14 +436,15 @@
     <site>
       <id>wp5.e-taxonomy.eu</id>
       <name>EDIT Taxonomic Editor</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/</url>
+      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
+      </url>
     </site>
     <repository>
       <uniqueVersion>false</uniqueVersion>
       <id>wp5.e-taxonomy.eu</id>
       <name>Edit Maven Repository</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
+      </url>
     </repository>
   </distributionManagement>
-
 </project>