diff options
author | Kevin Sawicki | 2011-06-24 17:35:02 +0000 |
---|---|---|
committer | Kevin Sawicki | 2011-06-24 17:35:02 +0000 |
commit | f9f68711406cc90df8fab133a75a82fc8dab2c71 (patch) | |
tree | 346a5dab3806bee9033221d9a2708cd07af3d3b0 /org.eclipse.mylyn.github.core | |
parent | b6f48992db871f56fb4dc99a90d33d6af59e23c4 (diff) | |
parent | 86088517ea1a2130f2f2ae5b1ee08b7141bfda01 (diff) | |
download | egit-github-f9f68711406cc90df8fab133a75a82fc8dab2c71.tar.gz egit-github-f9f68711406cc90df8fab133a75a82fc8dab2c71.tar.xz egit-github-f9f68711406cc90df8fab133a75a82fc8dab2c71.zip |
Merge branch 'stable-1.0'
* stable-1.0:
Prepare post v1.0.0.201106220257-r builds
egit-github v1.0.0.201106220257-r
Update SUA in license property
Prepare post v1.0.0.201106211955-r builds
egit-github v1.0.0.201106211955-r
Update egit-github documentation for 1.0
Update SUA and add missing license files
Add script to flip versions for releasing
Remove redundant version definition from pom.xml
Allow to inject path where to publish p2 repository
Use package dependencies for internal dependencies
Assign version to exported packages
Fix dependencies to use proper version ranges
Merge "Temporarily update to signing plugin 1.0.1.2-SNAPSHOT" into stable-1.0
Change-Id: Iad6cc948663cbc32606f117378b13b95fc51d946
Signed-off-by: Kevin Sawicki <kevin@github.com>
Diffstat (limited to 'org.eclipse.mylyn.github.core')
3 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java index 064e7629..bdc3d2f9 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.egit.github.core.Repository; +import org.eclipse.egit.github.core.RepositoryId; import org.eclipse.egit.github.core.client.RequestException; /** @@ -144,8 +144,8 @@ public class GitHub { * @param repositoryUrl * @return repository or null if not present in url */ - public static Repository getRepository(String repositoryUrl) { - return Repository.createFromUrl(repositoryUrl); + public static RepositoryId getRepository(String repositoryUrl) { + return RepositoryId.createFromUrl(repositoryUrl); } /** diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java index 3f978788..62d7966f 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java @@ -31,7 +31,7 @@ import org.eclipse.egit.github.core.Comment; import org.eclipse.egit.github.core.Issue; import org.eclipse.egit.github.core.Label; import org.eclipse.egit.github.core.Milestone; -import org.eclipse.egit.github.core.Repository; +import org.eclipse.egit.github.core.RepositoryId; import org.eclipse.egit.github.core.client.GitHubClient; import org.eclipse.egit.github.core.service.IssueService; import org.eclipse.egit.github.core.service.LabelService; @@ -108,7 +108,7 @@ public class IssueConnector extends AbstractRepositoryConnector { public List<Label> refreshLabels(TaskRepository repository) throws CoreException { Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$ - Repository repo = GitHub.getRepository(repository.getRepositoryUrl()); + RepositoryId repo = GitHub.getRepository(repository.getRepositoryUrl()); GitHubClient client = createClient(repository); LabelService service = new LabelService(client); try { @@ -158,7 +158,7 @@ public class IssueConnector extends AbstractRepositoryConnector { public List<Milestone> refreshMilestones(TaskRepository repository) throws CoreException { Assert.isNotNull(repository, "Repository cannot be null"); //$NON-NLS-1$ - Repository repo = GitHub.getRepository(repository.getRepositoryUrl()); + RepositoryId repo = GitHub.getRepository(repository.getRepositoryUrl()); GitHubClient client = createClient(repository); MilestoneService service = new MilestoneService(client); try { @@ -256,7 +256,7 @@ public class IssueConnector extends AbstractRepositoryConnector { monitor.beginTask(Messages.IssueConector_TaskQuerying, statuses.size()); try { - Repository repo = GitHub.getRepository(repository + RepositoryId repo = GitHub.getRepository(repository .getRepositoryUrl()); GitHubClient client = createClient(repository); @@ -316,7 +316,7 @@ public class IssueConnector extends AbstractRepositoryConnector { @Override public TaskData getTaskData(TaskRepository repository, String taskId, IProgressMonitor monitor) throws CoreException { - Repository repo = GitHub.getRepository(repository.getRepositoryUrl()); + RepositoryId repo = GitHub.getRepository(repository.getRepositoryUrl()); try { GitHubClient client = createClient(repository); diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java index e11febb4..29ff7787 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java @@ -25,7 +25,7 @@ import org.eclipse.egit.github.core.Issue; import org.eclipse.egit.github.core.Label; import org.eclipse.egit.github.core.Milestone; import org.eclipse.egit.github.core.PullRequest; -import org.eclipse.egit.github.core.Repository; +import org.eclipse.egit.github.core.RepositoryId; import org.eclipse.egit.github.core.User; import org.eclipse.egit.github.core.client.GitHubClient; import org.eclipse.egit.github.core.client.RequestException; @@ -383,7 +383,7 @@ public class IssueTaskDataHandler extends AbstractTaskDataHandler { IProgressMonitor monitor) throws CoreException { String taskId = taskData.getTaskId(); Issue issue = createIssue(taskData); - Repository repo = GitHub.getRepository(repository.getRepositoryUrl()); + RepositoryId repo = GitHub.getRepository(repository.getRepositoryUrl()); try { GitHubClient client = IssueConnector.createClient(repository); updateLabels(repo.getOwner(), repo.getName(), client, repository, |