Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generated all OSGi Declarative Services component files by PDE-DS/Tycho #2344

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

HannesWell
Copy link
Member

Remove the now generated OSGi Declarative Services component-xml files from git.

Resolve wildcards in Service-Component header.

@laeubi do you want to have a look at this as well?

@eclipse-platform-bot
Copy link
Contributor

eclipse-platform-bot commented Sep 30, 2024

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From 8fe71ececca5da83e22a39aa8e48bdab76ba2c6b Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Tue, 1 Oct 2024 21:45:13 +0000
Subject: [PATCH] Version bump(s) for 4.34 stream


diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
index d96b1bb7f1..35c9b4571f 100644
--- a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.progress;singleton:=true
-Bundle-Version: 0.4.600.qualifier
+Bundle-Version: 0.4.700.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.46.1

Further information are available in Common Build Issues - Missing version increments.

Copy link
Contributor

github-actions bot commented Sep 30, 2024

Test Results

 1 815 files  ±0   1 815 suites  ±0   1h 35m 54s ⏱️ + 2m 19s
 7 702 tests ±0   7 474 ✅ +1  228 💤 ±0  0 ❌  - 1 
24 267 runs  ±0  23 520 ✅ +1  747 💤 ±0  0 ❌  - 1 

Results for commit 35c6339. ± Comparison against base commit 04dc50b.

♻️ This comment has been updated with latest results.


@Component(service = IContextFunction.class, property = {
"service.context.key=org.eclipse.e4.ui.progress.IProgressService" })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might want to define a component property type for this @ServiceContectKey(Class)) this will avoid needing to manually set such property

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -38,6 +40,7 @@

import org.eclipse.search.internal.core.text.DirtyFileProvider;

@Component(service = DirtyFileProvider.class, immediate = false, property = { "weight:Integer=100" })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe replace weight with ServiceRank?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it would have been a good choice when this service was introduced. But now that it is defined as property to sort difference service implementations I would consider this an API and for now I don't want to implement support for both in DirtyFileSearchParticipantServiceTracker.

Remove the now generated OSGi Declarative Services component-xml files
from git.

Resolve wildcards in Service-Component header.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants