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

Merged
merged 3 commits into from
Oct 15, 2024

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.core.commands/META-INF/MANIFEST.MF
bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF
bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
bundles/org.eclipse.e4.ui.workbench/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 a6945a1152555279f47fee00303e5b7582f3cbb0 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Sun, 13 Oct 2024 18:38:21 +0000
Subject: [PATCH] Version bump(s) for 4.34 stream


diff --git a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
index 045111c86d..fa4a0d9df4 100644
--- a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.core.commands;singleton:=true
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Version: 1.1.400.qualifier
+Bundle-Version: 1.1.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  jakarta.inject;version="[2.0.0,3.0.0)",
diff --git a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
index 75e53af6bb..71afdef993 100644
--- a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.bindings;singleton:=true
-Bundle-Version: 0.14.400.qualifier
+Bundle-Version: 0.14.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
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
diff --git a/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF
index 7995d6f3ad..885b29de14 100644
--- a/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.services;singleton:=true
-Bundle-Version: 1.6.300.qualifier
+Bundle-Version: 1.6.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
index 3322d6b571..c15044ab33 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.swt;singleton:=true
-Bundle-Version: 0.17.500.qualifier
+Bundle-Version: 0.17.600.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
index c1ecef66f7..6fbedd6f1f 100644
--- a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench;singleton:=true
-Bundle-Version: 1.15.500.qualifier
+Bundle-Version: 1.15.600.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.46.2

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

Copy link
Contributor

github-actions bot commented Sep 30, 2024

Test Results

 1 818 files  +  606   1 818 suites  +606   1h 31m 9s ⏱️ + 40m 10s
 7 709 tests ±    0   7 479 ✅  -     2  228 💤 ±  0  2 ❌ +2 
24 288 runs  +8 096  23 539 ✅ +7 814  747 💤 +280  2 ❌ +2 

For more details on these failures, see this check.

Results for commit 189a8cb. ± Comparison against base commit 52d1a35.

♻️ This comment has been updated with latest results.

@HannesWell
Copy link
Member Author

I have now found out why this leads to many more test-failures, by replying the build and capturing the generated DS component files and noticing that the properties of the component types are missing.

The reason is very likely that I defined ServiceContextKey with RetentionPolicy.SOURCE and thus the annotations are not recorded in the compiled class files. I did this because these annotations are not meant to be used at runtime, only by tools at compile time. But Tycho respectively BND operates on compiled classes so the annotations have to be present in the compiled classes...
I created a PR to fix that and will update all other pending ones:

Looking at org.osgi.service.event.propertytypes.EventTopics CLASS should be sufficient (in the component XML files I captured during the builds that property worked):
https://github.com/osgi/osgi/blob/b8336992a313dc092b8332f0e3aae4cff216bb03/org.osgi.service.event/src/org/osgi/service/event/propertytypes/EventTopics.java#L42-L46

HannesWell and others added 3 commits October 15, 2024 08:43
Remove the now generated OSGi Declarative Services component-xml files
from git.

Resolve wildcards in Service-Component header.
and @org.osgi.service.event.propertytypes.EventTopics where applicable.
@HannesWell
Copy link
Member Author

Finally this works. The test-failures are unrelated.
Submitting.

@HannesWell HannesWell merged commit d6a50a4 into eclipse-platform:master Oct 15, 2024
14 of 17 checks passed
@HannesWell HannesWell deleted the generate-all-ds-files branch October 15, 2024 17:29
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