Upgrade CEF to 113.0

pstuecker · PetersNils · commit a316b98e3f34 · 2023-06-13T08:45:33.000Z
diff --git a/CEF_VERSION.txt b/CEF_VERSION.txt
@@ -1,3 +1,3 @@
 # This file contains the CEF browser version used for Jenkins
 #
-cef_binary_107.1.9+g1f0a21a+chromium-107.0.5304.110_windows64_minimal
+cef_binary_113.1.5+ge452d82+chromium-113.0.5672.93_windows64_minimal
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Eclipse SET Browser Component
 
-This repository contains the embedded browser component for the Eclipse Signalling Engineering Toolbox (Eclipse SET) based on the Chromium Embedded Framework. This component is based upon an older component which was formerly integrated into the [Eclipse Platform](https://projects.eclipse.org/projects/eclipse.platform). It provides a simple to use and modern (Chromium 107+) embedded web browser component for SWT. 
+This repository contains the embedded browser component for the Eclipse Signalling Engineering Toolbox (Eclipse SET) based on the Chromium Embedded Framework. This component is based upon an older component which was formerly integrated into the [Eclipse Platform](https://projects.eclipse.org/projects/eclipse.platform). It provides a simple to use and modern (Chromium 113) embedded web browser component for SWT. 
 
 ## Usage within Eclipse SET
 
diff --git a/cef.deps b/cef.deps
@@ -1,5 +1,5 @@
 # Listed below are the current CEF and Chromium versions for Eclipse Dash
 # The CEF version should match CEF_VERSION.txt 
 # The Chromium version should match the Chromium version used to build CEF
--/-/chromiumembedded/cef/107.1.11
--/-/-/chromium/107.0.5304.110
+-/-/chromiumembedded/cef/113.1.5
+-/-/-/chromium/113.0.5672.93
diff --git a/ci/Jenkinsfile.cef b/ci/Jenkinsfile.cef
@@ -7,7 +7,7 @@ pipeline {
 
   options {
     timeout(time: 20, unit: 'MINUTES')
-    buildDiscarder(logRotator(numToKeepStr: '10'))
+    buildDiscarder(logRotator(numToKeepStr: '3'))
   }
 
   stages {
@@ -31,6 +31,7 @@ pipeline {
           {
             mvn goal: 'clean verify -P sign'
           }
+          archiveArtifacts 'java-cef/org.eclipse.set.browser.cef.releng.repository/target/*.zip'
         }
       }
     }
diff --git a/java-cef/org.eclipse.set.browser.cef.feature/feature.xml b/java-cef/org.eclipse.set.browser.cef.feature/feature.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.set.browser.cef.feature"
-      label="CEF Binary Feature"
-      version="107.0.0.qualifier"
-      provider-name="Eclipse SET Project">
+<feature id="org.eclipse.set.browser.cef.feature" label="CEF Binary Feature" version="2.0.0.qualifier" provider-name="Eclipse SET Project">
 
    <description>
       Repackaged Chromium Embedded Framework build for usage with the Eclipse Signalling Engineering Toolbox browser feature. 
@@ -19,10 +15,6 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
-   <plugin
-         id="org.eclipse.set.browser.cef.win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
+   <plugin id="org.eclipse.set.browser.cef.win32" download-size="0" install-size="0" version="0.0.0"/>
 
 </feature>
diff --git a/java-cef/org.eclipse.set.browser.cef.feature/pom.xml b/java-cef/org.eclipse.set.browser.cef.feature/pom.xml
@@ -11,6 +11,6 @@
 		<relativePath>..</relativePath>
 		<groupId>org.eclipse.set</groupId>
 		<artifactId>org.eclipse.set.browser.cef.releng.parent</artifactId>
-		<version>107.0.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 </project>
diff --git a/java-cef/org.eclipse.set.browser.cef.releng.repository/pom.xml b/java-cef/org.eclipse.set.browser.cef.releng.repository/pom.xml
@@ -11,6 +11,6 @@
 		<relativePath>..</relativePath>
 		<groupId>org.eclipse.set</groupId>
 		<artifactId>org.eclipse.set.browser.cef.releng.parent</artifactId>
-		<version>107.0.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 </project>
diff --git a/java-cef/org.eclipse.set.browser.cef.releng.target/pom.xml b/java-cef/org.eclipse.set.browser.cef.releng.target/pom.xml
@@ -11,6 +11,6 @@
 		<relativePath>..</relativePath>
 		<groupId>org.eclipse.set</groupId>
 		<artifactId>org.eclipse.set.browser.cef.releng.parent</artifactId>
-		<version>107.0.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 </project>
diff --git a/java-cef/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF b/java-cef/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Chromium Binaries
 Bundle-SymbolicName: org.eclipse.set.browser.cef.win32;singleton:=true
-Bundle-Version: 107.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Automatic-Module-Name: org.eclipse.set.browser.win32
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/java-cef/org.eclipse.set.browser.cef.win32/pom.xml b/java-cef/org.eclipse.set.browser.cef.win32/pom.xml
@@ -11,6 +11,6 @@
 		<relativePath>..</relativePath>
 		<groupId>org.eclipse.set</groupId>
 		<artifactId>org.eclipse.set.browser.cef.releng.parent</artifactId>
-		<version>107.0.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 </project>
diff --git a/java-cef/pom.xml b/java-cef/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.set</groupId>
 	<artifactId>org.eclipse.set.browser.cef.releng.parent</artifactId>
-	<version>107.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/java/org.eclipse.set.browser.lib/src/org/eclipse/set/browser/lib/cef_popup_features_t.java b/java/org.eclipse.set.browser.lib/src/org/eclipse/set/browser/lib/cef_popup_features_t.java
@@ -20,10 +20,6 @@
 public class cef_popup_features_t {
 	public int height;
 	public int heightSet;
-	public int menuBarVisible;
-	public int scrollbarsVisible;
-	public int statusBarVisible;
-	public int toolBarVisible;
 	public int width;
 	public int widthSet;
 	public int x;
diff --git a/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/Chromium.java b/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/Chromium.java
@@ -711,9 +711,9 @@ public int on_before_popup(final long popupFeaturesPtr,
 			event.widget = chromium;
 			event.required = false;
 			event.addressBar = false;
-			event.menuBar = popupFeatures.menuBarVisible == 1;
-			event.statusBar = popupFeatures.statusBarVisible == 1;
-			event.toolBar = popupFeatures.toolBarVisible == 1;
+			event.menuBar = false;
+			event.statusBar = false;
+			event.toolBar = false;
 			final int x = popupFeatures.xSet == 1 ? popupFeatures.x : 0;
 			final int y = popupFeatures.ySet == 1 ? popupFeatures.y : 0;
 			event.location = popupFeatures.xSet == 1 || popupFeatures.ySet == 1
diff --git a/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/ChromiumStatic.java b/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/ChromiumStatic.java
@@ -135,7 +135,7 @@ static synchronized void initCEF(final Display display) {
 
 			ChromiumLib.cefswt_init(app.get(),
 					CEFLibrary.getSubprocessExePath(),
-					CEFResource.getPath().toString(), CEFLibrary.getTempPath(),
+					CEFResource.getPath().toAbsolutePath().normalize().toString(), CEFLibrary.getTempPath(),
 					configuration.UserAgentProduct, configuration.Locale,
 					configuration.DebugPort, configuration.LogPath,
 					configuration.LogLevel.getValue());
diff --git a/native/chromium/src/cef/mod.rs b/native/chromium/src/cef/mod.rs
diff --git a/native/chromium/src/lib.rs b/native/chromium/src/lib.rs
diff --git a/native/chromium_jni/src/swt_wrapper.rs b/native/chromium_jni/src/swt_wrapper.rs
diff --git a/native/chromium_subp/src/bin/chromium_subp.rs b/native/chromium_subp/src/bin/chromium_subp.rs
diff --git a/native/chromium_swt/src/lib.rs b/native/chromium_swt/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# This file contains the CEF browser version used for Jenkins`
`2`	`2`	`#`
`3`		`-cef_binary_107.1.9+g1f0a21a+chromium-107.0.5304.110_windows64_minimal`
	`3`	`+cef_binary_113.1.5+ge452d82+chromium-113.0.5672.93_windows64_minimal`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pipeline {`
`7`	`7`
`8`	`8`	`options {`
`9`	`9`	`timeout(time: 20, unit: 'MINUTES')`
`10`		`- buildDiscarder(logRotator(numToKeepStr: '10'))`
	`10`	`+ buildDiscarder(logRotator(numToKeepStr: '3'))`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`stages {`
`@@ -31,6 +31,7 @@ pipeline {`
`31`	`31`	`{`
`32`	`32`	`mvn goal: 'clean verify -P sign'`
`33`	`33`	`}`
	`34`	`+ archiveArtifacts 'java-cef/org.eclipse.set.browser.cef.releng.repository/target/*.zip'`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`