From: jenkins <jenkins-int@bgbm.org>
Date: Fri, 17 Jul 2015 10:00:11 +0000 (+0200)
Subject: Correct for develop reset
X-Git-Tag: 3.7.0~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b54196597e88a2a49299edc93b5016fa6bfa7d7c?hp=-c

Correct for develop reset
---

b54196597e88a2a49299edc93b5016fa6bfa7d7c
diff --combined pom.xml
index abed873ce,6c4f76de6..7e6fc8626
--- a/pom.xml
+++ b/pom.xml
@@@ -19,7 -19,6 +19,6 @@@
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <cdmlib.version>3.7.0</cdmlib.version>
-     <!-- TODO can we use project.version ????? -->
      <tycho.version>0.22.0</tycho.version>
      <taxeditor.version>3.7.0</taxeditor.version>
      <update.dir>snapshot</update.dir>
@@@ -338,17 -337,6 +337,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>