diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2014-12-24 01:08:58 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-12-24 01:09:25 +0100 |
| commit | 988291581034075fab20bbd76147cbc9ad08151b (patch) | |
| tree | 313e9e0dca107ba1eba79615e9e0ffb71749f2e3 /org.eclipse.jgit.junit.http | |
| parent | 90cccb96d2e215c633efa2b06cdd73fca9951489 (diff) | |
| parent | 02b0660b8b749b078fc58f135d14206ebad98ad9 (diff) | |
| download | jgit-988291581034075fab20bbd76147cbc9ad08151b.tar.gz jgit-988291581034075fab20bbd76147cbc9ad08151b.zip | |
Merge branch 'stable-3.6'
* stable-3.6:
Prepare 3.6.1-SNAPSHOT builds
JGit v3.6.0.201412230720-r
[pgm] Add option --bare to clone command
[pgm] Implement clone using CloneCommand
Fix junit tests under windows when the platform is explicitly changed
Fix unit tests for windows by explicitly closing test repos
[pgm] Add option --tags for ls-remote
[pgm] Add option --heads for ls-remote
[pgm] Use LsRemoteCommand to implement ls-remote and add a test
Change-Id: I8f31e76cb7e9416919f37e02c7e51ab1d221df40
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.junit.http')
| -rw-r--r-- | org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 | ||||
| -rw-r--r-- | org.eclipse.jgit.junit.http/pom.xml | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index a0a0dcdf3f..7ebd995473 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 3.6.0.qualifier +Bundle-Version: 3.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,13 +20,13 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.6.0,3.7.0)", - org.eclipse.jgit.http.server;version="[3.6.0,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.0,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.0,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.0,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.0,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.0,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.0,3.7.0)", + org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", + org.eclipse.jgit.http.server;version="[3.6.1,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", + org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", + org.eclipse.jgit.transport.resolver;version="[3.6.1,3.7.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="3.6.0" +Export-Package: org.eclipse.jgit.junit.http;version="3.6.1" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 96cfa05225..950c4fef88 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.6.0-SNAPSHOT</version> + <version>3.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.http</artifactId> |