From 3371031fbf762b1c04eb4cd32b4834cd43c65376 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Fri, 11 Oct 2024 13:48:03 +0200
Subject: [PATCH] Specify VM options on Windows to use the system certificate
 store.

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

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/929
---
 .../org.eclipse.epp.package.committers.product/epp.product     | 3 +++
 packages/org.eclipse.epp.package.cpp.product/epp.product       | 3 +++
 packages/org.eclipse.epp.package.dsl.product/epp.product       | 3 +++
 packages/org.eclipse.epp.package.embedcpp.product/epp.product  | 3 +++
 packages/org.eclipse.epp.package.java.product/epp.product      | 3 +++
 packages/org.eclipse.epp.package.jee.product/epp.product       | 3 +++
 packages/org.eclipse.epp.package.modeling.product/epp.product  | 3 +++
 packages/org.eclipse.epp.package.php.product/epp.product       | 3 +++
 packages/org.eclipse.epp.package.rcp.product/epp.product       | 3 +++
 packages/org.eclipse.epp.package.scout.product/epp.product     | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 343463e4..2b69ca03 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -37,6 +37,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.committers/eclipse16.png" i32="/org.eclipse.epp.package.committers/eclipse32.png" i48="/org.eclipse.epp.package.committers/eclipse48.png" i256="/org.eclipse.epp.package.committers/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 13bd56f1..d14e5978 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -37,6 +37,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.cpp/eclipse16.png" i32="/org.eclipse.epp.package.cpp/eclipse32.png" i48="/org.eclipse.epp.package.cpp/eclipse48.png" i256="/org.eclipse.epp.package.cpp/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index 92362948..4d8d67b6 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -36,6 +36,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.dsl/eclipse16.png" i32="/org.eclipse.epp.package.dsl/eclipse32.png" i48="/org.eclipse.epp.package.dsl/eclipse48.png" i256="/org.eclipse.epp.package.dsl/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index ce1bad55..55a8fcd5 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -37,6 +37,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.embedcpp/eclipse16.png" i32="/org.eclipse.epp.package.embedcpp/eclipse32.png" i48="/org.eclipse.epp.package.embedcpp/eclipse48.png" i256="/org.eclipse.epp.package.embedcpp/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index e359675d..f6847f44 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -36,6 +36,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.java/eclipse16.png" i32="/org.eclipse.epp.package.java/eclipse32.png" i48="/org.eclipse.epp.package.java/eclipse48.png" i256="/org.eclipse.epp.package.java/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 42b34e31..361ceca4 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -36,6 +36,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.jee/javaee-ide_x16.png" i32="/org.eclipse.epp.package.jee/javaee-ide_x32.png" i48="/org.eclipse.epp.package.jee/javaee-ide_x48.png"/>
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index ccafd1f9..7d24ebbd 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -37,6 +37,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.modeling/eclipse16.png" i32="/org.eclipse.epp.package.modeling/eclipse32.png" i48="/org.eclipse.epp.package.modeling/eclipse48.png" i256="/org.eclipse.epp.package.modeling/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 7e2a33fc..407f4483 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -37,6 +37,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.php/eclipse16.png" i32="/org.eclipse.epp.package.php/eclipse32.png" i48="/org.eclipse.epp.package.php/eclipse48.png" i256="/org.eclipse.epp.package.php/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index b6e1a5ec..6801720d 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -36,6 +36,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.rcp/eclipse16.png" i32="/org.eclipse.epp.package.rcp/eclipse32.png" i48="/org.eclipse.epp.package.rcp/eclipse48.png" i256="/org.eclipse.epp.package.rcp/eclipse256.png"/>
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index ee69aebc..ed0d499a 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -37,6 +37,9 @@
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Xdock:icon=../Resources/Eclipse.icns
       </vmArgsMac>
+      <vmArgsWin>-Djavax.net.ssl.trustStoreType=Windows-ROOT
+-Djavax.net.ssl.trustStore=NONE
+      </vmArgsWin>
    </launcherArgs>
 
    <windowImages i16="/org.eclipse.epp.package.scout/eclipse16.png" i32="/org.eclipse.epp.package.scout/eclipse32.png" i48="/org.eclipse.epp.package.scout/eclipse48.png" i256="/org.eclipse.epp.package.scout/eclipse256.png"/>