Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-01-28 08:28:15 +0000
committerGerrit Code Review @ Eclipse.org2013-01-31 21:05:46 +0000
commitdcddaa943e68b1e6521e7fa44151babd21e12a7a (patch)
tree7f0838e3f07e195a58af12e1ea88e9c7b179f89a
parent75c011cd20372d0c326467be9f10b918012fca5c (diff)
downloadjgit-dcddaa943e68b1e6521e7fa44151babd21e12a7a.tar.gz
jgit-dcddaa943e68b1e6521e7fa44151babd21e12a7a.tar.xz
jgit-dcddaa943e68b1e6521e7fa44151babd21e12a7a.zip
Update to latest orbit release
Update 3rd party dependencies to respective latest approved version. args4j 2.0.21 is not yet available on Maven central, hence compile against 2.0.12 and package 2.0.21 until 2.0.21 has been published on Maven central. Change-Id: I41a34485970af41b4b5b2404e3d29c98979ddb48 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml4
-rw-r--r--org.eclipse.jgit.packaging/pom.xml31
-rw-r--r--pom.xml3
3 files changed, 7 insertions, 31 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index d51e8bae90..68101521d1 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -60,10 +60,6 @@
<name>JGit Command Line Interface Feature</name>
<dependencies>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index a8f6ab73b0..f00be89b0a 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -61,10 +61,10 @@
<properties>
<tycho-version>0.16.0</tycho-version>
<jetty-version>7.6.0.v20120127</jetty-version>
- <args4j-version>2.0.12</args4j-version>
- <jsch-version>0.1.46</jsch-version>
- <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</orbit-site>
+ <args4j-version>2.0.21.v201301150030</args4j-version>
+ <jsch-version>0.1.46.v201205102330</jsch-version>
+ <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site>
+ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-site>
</properties>
<modules>
@@ -92,14 +92,6 @@
<layout>p2</layout>
<url>${orbit-site}</url>
</repository>
- <repository>
- <!-- TODO replace this with an S- or better R-build as soon as a new one is available
- we are using a private copy of an I-build since no S or R-build was available when
- releasing jgit 2.2, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=396199 -->
- <id>temp-jgit-orbit</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/jgit/orbit/I20121212174845/repository/</url>
- </repository>
</repositories>
<dependencies>
@@ -192,19 +184,6 @@
</plugins>
</pluginManagement>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>${jsch-version}</version>
- </dependency>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>${args4j-version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+
</project>
diff --git a/pom.xml b/pom.xml
index 473893833f..decd151c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,8 +178,9 @@
<jgit-last-release-version>2.1.0.201209190230-r</jgit-last-release-version>
<jsch-version>0.1.46</jsch-version>
<junit-version>4.5</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.3</commons-compress-version>
+ <commons-compress-version>1.4.1</commons-compress-version>
<servlet-api-version>2.5</servlet-api-version>
<jetty-version>7.6.0.v20120127</jetty-version>
<clirr-version>2.4</clirr-version>

Back to the top