From 58007e7b525e2072a20ef0e4596bf54e6a52fa48 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 5 Mar 2014 02:26:39 +0100 Subject: Prepare 3.4.0-SNAPSHOT builds Change-Id: Id98bd630fdb9e5bef951aed84f99b80f7a4b4033 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 4 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 22 +-- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 66 ++++---- org.eclipse.egit.core/pom.xml | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.mylyn-feature/feature.xml | 4 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 8 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 24 +-- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 24 +-- org.eclipse.egit.ui.test/pom.xml | 6 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 166 ++++++++++----------- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 +- 26 files changed, 180 insertions(+), 180 deletions(-) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 4bd5cb3cf7..54728477c9 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ @@ -38,7 +38,7 @@ - + org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 357784a67c..0ec2b97086 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Git Team Provider Core Test Plug-in Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.core.test Fragment-Host: org.eclipse.egit.core -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", @@ -17,14 +17,14 @@ Bundle-ActivationPolicy: lazy Import-Package: org.mockito;version="[1.8.0,1.9.0)", org.mockito.runners;version="[1.8.0,1.9.0)", org.mockito.stubbing;version="[1.8.0,1.9.0)", - org.eclipse.egit.core;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.op;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.project;version="[3.3.1,3.4.0)", - org.eclipse.jgit.api.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.junit;version="[3.3.1,3.4.0)", - org.eclipse.jgit.lib;version="[3.3.1,3.4.0)", - org.eclipse.jgit.treewalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.treewalk.filter;version="[3.3.1,3.4.0)", - org.eclipse.jgit.util;version="[3.3.1,3.4.0)" + org.eclipse.egit.core;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.op;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.project;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.0,3.5.0)", + org.eclipse.jgit.util;version="[3.4.0,3.5.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.egit.core.test;version="3.3.1" +Export-Package: org.eclipse.egit.core.test;version="3.4.0" diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index f0d1524fd7..328092c608 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.core.test diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 1fb260e73d..5553079560 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -11,38 +11,38 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" -Export-Package: org.eclipse.egit.core;version="3.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.mylyn.ui", - org.eclipse.egit.core.internal;version="3.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import", - org.eclipse.egit.core.internal.indexdiff;version="3.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.job;version="3.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.rebase;version="3.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.storage;version="3.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="3.3.1";x-internal:=true, - org.eclipse.egit.core.internal.util;version="3.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="3.3.1";x-friends:="org.eclipse.egit.ui.test,org.eclipse.egit.ui", - org.eclipse.egit.core.project;version="3.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.securestorage;version="3.3.1";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.synchronize;version="3.3.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="3.3.1";x-friends:="org.eclipse.egit.ui" +Export-Package: org.eclipse.egit.core;version="3.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.mylyn.ui", + org.eclipse.egit.core.internal;version="3.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import", + org.eclipse.egit.core.internal.indexdiff;version="3.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.job;version="3.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.rebase;version="3.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="3.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="3.4.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="3.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="3.4.0";x-friends:="org.eclipse.egit.ui.test,org.eclipse.egit.ui", + org.eclipse.egit.core.project;version="3.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.securestorage;version="3.4.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.synchronize;version="3.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="3.4.0";x-friends:="org.eclipse.egit.ui" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.3.1,3.4.0)", - org.eclipse.jgit.api.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.diff;version="[3.3.1,3.4.0)", - org.eclipse.jgit.dircache;version="[3.3.1,3.4.0)", - org.eclipse.jgit.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.events;version="[3.3.1,3.4.0)", - org.eclipse.jgit.internal.storage.file;version="[3.3.1,3.4.0)", - org.eclipse.jgit.lib;version="[3.3.1,3.4.0)", - org.eclipse.jgit.merge;version="[3.3.1,3.4.0)", - org.eclipse.jgit.patch;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revwalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revwalk.filter;version="[3.3.1,3.4.0)", - org.eclipse.jgit.storage.file;version="[3.3.1,3.4.0)", - org.eclipse.jgit.submodule;version="[3.3.1,3.4.0)", - org.eclipse.jgit.transport;version="[3.3.1,3.4.0)", - org.eclipse.jgit.treewalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.treewalk.filter;version="[3.3.1,3.4.0)", - org.eclipse.jgit.util;version="[3.3.1,3.4.0)", - org.eclipse.jgit.util.io;version="[3.3.1,3.4.0)" +Import-Package: org.eclipse.jgit.api;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.events;version="[3.4.0,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", + org.eclipse.jgit.merge;version="[3.4.0,3.5.0)", + org.eclipse.jgit.patch;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revwalk.filter;version="[3.4.0,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", + org.eclipse.jgit.submodule;version="[3.4.0,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.0,3.5.0)", + org.eclipse.jgit.util;version="[3.4.0,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.0,3.5.0)" Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 06f182a402..8991e9f2aa 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.core diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index bf20824b13..a82b6eda40 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 29b37b3d40..4891bb9633 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 9e0ccc9ab0..78d83a1328 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index fe53cd65fb..a200977136 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF index 6fe34d2cff..2c43a6b0d2 100644 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index fef785b1e2..323fda4c3d 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.mylyn.ui.test @@ -81,17 +81,17 @@ p2-installable-unit org.eclipse.egit.feature.group - 3.3.1 + 3.4.0 p2-installable-unit org.eclipse.egit.mylyn.feature.group - 3.3.1 + 3.4.0 p2-installable-unit org.eclipse.jgit.feature.group - 3.3.1 + 3.4.0 p2-installable-unit diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index bde64c2b9a..0b1aac49b2 100644 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.team.core, @@ -23,15 +23,15 @@ Require-Bundle: org.eclipse.team.core, Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="3.3.1";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="3.3.1";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.synchronize;version="[3.3.1,3.4.0)", - org.eclipse.egit.ui;version="[3.3.1,3.4.0)", - org.eclipse.egit.ui.internal.commit;version="[3.3.1,3.4.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[3.3.1,3.4.0)", - org.eclipse.jgit.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.lib;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revwalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.transport;version="[3.3.1,3.4.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="3.4.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="3.4.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.synchronize;version="[3.4.0,3.5.0)", + org.eclipse.egit.ui;version="[3.4.0,3.5.0)", + org.eclipse.egit.ui.internal.commit;version="[3.4.0,3.5.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[3.4.0,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", org.eclipse.ui.plugin diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index dcd2c4e85c..ada465ab26 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index cf0220cc78..e6bba7d79e 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 0dc6238494..aa3584cb26 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 7fe7aa336a..9720331ad8 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index ba17ebd6e3..600db3193b 100644 --- a/org.eclipse.egit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.target/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.egit.target -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index 390de2c32b..595f003920 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index a35761f5fe..157eacd6f4 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Git Team Provider UI Test Fragment Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", @@ -15,17 +15,17 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.mockito;bundle-version="[1.8.0,1.9.0)" -Import-Package: org.eclipse.egit.core.test;version="[3.3.1,3.4.0)", - org.eclipse.jgit.api;version="[3.3.1,3.4.0)", - org.eclipse.jgit.api.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.junit;version="[3.3.1,3.4.0)", - org.eclipse.jgit.junit.http;version="[3.3.1,3.4.0)", - org.eclipse.jgit.lib;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revwalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.storage.file;version="[3.3.1,3.4.0)", - org.eclipse.jgit.transport;version="[3.3.1,3.4.0)", - org.eclipse.jgit.transport.resolver;version="[3.3.1,3.4.0)", - org.eclipse.jgit.util;version="[3.3.1,3.4.0)", +Import-Package: org.eclipse.egit.core.test;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", + org.eclipse.jgit.junit.http;version="[3.4.0,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.0,3.5.0)", + org.eclipse.jgit.util;version="[3.4.0,3.5.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.exceptions, diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 3b33839789..7b600002a1 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.ui.test @@ -86,13 +86,13 @@ p2-installable-unit org.eclipse.egit.feature org.eclipse.egit.feature.group - 3.3.1 + 3.4.0 p2-installable-unit org.eclipse.jgit.feature org.eclipse.jgit.feature.group - 3.3.1 + 3.4.0 p2-installable-unit diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 2e186a36a1..e9387ea84c 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -32,85 +32,85 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.egit.core;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.internal;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.internal.indexdiff;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.internal.job;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.internal.rebase;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.internal.storage;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.internal.util;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.op;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.project;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.securestorage;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.synchronize;version="[3.3.1,3.4.0)", - org.eclipse.egit.core.synchronize.dto;version="[3.3.1,3.4.0)", - org.eclipse.jgit.api;version="[3.3.1,3.4.0)", - org.eclipse.jgit.api.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.blame;version="[3.3.1,3.4.0)", - org.eclipse.jgit.diff;version="[3.3.1,3.4.0)", - org.eclipse.jgit.dircache;version="[3.3.1,3.4.0)", - org.eclipse.jgit.errors;version="[3.3.1,3.4.0)", - org.eclipse.jgit.events;version="[3.3.1,3.4.0)", - org.eclipse.jgit.fnmatch;version="[3.3.1,3.4.0)", - org.eclipse.jgit.internal.storage.file;version="[3.3.1,3.4.0)", - org.eclipse.jgit.lib;version="[3.3.1,3.4.0)", - org.eclipse.jgit.merge;version="[3.3.1,3.4.0)", - org.eclipse.jgit.notes;version="[3.3.1,3.4.0)", - org.eclipse.jgit.patch;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revplot;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revwalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.revwalk.filter;version="[3.3.1,3.4.0)", - org.eclipse.jgit.storage.file;version="[3.3.1,3.4.0)", - org.eclipse.jgit.submodule;version="[3.3.1,3.4.0)", - org.eclipse.jgit.transport;version="[3.3.1,3.4.0)", - org.eclipse.jgit.treewalk;version="[3.3.1,3.4.0)", - org.eclipse.jgit.treewalk.filter;version="[3.3.1,3.4.0)", - org.eclipse.jgit.util;version="[3.3.1,3.4.0)", - org.eclipse.jgit.util.io;version="[3.3.1,3.4.0)" -Export-Package: org.eclipse.egit.ui;version="3.3.1";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal;version="3.3.1";x-friends:="org.eclipse.egit.import", - org.eclipse.egit.ui.internal.actions;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.blame;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.clean;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="3.3.1";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.commit.command;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.credentials;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.dialogs;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.factories;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.patch;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.rebase;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.command;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.sharing;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="3.3.1";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="3.3.1";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="3.3.1";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.internal;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.internal.indexdiff;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.internal.job;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.internal.rebase;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.internal.storage;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.internal.util;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.op;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.project;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.securestorage;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.synchronize;version="[3.4.0,3.5.0)", + org.eclipse.egit.core.synchronize.dto;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.blame;version="[3.4.0,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", + org.eclipse.jgit.events;version="[3.4.0,3.5.0)", + org.eclipse.jgit.fnmatch;version="[3.4.0,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", + org.eclipse.jgit.merge;version="[3.4.0,3.5.0)", + org.eclipse.jgit.notes;version="[3.4.0,3.5.0)", + org.eclipse.jgit.patch;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.revwalk.filter;version="[3.4.0,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", + org.eclipse.jgit.submodule;version="[3.4.0,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.0,3.5.0)", + org.eclipse.jgit.util;version="[3.4.0,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.0,3.5.0)" +Export-Package: org.eclipse.egit.ui;version="3.4.0";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal;version="3.4.0";x-friends:="org.eclipse.egit.import", + org.eclipse.egit.ui.internal.actions;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.blame;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.clean;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="3.4.0";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.commit.command;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.credentials;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.dialogs;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.factories;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.patch;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.command;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.sharing;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="3.4.0";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="3.4.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="3.4.0";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 165548aad5..137b420cd8 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 5731b631fd..9215b3ecd3 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit -Bundle-Version: 3.3.1.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index 53b1fc10dd..f54f075519 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index bd70e995ab..8a362bc087 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.eclipse.egit egit-parent - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ - 3.3.1-SNAPSHOT + 3.4.0-SNAPSHOT 0.19.0 ${tycho-version} 1.8.4 -- cgit v1.2.3