diff options
author | Matthias Sohn | 2013-05-08 09:37:55 +0000 |
---|---|---|
committer | Matthias Sohn | 2013-05-08 12:49:48 +0000 |
commit | 4c18cb9905dc43d70cf6f0e5e072c765bca51542 (patch) | |
tree | 8d67141c3aec857cd544d11f0a447e9e592e6c58 | |
parent | 898395f524f813e2cfd8eecabfac4ba9366ed889 (diff) | |
download | egit-github-4c18cb9905dc43d70cf6f0e5e072c765bca51542.tar.gz egit-github-4c18cb9905dc43d70cf6f0e5e072c765bca51542.tar.xz egit-github-4c18cb9905dc43d70cf6f0e5e072c765bca51542.zip |
Adapt github connector to compile against jgit/egit 3.0
Also flip github connectors own version to 3.0 since our simple release
process isn't able to cope with different versions for jgit/egit and
egit-github.
Change-Id: If099a7a0f8176d6a3e2c09a5709d906dad8f2620
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
21 files changed, 75 insertions, 75 deletions
diff --git a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF index fdc29ed4..649f3fe5 100644 --- a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.egit.github.core.tests -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", com.google.gson.reflect;version="[1.6.0,2.2.0]", - org.eclipse.egit.github.core;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.client;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.event;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.service;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.util;version="[2.4.0,2.5.0)", + org.eclipse.egit.github.core;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.client;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.event;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.service;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.util;version="[3.0.0,3.1.0)", org.mockito;version="[1.8.4,2.0.0)", org.mockito.runners;version="[1.8.4,2.0.0)", org.mockito.stubbing;version="[1.8.4,2.0.0)" diff --git a/org.eclipse.egit.github.core.tests/pom.xml b/org.eclipse.egit.github.core.tests/pom.xml index f6eea8d8..7947e030 100644 --- a/org.eclipse.egit.github.core.tests/pom.xml +++ b/org.eclipse.egit.github.core.tests/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>github-parent</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.github.core.tests</artifactId> diff --git a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF index 5d9de7c2..8efa9899 100644 --- a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF @@ -3,15 +3,15 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.egit.github.core -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", com.google.gson.annotations;version="[1.6.0,2.2.0]", com.google.gson.reflect;version="[1.6.0,2.2.0]", com.google.gson.stream;version="[1.6.0,2.2.0] -Export-Package: org.eclipse.egit.github.core;version="2.4.0", - org.eclipse.egit.github.core.client;version="2.4.0", - org.eclipse.egit.github.core.event;version="2.4.0", - org.eclipse.egit.github.core.service;version="2.4.0", - org.eclipse.egit.github.core.util;version="2.4.0" +Export-Package: org.eclipse.egit.github.core;version="3.0.0", + org.eclipse.egit.github.core.client;version="3.0.0", + org.eclipse.egit.github.core.event;version="3.0.0", + org.eclipse.egit.github.core.service;version="3.0.0", + org.eclipse.egit.github.core.util;version="3.0.0" diff --git a/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF index 008f4958..8999e18d 100644 --- a/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit GitHub API Core Bundle-SymbolicName: org.eclipse.egit.github.core -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: Eclipse EGit Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", com.google.gson.annotations;version="[1.6.0,2.2.0]", com.google.gson.reflect;version="[1.6.0,2.2.0]", com.google.gson.stream;version="[1.6.0,2.2.0] -Export-Package: org.eclipse.egit.github.core;version="2.4.0", - org.eclipse.egit.github.core.client;version="2.4.0", - org.eclipse.egit.github.core.service;version="2.4.0", - org.eclipse.egit.github.core.util;version="2.4.0" +Export-Package: org.eclipse.egit.github.core;version="3.0.0", + org.eclipse.egit.github.core.client;version="3.0.0", + org.eclipse.egit.github.core.service;version="3.0.0", + org.eclipse.egit.github.core.util;version="3.0.0" diff --git a/org.eclipse.egit.github.core/pom-jar.xml b/org.eclipse.egit.github.core/pom-jar.xml index de024009..6101df58 100644 --- a/org.eclipse.egit.github.core/pom-jar.xml +++ b/org.eclipse.egit.github.core/pom-jar.xml @@ -5,7 +5,7 @@ <groupId>org.eclipse.mylyn.github</groupId> <artifactId>org.eclipse.egit.github.core</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <parent> <groupId>org.sonatype.oss</groupId> diff --git a/org.eclipse.egit.github.core/pom.xml b/org.eclipse.egit.github.core/pom.xml index 1cecc676..430f1ade 100644 --- a/org.eclipse.egit.github.core/pom.xml +++ b/org.eclipse.egit.github.core/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>github-parent</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml index 49857f26..84831e78 100644 --- a/org.eclipse.mylyn.github-feature/feature.xml +++ b/org.eclipse.mylyn.github-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.mylyn.github.feature" label="%featureName" - version="2.4.0.qualifier" + version="3.0.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> diff --git a/org.eclipse.mylyn.github-feature/pom.xml b/org.eclipse.mylyn.github-feature/pom.xml index a5c4bcfc..406feac2 100644 --- a/org.eclipse.mylyn.github-feature/pom.xml +++ b/org.eclipse.mylyn.github-feature/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>github-parent</artifactId> <groupId>org.eclipse.mylyn.github</groupId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.mylyn.github.feature</artifactId> diff --git a/org.eclipse.mylyn.github-site/pom.xml b/org.eclipse.mylyn.github-site/pom.xml index eb6e5923..0cbd960c 100644 --- a/org.eclipse.mylyn.github-site/pom.xml +++ b/org.eclipse.mylyn.github-site/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>github-parent</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>github-updatesite</artifactId> diff --git a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF index 87cf48bc..287bbc86 100644 --- a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.core;singleton:=true -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.mylyn.internal.github.core;version="2.4.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.gist;version="2.4.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.issue;version="2.4.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.pr;version="2.4.0";x-friends:="org.eclipse.mylyn.github.ui" +Export-Package: org.eclipse.mylyn.internal.github.core;version="3.0.0";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.gist;version="3.0.0";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.issue;version="3.0.0";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.pr;version="3.0.0";x-friends:="org.eclipse.mylyn.github.ui" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.core;bundle-version="[3.4.0,4.0.0)", org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)" -Import-Package: org.eclipse.egit.core;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.client;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.service;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.util;version="[2.4.0,2.5.0)", - org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", - org.eclipse.jgit.transport;version="[2.4.0,2.5.0)" +Import-Package: org.eclipse.egit.core;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.client;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.service;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.util;version="[3.0.0,3.1.0)", + org.eclipse.jgit.lib;version="[3.0.0,3.1.0)", + org.eclipse.jgit.transport;version="[3.0.0,3.1.0)" diff --git a/org.eclipse.mylyn.github.core/pom.xml b/org.eclipse.mylyn.github.core/pom.xml index 3e1de75b..ace4c17e 100644 --- a/org.eclipse.mylyn.github.core/pom.xml +++ b/org.eclipse.mylyn.github.core/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>github-parent</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF index d646223d..fa6c6805 100755 --- a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.doc;singleton:=true -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional diff --git a/org.eclipse.mylyn.github.doc/pom.xml b/org.eclipse.mylyn.github.doc/pom.xml index 1ae4bb11..300d33b9 100755 --- a/org.eclipse.mylyn.github.doc/pom.xml +++ b/org.eclipse.mylyn.github.doc/pom.xml @@ -18,7 +18,7 @@ http://www.eclipse.org/legal/epl-v10.html <parent> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>github-parent</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.mylyn.github.doc</artifactId> diff --git a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF index ba7e3d8a..f03c8584 100644 --- a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eclipse EGit Mylyn GitHub Tests Bundle-SymbolicName: org.eclipse.mylyn.github.tests -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.ui;bundle-version="[3.2.0,4.0.0)", @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.objenesis;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: Eclipse EGit -Import-Package: org.eclipse.mylyn.internal.github.core;version="[2.4.0,2.5.0)", - org.eclipse.mylyn.internal.github.ui.issue;version="[2.4.0,2.5.0)", +Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.0.0,3.1.0)", + org.eclipse.mylyn.internal.github.ui.issue;version="[3.0.0,3.1.0)", org.mockito;version="[1.8.4,2.0.0)", org.mockito.runners;version="[1.8.4,2.0.0)", org.mockito.stubbing;version="[1.8.4,2.0.0)" diff --git a/org.eclipse.mylyn.github.tests/pom.xml b/org.eclipse.mylyn.github.tests/pom.xml index b446c38a..15909b87 100644 --- a/org.eclipse.mylyn.github.tests/pom.xml +++ b/org.eclipse.mylyn.github.tests/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>github-parent</artifactId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.mylyn.github.tests</artifactId> diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF index fa1277b2..bfface9e 100644 --- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.ui;singleton:=true Bundle-Activator: org.eclipse.mylyn.internal.github.ui.GitHubUi -Bundle-Version: 2.4.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -23,30 +23,30 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.context.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.mylyn.monitor.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.mylyn.resources.ui;bundle-version="[3.7.0,4.0.0)" -Export-Package: org.eclipse.mylyn.internal.github.ui;version="2.4.0";x-internal:=true, - org.eclipse.mylyn.internal.github.ui.gist;version="2.4.0";x-internal:=true, - org.eclipse.mylyn.internal.github.ui.issue;version="2.4.0";x-internal:=true +Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.0.0";x-internal:=true, + org.eclipse.mylyn.internal.github.ui.gist;version="3.0.0";x-internal:=true, + org.eclipse.mylyn.internal.github.ui.issue;version="3.0.0";x-internal:=true Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.egit.core;version="[2.4.0,2.5.0)", - org.eclipse.egit.core.op;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.client;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.service;version="[2.4.0,2.5.0)", - org.eclipse.egit.github.core.util;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui.internal;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui.internal.branch;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui.internal.commit;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui.internal.fetch;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui.internal.provisional.wizards;version="[2.4.0,2.5.0)", - org.eclipse.egit.ui.internal.pull;version="[2.4.0,2.5.0)", - org.eclipse.jgit.errors;version="[2.4.0,2.5.0)", - org.eclipse.jgit.lib;version="[2.4.0,2.5.0)", - org.eclipse.jgit.revwalk;version="[2.4.0,2.5.0)", - org.eclipse.jgit.transport;version="[2.4.0,2.5.0)", - org.eclipse.jgit.treewalk;version="[2.4.0,2.5.0)", - org.eclipse.jgit.treewalk.filter;version="[2.4.0,2.5.0)", - org.eclipse.mylyn.internal.github.core;version="[2.4.0,2.5.0)", - org.eclipse.mylyn.internal.github.core.gist;version="[2.4.0,2.5.0)", - org.eclipse.mylyn.internal.github.core.issue;version="[2.4.0,2.5.0)", - org.eclipse.mylyn.internal.github.core.pr;version="[2.4.0,2.5.0)" +Import-Package: org.eclipse.egit.core;version="[3.0.0,3.1.0)", + org.eclipse.egit.core.op;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.client;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.service;version="[3.0.0,3.1.0)", + org.eclipse.egit.github.core.util;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui.internal;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui.internal.branch;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui.internal.commit;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui.internal.fetch;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui.internal.provisional.wizards;version="[3.0.0,3.1.0)", + org.eclipse.egit.ui.internal.pull;version="[3.0.0,3.1.0)", + org.eclipse.jgit.errors;version="[3.0.0,3.1.0)", + org.eclipse.jgit.lib;version="[3.0.0,3.1.0)", + org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)", + org.eclipse.jgit.transport;version="[3.0.0,3.1.0)", + org.eclipse.jgit.treewalk;version="[3.0.0,3.1.0)", + org.eclipse.jgit.treewalk.filter;version="[3.0.0,3.1.0)", + org.eclipse.mylyn.internal.github.core;version="[3.0.0,3.1.0)", + org.eclipse.mylyn.internal.github.core.gist;version="[3.0.0,3.1.0)", + org.eclipse.mylyn.internal.github.core.issue;version="[3.0.0,3.1.0)", + org.eclipse.mylyn.internal.github.core.pr;version="[3.0.0,3.1.0)" diff --git a/org.eclipse.mylyn.github.ui/pom.xml b/org.eclipse.mylyn.github.ui/pom.xml index 492a6f6c..89386aa3 100644 --- a/org.eclipse.mylyn.github.ui/pom.xml +++ b/org.eclipse.mylyn.github.ui/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>github-parent</artifactId> <groupId>org.eclipse.mylyn.github</groupId> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.mylyn.github.ui</artifactId> diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java index 8cf00ca6..3c71b7ad 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java @@ -22,7 +22,7 @@ import org.eclipse.egit.github.core.Repository; import org.eclipse.egit.github.core.SearchRepository; import org.eclipse.egit.github.core.service.RepositoryService; import org.eclipse.egit.github.core.util.UrlUtils; -import org.eclipse.egit.ui.UIIcons; +import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.provisional.wizards.GitRepositoryInfo; import org.eclipse.egit.ui.internal.provisional.wizards.IRepositorySearchResult; import org.eclipse.egit.ui.internal.provisional.wizards.NoRepositoryInfoException; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java index 3a8c8559..47f79bb0 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java @@ -16,8 +16,8 @@ import java.text.MessageFormat; import org.eclipse.core.commands.common.CommandException; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.egit.github.core.PullRequest; -import org.eclipse.egit.ui.UIIcons; import org.eclipse.egit.ui.UIUtils; +import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.commit.CommitEditor; import org.eclipse.egit.ui.internal.commit.RepositoryCommit; import org.eclipse.jface.action.ToolBarManager; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java index ded701ca..5c52c150 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java @@ -14,7 +14,7 @@ import java.text.DateFormat; import java.text.MessageFormat; import org.eclipse.egit.github.core.RepositoryCommit; -import org.eclipse.egit.ui.UIIcons; +import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.StyledString; import org.eclipse.ui.model.WorkbenchAdapter; @@ -38,7 +38,7 @@ public class PullRequestCommitAdapter extends WorkbenchAdapter { /** * Get commit - * + * * @return commit */ public RepositoryCommit getCommit() { @@ -14,7 +14,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>2.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <prerequisites> <maven>3.0</maven> </prerequisites> |