From: jenkins <jenkins-int@bgbm.org>
Date: Wed, 15 Jul 2015 15:56:02 +0000 (+0200)
Subject: Merge branch 'release/3.7.0'
X-Git-Tag: 3.7.0~6
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a9f32ef0d94675a7ebc7160dcef25cff8a3b3a15?hp=-c

Merge branch 'release/3.7.0'

Conflicts:
	eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.cdmlib/.classpath
	eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.feature.platform/feature.xml
	eu.etaxonomy.taxeditor.feature/feature.xml
	eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
---

a9f32ef0d94675a7ebc7160dcef25cff8a3b3a15
diff --combined eu.etaxonomy.taxeditor.cdmlib/.classpath
index deca8d664,3a6eebf55..20cffab12
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -1,9 -1,18 +1,17 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.7.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.7.0.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
  	<classpathentry kind="src" path="src/main/java"/>
  	<classpathentry kind="src" path="src/main/resources"/>
 -	<classpathentry kind="src" path="src/test/java/"/>
  	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
@@@ -192,26 -201,10 +200,10 @@@
  	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
 -	<classpathentry kind="output" path="bin"/>
 +	<classpathentry kind="output" path="target/classes"/>
  </classpath>
diff --combined eu.etaxonomy.taxeditor.feature/feature.xml
index 26fe7a261,53ffb9ba8..92d7ebe7c
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@@ -2,7 -2,7 +2,11 @@@
  <feature
        id="eu.etaxonomy.taxeditor.feature"
        label="Taxonomic Editor"
++<<<<<<< HEAD
 +      version="3.6.1"
++=======
+       version="3.7.0"
++>>>>>>> refs/heads/release/3.7.0
        provider-name="EDIT"
        plugin="eu.etaxonomy.taxeditor.application"
        os="linux,macosx,win32"
diff --combined pom.xml
index e417de6c9,abed873ce..d0dc7c4ba
--- a/pom.xml
+++ b/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
    </prerequisites>
    <groupId>eu.etaxonomy</groupId>
    <artifactId>taxeditor-parent</artifactId>
-   <version>3.6.1</version>
+   <version>3.7.0</version>
    <name>EDIT Taxonomic Editor</name>
    <description>The Taxonomic Editor for EDIT's platform for
      cybertaxonomy
@@@ -18,10 -18,10 +18,10 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <cdmlib.version>3.6.1</cdmlib.version>
+     <cdmlib.version>3.7.0</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.22.0</tycho.version>
-     <taxeditor.version>3.6.1</taxeditor.version>
+     <taxeditor.version>3.7.0</taxeditor.version>
      <update.dir>snapshot</update.dir>
    </properties>
    <modules>
@@@ -82,7 -82,7 +82,7 @@@
          <role>Java Developer</role>
          <role>Architect</role>
        </roles>
 -      <url />
 +      <url/>
      </developer>
      <developer>
        <!-- your SVN account id please! -->
@@@ -100,7 -100,7 +100,7 @@@
          <role>Java Developer</role>
          <role>Architect</role>
        </roles>
 -      <url />
 +      <url/>
      </developer>
    </developers>
    <issueManagement>
@@@ -330,7 -330,7 +330,7 @@@
        <plugin>
          <groupId>external.atlassian.jgitflow</groupId>
          <artifactId>jgitflow-maven-plugin</artifactId>
-         <version>1.0-m4.3</version>
+         <version>1.0-m6</version>
          <configuration>
            <pushHotfixes>true</pushHotfixes>
            <pushReleases>true</pushReleases>
@@@ -338,6 -338,17 +338,17 @@@
            <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>