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

Generate all OSGi Declarative Services component files by PDE-DS/Tycho #1573

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.

This also fixes #102.

@laeubi do you want to review this? In some cases I set a few explicit configuration properties to match the existing component file, even when I wasn't certain it is necessary.

Copy link
Contributor

github-actions bot commented Sep 30, 2024

Test Results

 1 758 files  ±0   1 758 suites  ±0   1h 25m 58s ⏱️ - 10m 19s
 3 981 tests ±0   3 959 ✅ ±0   22 💤 ±0  0 ❌ ±0 
12 540 runs  ±0  12 376 ✅ ±0  164 💤 ±0  0 ❌ ±0 

Results for commit 13fa948. ± Comparison against base commit 007ee10.

♻️ This comment has been updated with latest results.

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

Resolve wildcards in Service-Component header.
@eclipse-platform-bot
Copy link
Contributor

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

debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
runtime/tests/org.eclipse.e4.core.tests/pom.xml
ua/org.eclipse.tips.feature/feature.xml
ua/org.eclipse.tips.feature/pom.xml
ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
update/org.eclipse.update.configurator/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 0f01f20ac3aa993a643787968f73981cc914b37a Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Mon, 30 Sep 2024 17:58:04 +0000
Subject: [PATCH] Version bump(s) for 4.34 stream


diff --git a/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
index 1f7d1f0aea..384886be40 100644
--- a/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui.launchview;singleton:=true
-Bundle-Version: 1.1.500.qualifier
+Bundle-Version: 1.1.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
index 5f01bcca6e..6a237232f8 100644
--- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
+++ b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.e4.core.di.extensions.supplier
-Bundle-Version: 0.17.500.qualifier
+Bundle-Version: 0.17.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Capability: osgi.extender;
   filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))"
diff --git a/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
index 59d8f55408..8e9dcf56c3 100644
--- a/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
+++ b/runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.core.services;singleton:=true
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Version: 2.4.400.qualifier
+Bundle-Version: 2.4.500.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: jakarta.annotation;version="[2.0.0,3.0.0)",
diff --git a/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
index 50ace117ed..d5df660868 100644
--- a/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: E4 Core Tests
 Bundle-SymbolicName: org.eclipse.e4.core.tests
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 1.3.500.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-Activator: org.eclipse.e4.core.internal.tests.CoreTestsActivator
 Require-Bundle: org.eclipse.equinox.preferences;bundle-version="3.3.0",
diff --git a/runtime/tests/org.eclipse.e4.core.tests/pom.xml b/runtime/tests/org.eclipse.e4.core.tests/pom.xml
index a2ee0be626..de03637b1e 100644
--- a/runtime/tests/org.eclipse.e4.core.tests/pom.xml
+++ b/runtime/tests/org.eclipse.e4.core.tests/pom.xml
@@ -21,7 +21,7 @@
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.e4.core.tests</artifactId>
-	<version>1.3.400-SNAPSHOT</version>
+	<version>1.3.500-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
 		<testClass>org.eclipse.e4.core.tests.CoreTestSuite</testClass>
diff --git a/ua/org.eclipse.tips.feature/feature.xml b/ua/org.eclipse.tips.feature/feature.xml
index 10977f046c..1e0bfaab8c 100644
--- a/ua/org.eclipse.tips.feature/feature.xml
+++ b/ua/org.eclipse.tips.feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.tips.feature"
       label="%featureName"
-      version="0.4.400.qualifier"
+      version="0.4.500.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/ua/org.eclipse.tips.feature/pom.xml b/ua/org.eclipse.tips.feature/pom.xml
index fc12dc2649..38abb58177 100644
--- a/ua/org.eclipse.tips.feature/pom.xml
+++ b/ua/org.eclipse.tips.feature/pom.xml
@@ -23,7 +23,7 @@
   </parent>
   <groupId>org.eclipse.ui</groupId>
   <artifactId>org.eclipse.tips.feature</artifactId>
-  <version>0.4.400-SNAPSHOT</version>
+  <version>0.4.500-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
     <build>
      <plugins>
diff --git a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
index ffb5fa428b..b5d82ebb47 100644
--- a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Automatic-Module-Name: org.eclipse.tips.ide
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true
-Bundle-Version: 0.3.400.qualifier
+Bundle-Version: 0.3.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui;bundle-version="3.0.0",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
diff --git a/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF b/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF
index b7ae18c638..64ab4e2541 100644
--- a/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF
+++ b/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true
-Bundle-Version: 3.5.400.qualifier
+Bundle-Version: 3.5.500.qualifier
 Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.46.1

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

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.

Use Declarative Services annotations in ResourceChangeListenerRegistrar
2 participants