From 1e0a40442ce7cf6856be189d8ca1d610b3a8c1fd Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Thu, 13 Nov 2025 19:56:19 +0100
Subject: [PATCH] Add -Declipse.platform.mergeTrust=true to products

- Remove -Djavax.net.ssl.trustStoreType=Windows-ROOT and
-Djavax.net.ssl.trustStore=NONE

https://github.com/eclipse-platform/eclipse.platform/issues/1690
---
 .../eclipse.platform.repository/platform.product         | 9 ++++++---
 .../eclipse.platform.repository/sdk.product              | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
index 09943bff750..9002ca4b261 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
@@ -9,12 +9,15 @@
    <launcherArgs>
       <programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off
+      <vmArgs>-Dosgi.requiredJavaVersion=21
+-Dosgi.dataAreaRequiresExplicitInit=true
+-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true=
+-Dorg.slf4j.simpleLogger.defaultLogLevel=off
+-Declipse.platform.mergeTrust=true
+--add-modules=ALL-SYSTEM
       </vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT -Djavax.net.ssl.trustStore=NONE
-      </vmArgsWin>
    </launcherArgs>
 
    <splash
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
index 75cee93cc92..24a457f21a9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
@@ -9,12 +9,15 @@
    <launcherArgs>
       <programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=21 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off
+      <vmArgs>-Dosgi.requiredJavaVersion=21
+-Dosgi.dataAreaRequiresExplicitInit=true
+-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
+-Dorg.slf4j.simpleLogger.defaultLogLevel=off
+-Declipse.platform.mergeTrust=true
+--add-modules=ALL-SYSTEM
       </vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT -Djavax.net.ssl.trustStore=NONE
-      </vmArgsWin>
    </launcherArgs>
 
    <splash