From db2dc500c690148384f2e87a0c721755af8792b3 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Wed, 9 Sep 2020 16:50:29 +0300
Subject: [PATCH] CKEDITOR-368: Upgrade to CKEditor 4.15

---
 base/src/main/config/build-config.js   | 6 ++++--
 pom.xml                                | 2 +-
 webjar/src/main/config/build-config.js | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/base/src/main/config/build-config.js b/base/src/main/config/build-config.js
index 7940a4a9..cad0d6c6 100644
--- a/base/src/main/config/build-config.js
+++ b/base/src/main/config/build-config.js
@@ -90,14 +90,16 @@ var CKBUILDER_CONFIG = {
     maximize: 1,
     mentions: 1,
     newpage: 0,
-    pagebreak: 0,
     notification: 1,
+    pagebreak: 0,
     pastetools: 1,
+    pastefromlibreoffice: 1,
     pastefromword: 1,
+    pastetext: 1,
     pastefromgdocs: 1,
+    editorplaceholder: 1,
     preview: 0,
     print: 0,
-    pastetext: 1,
     removeformat: 1,
     resize: 1,
     save: 1,
diff --git a/pom.xml b/pom.xml
index e68b8221..b8e5b164 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <tag>HEAD</tag>
   </scm>
   <properties>
-    <ckeditor.version>4.14.1</ckeditor.version>
+    <ckeditor.version>4.15.0</ckeditor.version>
     <!-- The path to the folder where we clone the CKEditor sources. -->
     <ckeditor.path>${project.build.directory}/ckeditor4-${ckeditor.version}</ckeditor.path>
     <ckeditor.builder.path>${ckeditor.path}/dev/builder</ckeditor.builder.path>
diff --git a/webjar/src/main/config/build-config.js b/webjar/src/main/config/build-config.js
index 2c3563a0..9fc76ca1 100644
--- a/webjar/src/main/config/build-config.js
+++ b/webjar/src/main/config/build-config.js
@@ -91,14 +91,16 @@ var CKBUILDER_CONFIG = {
     maximize: 1,
     mentions: 1,
     newpage: 0,
-    pagebreak: 0,
     notification: 1,
+    pagebreak: 0,
     pastetools: 1,
+    pastefromlibreoffice: 1,
     pastefromword: 1,
+    pastetext: 1,
     pastefromgdocs: 1,
+    editorplaceholder: 1,
     preview: 0,
     print: 0,
-    pastetext: 1,
     removeformat: 1,
     resize: 1,
     save: 1,