diff options
author | Matthias Sohn | 2012-12-20 23:54:16 +0000 |
---|---|---|
committer | Matthias Sohn | 2012-12-20 23:54:16 +0000 |
commit | 30b4296f27d3b9efbecca9fe0c6d24dd6ef6dbea (patch) | |
tree | 4d67dc45cfe45d18dd3750e17d892d1ebe1b1170 | |
parent | 39bc73e6f8f6a6e76349ca5ed48f6329cea5d9ef (diff) | |
download | egit-30b4296f27d3b9efbecca9fe0c6d24dd6ef6dbea.tar.gz egit-30b4296f27d3b9efbecca9fe0c6d24dd6ef6dbea.tar.xz egit-30b4296f27d3b9efbecca9fe0c6d24dd6ef6dbea.zip |
Prepare 2.3.0 builds
Change-Id: Ic19d677e0d7b5ac1e6d2cc245086486e309a803f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
30 files changed, 178 insertions, 178 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index d61e40a714..14bfbec1bf 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit" label="%featureName" - version="2.2.0.qualifier" + version="2.3.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -38,7 +38,7 @@ <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/> <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/> <import plugin="com.jcraft.jsch" version="0.1.37" match="compatible"/> - <import feature="org.eclipse.jgit" version="2.2.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="2.3.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index b43ae95ffe..5722c23c0a 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index c712621c56..0920c23382 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: 2.2.0.qualifier +Bundle-Version: 2.3.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,13 +17,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", Bundle-ActivationPolicy: lazy Import-Package: org.mockito;version="[1.8.0,1.9.0)", org.mockito.stubbing;version="[1.8.0,1.9.0)", - org.eclipse.egit.core;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.op;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.project;version="[2.2.0,2.3.0)", - org.eclipse.jgit.api.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.junit;version="[2.2.0,2.3.0)", - org.eclipse.jgit.lib;version="[2.2.0,2.3.0)", - org.eclipse.jgit.treewalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.treewalk.filter;version="[2.2.0,2.3.0)", - org.eclipse.jgit.util;version="[2.2.0,2.3.0)" + org.eclipse.egit.core;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.op;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.project;version="[2.3.0,2.4.0)", + org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.junit;version="[2.3.0,2.4.0)", + org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", + org.eclipse.jgit.treewalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.treewalk.filter;version="[2.3.0,2.4.0)", + org.eclipse.jgit.util;version="[2.3.0,2.4.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 97dbf73ee1..16a3b1b7d3 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.test</artifactId> diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index c1865bcfa9..d199251b89 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: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -11,36 +11,36 @@ 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="2.2.0", - org.eclipse.egit.core.internal;version="2.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import", - org.eclipse.egit.core.internal.indexdiff;version="2.2.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="2.2.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.storage;version="2.2.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="2.2.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="2.2.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="2.2.0", - org.eclipse.egit.core.project;version="2.2.0", - org.eclipse.egit.core.securestorage;version="2.2.0", - org.eclipse.egit.core.synchronize;version="2.2.0", - org.eclipse.egit.core.synchronize.dto;version="2.2.0" +Export-Package: org.eclipse.egit.core;version="2.3.0", + org.eclipse.egit.core.internal;version="2.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import", + org.eclipse.egit.core.internal.indexdiff;version="2.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="2.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.storage;version="2.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="2.3.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="2.3.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="2.3.0", + org.eclipse.egit.core.project;version="2.3.0", + org.eclipse.egit.core.securestorage;version="2.3.0", + org.eclipse.egit.core.synchronize;version="2.3.0", + org.eclipse.egit.core.synchronize.dto;version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[2.2.0,2.3.0)", - org.eclipse.jgit.api.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.diff;version="[2.2.0,2.3.0)", - org.eclipse.jgit.dircache;version="[2.2.0,2.3.0)", - org.eclipse.jgit.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.events;version="[2.2.0,2.3.0)", - org.eclipse.jgit.lib;version="[2.2.0,2.3.0)", - org.eclipse.jgit.merge;version="[2.2.0,2.3.0)", - org.eclipse.jgit.patch;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revwalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revwalk.filter;version="[2.2.0,2.3.0)", - org.eclipse.jgit.storage.file;version="[2.2.0,2.3.0)", - org.eclipse.jgit.submodule;version="[2.2.0,2.3.0)", - org.eclipse.jgit.transport;version="[2.2.0,2.3.0)", - org.eclipse.jgit.treewalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.treewalk.filter;version="[2.2.0,2.3.0)", - org.eclipse.jgit.util;version="[2.2.0,2.3.0)", - org.eclipse.jgit.util.io;version="[2.2.0,2.3.0)" +Import-Package: org.eclipse.jgit.api;version="[2.3.0,2.4.0)", + org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.diff;version="[2.3.0,2.4.0)", + org.eclipse.jgit.dircache;version="[2.3.0,2.4.0)", + org.eclipse.jgit.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.events;version="[2.3.0,2.4.0)", + org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", + org.eclipse.jgit.merge;version="[2.3.0,2.4.0)", + org.eclipse.jgit.patch;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revwalk.filter;version="[2.3.0,2.4.0)", + org.eclipse.jgit.storage.file;version="[2.3.0,2.4.0)", + org.eclipse.jgit.submodule;version="[2.3.0,2.4.0)", + org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", + org.eclipse.jgit.treewalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.treewalk.filter;version="[2.3.0,2.4.0)", + org.eclipse.jgit.util;version="[2.3.0,2.4.0)", + org.eclipse.jgit.util.io;version="[2.3.0,2.4.0)" diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 08687ea64c..6e1738a615 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core</artifactId> diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index 2ca09ab973..01a0da0e4d 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: 2.2.0.qualifier +Bundle-Version: 2.3.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 20b5f5564a..5c77c4cd60 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.doc</artifactId> diff --git a/org.eclipse.egit.import-feature/feature.xml b/org.eclipse.egit.import-feature/feature.xml index 58fb4c2fff..d7a7ad756a 100644 --- a/org.eclipse.egit.import-feature/feature.xml +++ b/org.eclipse.egit.import-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.import" label="%featureName" - version="2.2.0.qualifier" + version="2.3.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.egit.import-feature/pom.xml b/org.eclipse.egit.import-feature/pom.xml index 8ecf49dcc9..ca94128402 100644 --- a/org.eclipse.egit.import-feature/pom.xml +++ b/org.eclipse.egit.import-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.import/META-INF/MANIFEST.MF b/org.eclipse.egit.import/META-INF/MANIFEST.MF index d968f6046d..fcda1aa7d0 100644 --- a/org.eclipse.egit.import/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.import/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.import;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.egit.internal.importing.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)", org.eclipse.ui;bundle-version="[3.8.0,4.0.0)", @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)", Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor -Import-Package: org.eclipse.egit.core.internal;version="[2.2.0,2.3.0)", - org.eclipse.egit.ui;version="[2.2.0,2.3.0)", - org.eclipse.egit.ui.internal;version="[2.2.0,2.3.0)", - org.eclipse.jgit.transport;version="[2.2.0,2.3.0)" -Export-Package: org.eclipse.egit.internal.importing;version="2.2.0";x-internal:=true +Import-Package: org.eclipse.egit.core.internal;version="[2.3.0,2.4.0)", + org.eclipse.egit.ui;version="[2.3.0,2.4.0)", + org.eclipse.egit.ui.internal;version="[2.3.0,2.4.0)", + org.eclipse.jgit.transport;version="[2.3.0,2.4.0)" +Export-Package: org.eclipse.egit.internal.importing;version="2.3.0";x-internal:=true diff --git a/org.eclipse.egit.import/pom.xml b/org.eclipse.egit.import/pom.xml index 14816bea83..83531e244d 100644 --- a/org.eclipse.egit.import/pom.xml +++ b/org.eclipse.egit.import/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.import</artifactId> diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 0838ed83d9..4c60cd44ec 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.mylyn" label="%featureName" - version="2.2.0.qualifier" + version="2.3.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -24,7 +24,7 @@ </url> <requires> - <import feature="org.eclipse.egit" version="2.2.0" match="greaterOrEqual"/> + <import feature="org.eclipse.egit" version="2.3.0" match="greaterOrEqual"/> <import feature="org.eclipse.mylyn.team_feature" version="3.5.0" match="greaterOrEqual"/> </requires> diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 89ef0d5a0a..957727f1c2 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> 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 3a92f99854..cf4fb8c9ec 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: 2.2.0.qualifier +Bundle-Version: 2.3.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 d2bfff1043..e0fe2bc57b 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui.test</artifactId> diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index b56db82fdf..28a5d22b09 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: 2.2.0.qualifier +Bundle-Version: 2.3.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="2.2.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="2.2.0";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.synchronize;version="[2.2.0,2.3.0)", - org.eclipse.egit.ui;version="[2.2.0,2.3.0)", - org.eclipse.egit.ui.internal.commit;version="[2.2.0,2.3.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[2.2.0,2.3.0)", - org.eclipse.jgit.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.lib;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revwalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.transport;version="[2.2.0,2.3.0)", +Export-Package: org.eclipse.egit.internal.mylyn.ui;version="2.3.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.internal.mylyn.ui.commit;version="2.3.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.synchronize;version="[2.3.0,2.4.0)", + org.eclipse.egit.ui;version="[2.3.0,2.4.0)", + org.eclipse.egit.ui.internal.commit;version="[2.3.0,2.4.0)", + org.eclipse.egit.ui.internal.synchronize.model;version="[2.3.0,2.4.0)", + org.eclipse.jgit.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", org.eclipse.ui.plugin diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index 39a6e0e672..0a8908df77 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui</artifactId> diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 3f713b2d42..a0c94fb387 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.repository</artifactId> diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 8753af9f82..9ecb0574d7 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.source" label="%featureName" - version="2.2.0.qualifier" + version="2.3.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 6dcf1fcad1..138472a051 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index 95938cf7d1..b216155f84 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: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index cc74700c9a..ee08db1010 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <build> diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 06199cf0ce..2252ea66db 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: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)", @@ -15,16 +15,16 @@ 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.jgit.api;version="[2.2.0,2.3.0)", - org.eclipse.jgit.api.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.junit;version="[2.2.0,2.3.0)", - org.eclipse.jgit.junit.http;version="[2.2.0,2.3.0)", - org.eclipse.jgit.lib;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revwalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.storage.file;version="[2.2.0,2.3.0)", - org.eclipse.jgit.transport;version="[2.2.0,2.3.0)", - org.eclipse.jgit.transport.resolver;version="[2.2.0,2.3.0)", - org.eclipse.jgit.util;version="[2.2.0,2.3.0)", +Import-Package: org.eclipse.jgit.api;version="[2.3.0,2.4.0)", + org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.junit;version="[2.3.0,2.4.0)", + org.eclipse.jgit.junit.http;version="[2.3.0,2.4.0)", + org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.storage.file;version="[2.3.0,2.4.0)", + org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", + org.eclipse.jgit.transport.resolver;version="[2.3.0,2.4.0)", + org.eclipse.jgit.util;version="[2.3.0,2.4.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 4ada78c283..d92594e126 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui.test</artifactId> @@ -87,13 +87,13 @@ <type>p2-installable-unit</type> <groupId>org.eclipse.egit.feature</groupId> <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>2.2.0</version> + <version>2.3.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>2.2.0</version> + <version>2.3.0</version> </dependency> <dependency> <type>p2-installable-unit</type> diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index aa1e62ab25..7552b339d1 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: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin @@ -32,81 +32,81 @@ 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)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.egit.core;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.internal;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.internal.indexdiff;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.internal.job;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.internal.storage;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.internal.util;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.op;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.project;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.securestorage;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.synchronize;version="[2.2.0,2.3.0)", - org.eclipse.egit.core.synchronize.dto;version="[2.2.0,2.3.0)", - org.eclipse.jgit.api;version="[2.2.0,2.3.0)", - org.eclipse.jgit.api.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.blame;version="[2.2.0,2.3.0)", - org.eclipse.jgit.diff;version="[2.2.0,2.3.0)", - org.eclipse.jgit.dircache;version="[2.2.0,2.3.0)", - org.eclipse.jgit.errors;version="[2.2.0,2.3.0)", - org.eclipse.jgit.events;version="[2.2.0,2.3.0)", - org.eclipse.jgit.fnmatch;version="[2.2.0,2.3.0)", - org.eclipse.jgit.lib;version="[2.2.0,2.3.0)", - org.eclipse.jgit.merge;version="[2.2.0,2.3.0)", - org.eclipse.jgit.notes;version="[2.2.0,2.3.0)", - org.eclipse.jgit.patch;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revplot;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revwalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.revwalk.filter;version="[2.2.0,2.3.0)", - org.eclipse.jgit.storage.file;version="[2.2.0,2.3.0)", - org.eclipse.jgit.submodule;version="[2.2.0,2.3.0)", - org.eclipse.jgit.transport;version="[2.2.0,2.3.0)", - org.eclipse.jgit.treewalk;version="[2.2.0,2.3.0)", - org.eclipse.jgit.treewalk.filter;version="[2.2.0,2.3.0)", - org.eclipse.jgit.util;version="[2.2.0,2.3.0)", - org.eclipse.jgit.util.io;version="[2.2.0,2.3.0)" -Export-Package: org.eclipse.egit.ui;version="2.2.0", - org.eclipse.egit.ui.internal;version="2.2.0";x-friends:="org.eclipse.egit.import", - org.eclipse.egit.ui.internal.actions;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.blame;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit.command;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.credentials;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.dialogs;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.factories;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.gerrit;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.patch;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.rebase;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.command;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.sharing;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.stash;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="2.2.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="2.2.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="2.2.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.internal;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.internal.indexdiff;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.internal.job;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.internal.storage;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.internal.util;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.op;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.project;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.securestorage;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.synchronize;version="[2.3.0,2.4.0)", + org.eclipse.egit.core.synchronize.dto;version="[2.3.0,2.4.0)", + org.eclipse.jgit.api;version="[2.3.0,2.4.0)", + org.eclipse.jgit.api.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.blame;version="[2.3.0,2.4.0)", + org.eclipse.jgit.diff;version="[2.3.0,2.4.0)", + org.eclipse.jgit.dircache;version="[2.3.0,2.4.0)", + org.eclipse.jgit.errors;version="[2.3.0,2.4.0)", + org.eclipse.jgit.events;version="[2.3.0,2.4.0)", + org.eclipse.jgit.fnmatch;version="[2.3.0,2.4.0)", + org.eclipse.jgit.lib;version="[2.3.0,2.4.0)", + org.eclipse.jgit.merge;version="[2.3.0,2.4.0)", + org.eclipse.jgit.notes;version="[2.3.0,2.4.0)", + org.eclipse.jgit.patch;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revplot;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revwalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.revwalk.filter;version="[2.3.0,2.4.0)", + org.eclipse.jgit.storage.file;version="[2.3.0,2.4.0)", + org.eclipse.jgit.submodule;version="[2.3.0,2.4.0)", + org.eclipse.jgit.transport;version="[2.3.0,2.4.0)", + org.eclipse.jgit.treewalk;version="[2.3.0,2.4.0)", + org.eclipse.jgit.treewalk.filter;version="[2.3.0,2.4.0)", + org.eclipse.jgit.util;version="[2.3.0,2.4.0)", + org.eclipse.jgit.util.io;version="[2.3.0,2.4.0)" +Export-Package: org.eclipse.egit.ui;version="2.3.0", + org.eclipse.egit.ui.internal;version="2.3.0";x-friends:="org.eclipse.egit.import", + org.eclipse.egit.ui.internal.actions;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.blame;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit.command;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.credentials;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.dialogs;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.factories;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.patch;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.rebase;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.command;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.sharing;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="2.3.0";x-friends:="org.eclipse.egit.mylyn.ui", + org.eclipse.egit.ui.internal.trace;version="2.3.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="2.3.0";x-internal:=true diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 7be3c429c4..b44bd780be 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui</artifactId> diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 787d0763ac..160032f94d 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: 2.2.0.qualifier +Bundle-Version: 2.3.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 83611d915d..ac0469589f 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit</artifactId> @@ -21,7 +21,7 @@ <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -62,7 +62,7 @@ </licenses> <properties> - <egit-version>2.2.0-SNAPSHOT</egit-version> + <egit-version>2.3.0-SNAPSHOT</egit-version> <tycho-version>0.16.0</tycho-version> <tycho-extras-version>0.16.0</tycho-extras-version> <mockito-version>1.8.4</mockito-version> |