diff --git a/pom.xml b/pom.xml
index c637ae2af8..1707d81b3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -395,7 +395,7 @@
org.eclipse.tycho
target-platform-configuration
- JavaSE-${jdk.version}
+ org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-${jdk.version}
win32
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
index 2dbcdcffdd..19658a990a 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -1,7 +1,7 @@
-
+
@@ -145,6 +145,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
+
@@ -159,7 +160,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
-
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
index ccb7525027..54ec115ced 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
index 6396f61140..cdce8b2c4e 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
index b17bed9191..c572937928 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
index f2eb2211e5..4e4da9b85b 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
index 61d8493bdc..8ccf180e59 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
index 10b11742f1..1f0f7337d8 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target
index 126fbbe855..dd9f5fdec5 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target
index 0841dd904a..e01ac1c730 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
index 8d4dda68ef..d0682d4882 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target
index fda7ac2432..06bfe5aa2b 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target
index 8d4418819b..58768bcde5 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target
index 0dca1940cb..b988a1283c 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target
index 38c692d956..d89e5d6507 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.33.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.33.target
index da64ee1396..1708161db6 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.33.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.33.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target
index 01c80bf4fc..b49103188e 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.34.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target
index 8d05c5340a..dd76f1b556 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.35.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index fe30704aed..e8d3d809b0 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -1,6 +1,10 @@
-
+
+
+
+
+