Clean Code for bundles/org.eclipse.osgi

[eclipse-equinox-bot]

The following cleanups where applied:

• Add final modifier to private fields
• Add missing '@Deprecated' annotations
• Add missing '@Override' annotations
• Add missing '@Override' annotations to implementations of interface methods
• Convert control statement bodies to block
• Make inner classes static where possible
• Replace deprecated calls with inlined content where possible

[github-actions]

Test Results

  669 files  ±0    669 suites  ±0   1h 16m 23s ⏱️ +5s
2 223 tests ±0  2 176 ✅ ±0   47 💤 ±0  0 ❌ ±0 
6 813 runs  ±0  6 670 ✅ ±0  143 💤 ±0  0 ❌ ±0 

Results for commit 6b5efa6. ± Comparison against base commit 772515b.

♻️ This comment has been updated with latest results.

[laeubi]

Cleanup produces a compile error, need to investigate.

[laeubi]

I think this is similar to

• Clean Code for bundles/org.eclipse.equinox.launcher #782

I need to adjust Tycho to pass in the configured toolchain JDKs so we get a real java 8 JVM most likely.

[laeubi]

Tycho change is here:

• Set Toolchan JDKs as JDT JVM installations eclipse-tycho/tycho#4656

[laeubi]

@tjwatson this also cleanups the felix embedded code, we actually have two options here I think

1. I implement some kind of exclusion rules in tycho so we can skip some source path
2. We apply them as is to the codebase

[laeubi]

Also working here now, but waiting for feedback from @tjwatson

[tjwatson]

The changes to org.eclipse packages look fine. We should not change anything to org.osgi or org.apache source. That should be done in the respective projects. Especially for the org.osgi APIs

[eclipse-equinox-bot]

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.osgi/META-INF/MANIFEST.MF
bundles/org.eclipse.osgi/pom.xml
bundles/org.eclipse.osgi/supplement/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 a3c2a1ccd4864ef9b0ed840abcbc27a28fd4e241 Mon Sep 17 00:00:00 2001
From: Eclipse Equinox Bot <equinox-bot@eclipse.org>
Date: Tue, 11 Mar 2025 03:51:15 +0000
Subject: [PATCH] Version bump(s) for 4.36 stream


diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 0ec46ec97..17ecf574f 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -107,7 +107,7 @@ Bundle-Activator: org.eclipse.osgi.internal.framework.SystemBundleActivator
 Bundle-Description: %systemBundle
 Bundle-Copyright: %copyright
 Bundle-Vendor: %eclipse.org
-Bundle-Version: 3.23.0.qualifier
+Bundle-Version: 3.23.100.qualifier
 Bundle-Localization: systembundle
 Bundle-DocUrl: http://www.eclipse.org
 Eclipse-ExtensibleAPI: true
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 0b0ea68d6..63105001f 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -19,7 +19,7 @@
 </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.osgi</artifactId>
-  <version>3.23.0-SNAPSHOT</version>
+  <version>3.23.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
 	  <!-- The actual TCKs are executed in the org.eclipse.osgi.tck module because of reference to other service implementations -->
diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
index 6286ac09b..89e8ef752 100644
--- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.supplement
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.12.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.equinox.log;version="1.1",
-- 
2.48.1

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

[laeubi]

@tjwatson I now added the excludes, the rest looks fine for me, could you probably also review and approve?

[laeubi]

This is wrong see:

• Cleanup "Convert control statement bodies to block" joins multiple consecutive comments into the block eclipse-jdt/eclipse.jdt.ui#2067

[laeubi]

Possible improvement:

eclipse-jdt/eclipse.jdt.ui#2067 (comment)