From 1167d91039d6d9c4b9c5873fdc9b44d6d400e48c Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle <cjd@cjdns.fr>
Date: Fri, 9 Sep 2016 13:05:59 +0200
Subject: [PATCH] CKEDITOR-105: change hardcoded 1.9-SNAPSHOT to 1.8.5 in order
 to release

---
 ui/src/main/resources/CKEditor/EditSheet.xml      | 4 ++--
 ui/src/main/resources/CKEditor/VelocityMacros.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/resources/CKEditor/EditSheet.xml b/ui/src/main/resources/CKEditor/EditSheet.xml
index 5b928c8b7e7..0b2bfc90622 100644
--- a/ui/src/main/resources/CKEditor/EditSheet.xml
+++ b/ui/src/main/resources/CKEditor/EditSheet.xml
@@ -160,7 +160,7 @@
 #set ($bootstrap3typeaheadPath = $services.webjars.url('org.webjars.npm:bootstrap-3-typeahead', 'bootstrap3-typeahead.min'))
 #if ("$!ckeditorPath" == '')
   ## Before 6.3RC1
-  #set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.9-SNAPSHOT/ckeditor.js'))
+  #set ($ckeditorPath = $services.webjars.url('application-ckeditor-webjar/1.8.5/ckeditor.js'))
   #set ($bootstrap3typeaheadPath = $services.webjars.url('bootstrap-3-typeahead/4.0.1/bootstrap3-typeahead.min.js'))
 #elseif ($ckeditorPath.indexOf('?') &gt;= 0)
   ## Before 7.1M1 the WebJar resource path was included in the query string which means we have to specify the '.js'
@@ -680,7 +680,7 @@
 #set ($ckeditorSkinPath = $services.webjars.url('org.xwiki.contrib:application-ckeditor-webjar', 'skins/moono'))
 #if ("$!ckeditorSkinPath" == '')
   ## Before 6.3RC1
-  #set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.9-SNAPSHOT/skins/moono'))
+  #set ($ckeditorSkinPath = $services.webjars.url('application-ckeditor-webjar/1.8.5/skins/moono'))
 #end
 #if ($ckeditorSkinPath.indexOf('?') &gt;= 0)
   ## The WebJar resource path was specified in the query string before 7.1M1 which prevented the browser from resolving
diff --git a/ui/src/main/resources/CKEditor/VelocityMacros.xml b/ui/src/main/resources/CKEditor/VelocityMacros.xml
index c92cea8f531..fb69dc80ae9 100644
--- a/ui/src/main/resources/CKEditor/VelocityMacros.xml
+++ b/ui/src/main/resources/CKEditor/VelocityMacros.xml
@@ -90,7 +90,7 @@
 #end
 
 #macro (importCKEditorCSS $path $evaluate)
-  #importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.9-SNAPSHOT' $path $evaluate)
+  #importCSS('org.xwiki.contrib' 'application-ckeditor-webjar' '1.8.5' $path $evaluate)
 #end
 
 #macro (importCKEditorResources)
-- 
GitLab