Skip to content

Commit d2efceb

Browse files
committed
[#976] Prepare 4.9.0 RC1 contribution
* adapt to EGit 7.5.0
1 parent d2c632e commit d2efceb

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

mylyn.egit/org.eclipse.mylyn.egit.ui/META-INF/MANIFEST.MF

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ Bundle-ActivationPolicy: lazy
2020
Bundle-Localization: plugin
2121
Export-Package: org.eclipse.mylyn.egit.internal.ui;version="4.0.0";x-friends:="org.eclipse.egit.ui.test",
2222
org.eclipse.mylyn.egit.internal.ui.commit;version="4.0.0";x-internal:=true
23-
Import-Package: org.eclipse.egit.core;version="[6.2.0,8.0.0)",
24-
org.eclipse.egit.core.internal;version="[6.2.0,8.0.0)",
25-
org.eclipse.egit.core.synchronize;version="[6.2.0,8.0.0)",
26-
org.eclipse.egit.ui;version="[6.2.0,8.0.0)",
27-
org.eclipse.egit.ui.internal.commit;version="[6.2.0,8.0.0)",
28-
org.eclipse.egit.ui.internal.staging;version="[6.2.0,8.0.0)",
29-
org.eclipse.egit.ui.internal.synchronize.model;version="[6.2.0,8.0.0)",
23+
Import-Package: org.eclipse.egit.core;version="[7.5.0,8.0.0)",
24+
org.eclipse.egit.core.internal;version="[7.5.0,8.0.0)",
25+
org.eclipse.egit.core.synchronize;version="[7.5.0,8.0.0)",
26+
org.eclipse.egit.ui;version="[7.5.0,8.0.0)",
27+
org.eclipse.egit.ui.api;version="[7.5.0,8.0.0)",
28+
org.eclipse.egit.ui.internal.commit;version="[7.5.0,8.0.0)",
29+
org.eclipse.egit.ui.internal.staging;version="[7.5.0,8.0.0)",
30+
org.eclipse.egit.ui.internal.synchronize.model;version="[7.5.0,8.0.0)",
3031
org.eclipse.jgit.errors;version="[6.2.0,8.0.0)",
3132
org.eclipse.jgit.lib;version="[6.2.0,8.0.0)",
3233
org.eclipse.jgit.revwalk;version="[6.2.0,8.0.0)",

mylyn.egit/org.eclipse.mylyn.egit.ui/src/org/eclipse/mylyn/egit/internal/ui/commit/ActiveTaskBranchNameProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2014 Chris Aniszczyk and others.
2+
* Copyright (c) 2011, 2025 Chris Aniszczyk and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -13,10 +13,11 @@
1313
* Benjamin Muskalla <[email protected]>
1414
* Thorsten Kamann <[email protected]>
1515
* Steffen Pingel <[email protected]>
16+
* Alexander Fedorov <[email protected]> - ongoing support
1617
*******************************************************************************/
1718
package org.eclipse.mylyn.egit.internal.ui.commit;
1819

19-
import org.eclipse.egit.ui.IBranchNameProvider;
20+
import org.eclipse.egit.ui.api.IBranchNameProvider;
2021
import org.eclipse.jgit.lib.Repository;
2122
import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
2223
import org.eclipse.mylyn.tasks.core.ITask;

mylyn.egit/org.eclipse.mylyn.egit.ui/src/org/eclipse/mylyn/egit/internal/ui/commit/MylynCommitMessageProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011 Chris Aniszczyk and others.
2+
* Copyright (c) 2011, 2025 Chris Aniszczyk and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -12,11 +12,12 @@
1212
* Manuel Doninger <[email protected]>
1313
* Benjamin Muskalla <[email protected]>
1414
* Thorsten Kamann <[email protected]>
15+
* Alexander Fedorov <[email protected]> - ongoing support
1516
*******************************************************************************/
1617
package org.eclipse.mylyn.egit.internal.ui.commit;
1718

1819
import org.eclipse.core.resources.IResource;
19-
import org.eclipse.egit.ui.ICommitMessageProvider;
20+
import org.eclipse.egit.ui.api.ICommitMessageProvider;
2021
import org.eclipse.mylyn.context.core.ContextCore;
2122
import org.eclipse.mylyn.context.core.IInteractionContext;
2223
import org.eclipse.mylyn.tasks.core.ITask;

0 commit comments

Comments
 (0)