Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-09-14 22:54:53 +0000
committerMatthias Sohn2015-09-14 23:05:45 +0000
commit8f489d8dd6190226231ba51fc9dce9d2aebc2a34 (patch)
treefc9ad807a721d92a3109ab5ed3eed22398531d9c
parentb46c4463959f45b32e471e4c10b5ddc71232949e (diff)
parent116d26d12151d8e780105633a79f6460f1f6923c (diff)
downloadjgit-8f489d8dd6190226231ba51fc9dce9d2aebc2a34.tar.gz
jgit-8f489d8dd6190226231ba51fc9dce9d2aebc2a34.tar.xz
jgit-8f489d8dd6190226231ba51fc9dce9d2aebc2a34.zip
Merge branch 'stable-4.0'
Change-Id: I1b448ce01f4cdfa62611da9e4d37321a4af9c12d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target6
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd2
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150821153341-Mars.tpd (renamed from org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150519210750-Mars.tpd)8
-rw-r--r--org.eclipse.jgit.packaging/pom.xml2
-rw-r--r--pom.xml2
5 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
index 6d3084c940..20674827b1 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
@@ -45,8 +45,8 @@
<unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="com.jcraft.jsch" version="0.1.51.v201410302000"/>
- <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
+ <unit id="com.jcraft.jsch" version="0.1.53.v201508180515"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.53.v201508180515"/>
<unit id="org.junit" version="4.11.0.v201303080030"/>
<unit id="org.junit.source" version="4.11.0.v201303080030"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
@@ -57,7 +57,7 @@
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
index 9c5abfea6c..cdf24b551c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd
@@ -1,7 +1,7 @@
target "jgit-4.5" with source configurePhase
include "projects/jetty-9.2.13.tpd"
-include "orbit/R20150519210750-Mars.tpd"
+include "orbit/R20150821153341-Mars.tpd"
location "http://download.eclipse.org/releases/mars/" {
org.eclipse.osgi lazy
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150519210750-Mars.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150821153341-Mars.tpd
index dcdb467f87..cb638074af 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150519210750-Mars.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150821153341-Mars.tpd
@@ -1,7 +1,7 @@
-target "R20150519210750-Mars" with source configurePhase
+target "R20150821153341-Mars" with source configurePhase
// see http://download.eclipse.org/tools/orbit/downloads/
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/" {
org.apache.ant [1.9.4.v201504302020,1.9.4.v201504302020]
org.apache.ant.source [1.9.4.v201504302020,1.9.4.v201504302020]
org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400]
@@ -24,8 +24,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2015051921075
org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915]
org.mockito [1.8.4.v201303031500,1.8.4.v201303031500]
org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500]
- com.jcraft.jsch [0.1.51.v201410302000,0.1.51.v201410302000]
- com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000]
+ com.jcraft.jsch [0.1.53.v201508180515,0.1.53.v201508180515]
+ com.jcraft.jsch.source [0.1.53.v201508180515,0.1.53.v201508180515]
org.junit [4.11.0.v201303080030,4.11.0.v201303080030]
org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030]
javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 095d46f8a4..d2b355e0ff 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -229,7 +229,6 @@
<profile>
<id>platform-kepler</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>kepler</value>
@@ -254,6 +253,7 @@
<profile>
<id>platform-mars</id>
<activation>
+ <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>mars</value>
diff --git a/pom.xml b/pom.xml
index 082611eef4..9fcfbdd9c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
<jgit-last-release-version>4.0.0.201506090130-r</jgit-last-release-version>
- <jsch-version>0.1.51</jsch-version>
+ <jsch-version>0.1.53</jsch-version>
<javaewah-version>0.7.9</javaewah-version>
<junit-version>4.11</junit-version>
<test-fork-count>1C</test-fork-count>

Back to the top