dbeaver · mayerro · May 11, 2026 · Mar 1, 2026 · Mar 1, 2026 · Feb 28, 2026
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,7 +68,7 @@ jobs:
         -Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries
         clean verify
     - name: Upload native artifacts
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: success()
       with:
         name: ${{ matrix.config.name }} launcher artifacts
@@ -77,7 +77,7 @@ jobs:
           equinox.binaries/org.eclipse.equinox.launcher.${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64/eclipse_*.${{ matrix.config.native-extension }}
         if-no-files-found: error
     - name: Upload ${{ matrix.config.name }} Test Results
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: test-results-${{ matrix.config.name }}64
         if-no-files-found: error
@@ -118,7 +118,7 @@ jobs:
         -fn
         clean verify
     - name: Upload TCK Results
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: always()
       with:
         name: tck-results
@@ -129,7 +129,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: Event File
         path: ${{ github.event_path }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -106,7 +106,7 @@ jobs:
            ;;
            esac
       - name: Create badge of ${{ matrix.tck.name }}
-        uses: emibcn/badge-action@808173dd03e2f30c980d03ee49e181626088eee8
+        uses: emibcn/badge-action@f9150fde070fcca0c4e832437611b44838fcd325
         with:
           # label: ${{ matrix.tck.chapter }} - ${{ matrix.tck.label }} ${{ matrix.tck.suffix }}
           label:  '${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests }} tests'

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>5.0.1</version>
+		<version>5.0.2</version>
 	</extension>
 </extensions>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,6 +15,11 @@
 
 def runOnNativeBuildAgent(String platform, Closure body) {
 	def final nativeBuildStageName = 'Perform native launcher build'
+	// Use x86 agent for aarch64 build to ensure that the baseline macOS SDK (the oldest) is used consistently for all binary builds
+	if (platform == 'cocoa.macosx.aarch64') {
+		platform = 'cocoa.macosx.x86_64'
+	}
+	def agentLabel = 'native.builder-' + platform
 	if (platform == 'gtk.linux.x86_64') {
 		podTemplate(inheritFrom: 'basic' /* inherit general configuration */, containers: [
 			containerTemplate(name: 'launcherbuild', image: 'eclipse/platformreleng-debian-swtgtk3nativebuild:10',
@@ -25,12 +30,9 @@ def runOnNativeBuildAgent(String platform, Closure body) {
 			node(POD_LABEL) { stage(nativeBuildStageName) { container('launcherbuild') { body() } } }
 		}
 	} else {
-		if (platform == 'cocoa.macosx.x86_64') {
-			platform = 'cocoa.macosx.aarch64'
-		}
 		// See the Definition of the RelEng Jenkins instance in
 		// https://github.com/eclipse-cbi/jiro/tree/master/instances/eclipse.platform.releng
-		node('native.builder-' + platform) { stage(nativeBuildStageName) { body() } }
+		node(agentLabel) { stage(nativeBuildStageName) { body() } }
 	}
 }
 

diff --git a/bundles/org.eclipse.equinox.concurrent/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.concurrent/.settings/org.eclipse.jdt.core.prefs
@@ -9,6 +9,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17

diff --git a/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.concurrent
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 1.3.500.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.eclipse.core.runtime;common=split;version="3.4.0"

diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.console.jaas.fragment/.settings/org.eclipse.jdt.core.prefs
@@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17

diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.console.jaas.fragment
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 DynamicImport-Package: org.eclipse.equinox.console.jaas
 Fragment-Host: org.apache.sshd.osgi;bundle-version="2.2.0"

diff --git a/bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.http.service.api/.settings/org.eclipse.jdt.core.prefs
@@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bundles/org.eclipse.equinox.http.service.api/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.service.api/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OSGi service http APIs
 Bundle-SymbolicName: org.eclipse.equinox.http.service.api
-Bundle-Version: 1.2.102.qualifier
+Bundle-Version: 1.2.202.qualifier
 Bundle-Vendor: Eclipse.org - Equinox
 Automatic-Module-Name: org.eclipse.equinox.http.service.api
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.aarch64;singleton:=true
-Bundle-Version: 1.2.1400.qualifier
+Bundle-Version: 1.2.1500.qualifier
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.7.0,1.8.0)"
 Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=aarch64) )
 Bundle-Localization: launcher.cocoa.macosx.aarch64

diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64/build.properties
@@ -16,7 +16,7 @@ bin.includes = META-INF/,\
                about.html
 
 generateSourceBundle=false
-binaryTag=LBv1-1916
+binaryTag=LBv1-1921
 
 # Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
 tycho.pomless.parent = ../../launcher-binary-parent

diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.x86_64;singleton:=true
-Bundle-Version: 1.2.1400.qualifier
+Bundle-Version: 1.2.1500.qualifier
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.7.0,1.8.0)"
 Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86_64) )
 Bundle-Localization: launcher.cocoa.macosx.x86_64

diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
@@ -16,7 +16,7 @@ bin.includes = META-INF/,\
                about.html
 
 generateSourceBundle=false
-binaryTag=LBv1-1916
+binaryTag=LBv1-1921
 
 # Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
 tycho.pomless.parent = ../../launcher-binary-parent

diff --git a/bundles/org.eclipse.equinox.launcher.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.launcher.tests/.settings/org.eclipse.jdt.core.prefs
@@ -4,6 +4,7 @@ org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
diff --git a/bundles/org.eclipse.equinox.security.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.security.tests/.settings/org.eclipse.jdt.core.prefs
@@ -44,7 +44,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

diff --git a/bundles/org.eclipse.equinox.security.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Equinox security tests
 Bundle-SymbolicName: org.eclipse.equinox.security.tests;singleton:=true
-Bundle-Version: 1.3.600.qualifier
+Bundle-Version: 1.3.700.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.security.tests.SecurityTestsActivator
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: Eclipse.org

diff --git a/bundles/org.eclipse.equinox.slf4j/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.slf4j/.settings/org.eclipse.jdt.core.prefs
@@ -4,6 +4,7 @@ org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
diff --git a/bundles/org.eclipse.equinox.slf4j/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.slf4j/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.slf4j
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Import-Package: org.eclipse.equinox.log;version="[1.1.0,2.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)",
  org.osgi.service.log;version="[1.5.0,2.0.0)",

diff --git a/bundles/org.eclipse.equinox.slf4j/src/org/eclipse/equinox/slf4j/EquinoxLogger.java b/bundles/org.eclipse.equinox.slf4j/src/org/eclipse/equinox/slf4j/EquinoxLogger.java
@@ -90,26 +90,42 @@ protected void handleNormalizedLoggingCall(Level level, Marker marker, String me
 		if (logger == null) {
 			return;
 		}
+		//Must not pass a null argument to OSGi Logger
+		Object[] loggerArguments = throwable != null ? new Object[] { throwable } : new Object[0];
 
 		if(level == Level.TRACE && logger.isTraceEnabled()) {
-			String formattedMessage = MessageFormatter.basicArrayFormat(messagePattern, arguments);
-			logger.trace(formattedMessage,throwable);
+			String formattedMessage = safeBasicArrayFormat(messagePattern, arguments);
+			logger.trace(formattedMessage, loggerArguments);
 		}
 		if(level == Level.DEBUG && logger.isDebugEnabled()) {
-			String formattedMessage = MessageFormatter.basicArrayFormat(messagePattern, arguments);
-			logger.debug(formattedMessage,throwable);
+			String formattedMessage = safeBasicArrayFormat(messagePattern, arguments);
+			logger.debug(formattedMessage, loggerArguments);
 		}
 		if(level == Level.WARN && logger.isWarnEnabled()) {
-			String formattedMessage = MessageFormatter.basicArrayFormat(messagePattern, arguments);
-			logger.warn(formattedMessage,throwable);
+			String formattedMessage = safeBasicArrayFormat(messagePattern, arguments);
+			logger.warn(formattedMessage, loggerArguments);
 		}
 		if(level == Level.INFO && logger.isInfoEnabled()) {
-			String formattedMessage = MessageFormatter.basicArrayFormat(messagePattern, arguments);
-			logger.info(formattedMessage, throwable);
+			String formattedMessage = safeBasicArrayFormat(messagePattern, arguments);
+			logger.info(formattedMessage, loggerArguments);
 		}
-		if(level == Level.ERROR && logger.isInfoEnabled()) {
-			String formattedMessage = MessageFormatter.basicArrayFormat(messagePattern, arguments);
-			logger.info(formattedMessage, throwable);
+		if(level == Level.ERROR && logger.isErrorEnabled()) {
+			String formattedMessage = safeBasicArrayFormat(messagePattern, arguments);
+			logger.error(formattedMessage, loggerArguments);
+		}
+	}
+
+	/**
+	 * Wrapper around SLF4J basicArrayFormat that guards against a null message pattern.
+	 * OSGi does not allow logging a null message
+	 * @param messagePattern
+	 * @param arguments
+	 */
+	private String safeBasicArrayFormat(String messagePattern, Object[] arguments) {
+		if(messagePattern == null) {
+			return String.valueOf(messagePattern);
+		} else {
+			return MessageFormatter.basicArrayFormat(messagePattern, arguments);
 		}
 	}
 

diff --git a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core OSGi Tests
 Bundle-SymbolicName: org.eclipse.osgi.tests;singleton:=true
-Bundle-Version: 3.22.500.qualifier
+Bundle-Version: 3.22.600.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: 
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",

diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.osgi.tests</artifactId>
-  <version>3.22.500-SNAPSHOT</version>
+  <version>3.22.600-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>

diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogEquinoxTraceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogEquinoxTraceTest.java
@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.eclipse.equinox.log.SynchronousLogListener;
 import org.eclipse.osgi.internal.debug.Debug;
 import org.eclipse.osgi.launch.Equinox;
@@ -39,6 +41,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.condition.Condition;
 import org.osgi.service.log.LogEntry;
@@ -87,16 +90,28 @@ public void setUp() throws Exception {
 		Map<String, Object> configuration = new HashMap<>();
 		configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
 		equinox = new Equinox(configuration);
+		equinox.init();
+
+		BundleContext systemContext = equinox.getBundleContext();
+		CountDownLatch frameworkStarted = new CountDownLatch(1);
+		systemContext.addFrameworkListener((e) -> {
+			if (FrameworkEvent.STARTED == e.getType()) {
+				frameworkStarted.countDown();
+			}
+		});
+
 		equinox.start();
-		loggerAdmin = equinox.getBundleContext()
-				.getService(equinox.getBundleContext().getServiceReference(LoggerAdmin.class));
-		LogReaderService logReader = equinox.getBundleContext()
-				.getService(equinox.getBundleContext().getServiceReference(LogReaderService.class));
+		// Need to wait for the STARTED event before continuing to ensure
+		// all events are flushed before adding the test log listener
+		frameworkStarted.await(1, TimeUnit.MINUTES);
 
+		loggerAdmin = systemContext.getService(systemContext.getServiceReference(LoggerAdmin.class));
 		testListener = new TestListener();
+
+		LogReaderService logReader = systemContext
+				.getService(systemContext.getServiceReference(LogReaderService.class));
 		logReader.addLogListener(testListener);
 
-		BundleContext systemContext = equinox.getBundleContext();
 		debugOptions = systemContext.getService(systemContext.getServiceReference(DebugOptions.class));
 	}
 

diff --git a/bundles/org.eclipse.osgi/.classpath b/bundles/org.eclipse.osgi/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="osgi/src">
 		<attributes>
@@ -25,6 +26,5 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git 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.24.100.qualifier
+Bundle-Version: 3.24.200.qualifier
 Bundle-Localization: systembundle
 Bundle-DocUrl: http://www.eclipse.org
 Eclipse-ExtensibleAPI: true

diff --git a/bundles/org.eclipse.osgi/bnd.bnd b/bundles/org.eclipse.osgi/bnd.bnd
@@ -5,7 +5,6 @@
 
 Require-Capability: \
  osgi.serviceloader;osgi.serviceloader="org.osgi.framework.connect.FrameworkUtilHelper", \
- osgi.serviceloader;osgi.serviceloader="java.net.ContentHandlerFactory", \
- osgi.serviceloader;osgi.serviceloader="java.net.URLStreamHandlerFactory"
+ osgi.serviceloader;osgi.serviceloader="java.net.ContentHandlerFactory"