Merge branch 'stable-4.6'

* stable-4.6:
  Update tycho version to 0.26
  Update maven plugins
  Skip javadoc generation for org.eclipse.jgit.http.test
  Prepare 4.6.1-SNAPSHOT builds
  JGit v4.6.0.201612231935-r

Change-Id: Ia70329af7ec8bdb6d8bd6f917e00024a3ea4ac1f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 42 insertions, 42 deletions

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 34bab8e44e..601ed0ff6c 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -2,53 +2,53 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 4.6.0.qualifier
+Bundle-Version: 4.6.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
- org.eclipse.jgit.api;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.attributes;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.awtui;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.blame;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.diff;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.dircache;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.errors;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.events;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.fnmatch;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.gitrepo;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.hooks;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.ignore;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.ignore.internal;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.internal;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.internal.storage.pack;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.junit;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.lfs;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.lib;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.merge;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.nls;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.notes;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.patch;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.pgm;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.pgm.internal;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.revplot;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.revwalk.filter;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.storage.pack;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.submodule;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.transport;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.transport.http;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.treewalk;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.treewalk.filter;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.util;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)",
+ org.eclipse.jgit.api;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.api.errors;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.attributes;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.awtui;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.blame;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.diff;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.dircache;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.errors;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.events;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.fnmatch;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.gitrepo;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.hooks;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.ignore;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.ignore.internal;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.junit;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.lfs;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.lib;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.merge;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.nls;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.notes;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.patch;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.pgm;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.pgm.internal;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.revplot;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.revwalk.filter;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.storage.pack;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.submodule;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.transport;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.transport.http;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.treewalk;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.util;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.util.io;version="[4.6.1,4.7.0)",
  org.junit;version="[4.4.0,5.0.0)",
  org.junit.experimental.theories;version="[4.4.0,5.0.0)",
  org.junit.rules;version="[4.11.0,5.0.0)",