summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2013-08-28 00:13:03 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2013-08-28 01:10:02 +0200
commite9bab213f1569d3d01fce9afcb60dbfed7c266a9 (patch)
tree472c33c3b559dbb113f42af26b0cc95a79757cce
parent99d981ce35d66b89cdd5d539513bf0ec070b7b34 (diff)
downloadjgit-e9bab213f1569d3d01fce9afcb60dbfed7c266a9.tar.gz
jgit-e9bab213f1569d3d01fce9afcb60dbfed7c266a9.zip
Update to Orbit Kepler SR1 release R20130827064939
Change-Id: I6849fc5cb81e8ac47ce1b2c5a74737b23c089fc1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target30
-rw-r--r--pom.xml2
2 files changed, 13 insertions, 19 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target
index 3a19cca24a..8078802f91 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target
@@ -8,7 +8,7 @@
http://www.eclipse.org/legal/epl-v10.html
-->
<?pde version="3.6"?>
-<target name="jgit.target" sequenceNumber="54">
+<target name="jgit.target" sequenceNumber="55">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/"/>
@@ -30,39 +30,33 @@
<unit id="org.eclipse.jetty.util.source" version="7.6.11.v20130520"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
- <unit id="org.apache.ant.source" version="1.8.2.v201303080311"/>
- <unit id="org.apache.ant" version="1.8.2.v201303080311"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
+ <unit id="org.apache.ant.source" version="1.8.4.v201303080030"/>
+ <unit id="org.apache.ant" version="1.8.4.v201303080030"/>
<unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/>
<unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
- <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.core.source" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.generator.source" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
- <unit id="org.hamcrest.integration.source" version="1.1.0.v201303031500"/>
- <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.library.source" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
- <unit id="javaewah" version="0.5.6.v201210150900"/>
+ <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+ <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+ <unit id="javaewah" version="0.5.6.v201307211000"/>
+ <unit id="javaewah.source" version="0.5.6.v201307211000"/>
<unit id="org.objenesis" version="1.0.0.v201105211943"/>
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
<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.46.v201205102330"/>
<unit id="com.jcraft.jsch.source" version="0.1.46.v201205102330"/>
- <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
- <unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
+ <unit id="org.junit" version="4.11.0.v201303080030"/>
+ <unit id="org.junit.source" version="4.11.0.v201303080030"/>
<unit id="com.google.protobuf" version="2.4.0.v201105131100"/>
<unit id="com.google.protobuf.source" version="2.4.0.v201105131100"/>
<unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+ <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
+ <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/juno/"/>
diff --git a/pom.xml b/pom.xml
index f71b5d1175..f924043e5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
<jgit-last-release-version>2.3.1.201302201838-r</jgit-last-release-version>
<jsch-version>0.1.46</jsch-version>
<javaewah-version>0.5.6</javaewah-version>
- <junit-version>4.5</junit-version>
+ <junit-version>4.11</junit-version>
<!-- TODO: update Maven dependency for args4j to 2.0.21 as soon as available on Maven Central -->
<args4j-version>2.0.12</args4j-version>
<commons-compress-version>1.4.1</commons-compress-version>