SAK-40634 Update autosave and wordcount CKEDITOR plugins to 4.10.1 (s…

…akaiproject#6003) * SAK-40634 - Update CKEDITOR plugins to 4.10.1 * Update pom.xml
abdobaz · Sep 24, 2018 · dba0497 · dba0497
1 parent bd335aa
commit dba0497
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 163 deletions.
diff --git a/library/pom.xml b/library/pom.xml
@@ -17,7 +17,7 @@
 		<ckeditor.version>4.10.1</ckeditor.version>
 		<bootstrap-version>3.3.7</bootstrap-version>
 		<font-awesome-version>4.7.0</font-awesome-version>
-		<!-- Default extra plugins enabled, currently autosave disabled via SAK-33362 -->
+		<!-- Default extra plugins enabled -->
 		<ckeditor-extra-plugins>sakaipreview,image2,audiorecorder,contentitem,movieplayer,wordcount,notification,autosave</ckeditor-extra-plugins>
 		<!-- Empty defaults for a11y-->
 		<ckeditor-a11y-extra-plugins></ckeditor-a11y-extra-plugins>
@@ -61,13 +61,13 @@
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.sakaiproject.webjars</groupId>
+			<groupId>org.webjars</groupId>
 			<artifactId>ckeditor-autosave</artifactId>
 			<version>${ckeditor.autosave.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.sakaiproject.webjars</groupId>
+			<groupId>org.webjars</groupId>
 			<artifactId>ckeditor-wordcount</artifactId>
 			<version>${ckeditor.wordcount.version}</version>
 			<scope>runtime</scope>

diff --git a/library/src/webapp-filtered/editor/ckeditor.launch.js b/library/src/webapp-filtered/editor/ckeditor.launch.js
@@ -252,7 +252,7 @@ sakai.editor.editors.ckeditor.launch = function(targetId, config, w, h) {
         CKEDITOR.plugins.addExternal('image2',webJars+'image2/${ckeditor.image2.version}/', 'plugin.js');
 
         //Autosave has a dependency on notification
-        CKEDITOR.plugins.addExternal('autosave',webJars+'autosave/${ckeditor.autosave.version}/', 'plugin.js');
+        CKEDITOR.plugins.addExternal('autosave',webJars+'ckeditor-autosave/${ckeditor.autosave.version}/', 'plugin.js');
         CKEDITOR.plugins.addExternal('wordcount',webJars+'wordcount/${ckeditor.wordcount.version}/', 'plugin.js');
         CKEDITOR.plugins.addExternal('notification',basePath+'notification/', 'plugin.js');
         // Accessibility checker has a dependency on balloonpanel

diff --git a/master/pom.xml b/master/pom.xml
@@ -101,8 +101,8 @@
     <random-source></random-source>
 
     <!-- These should only be updated when the webjars version is updated -->
-    <ckeditor.autosave.version>278c922c6d8529edd15a2b2c11b574fb4320e0c2</ckeditor.autosave.version>
-    <ckeditor.wordcount.version>136ba881ddcff5aa029e3648c69358c15a982afc</ckeditor.wordcount.version>
+    <ckeditor.autosave.version>0.18.1</ckeditor.autosave.version>
+    <ckeditor.wordcount.version>1.17.3</ckeditor.wordcount.version>
     <ckeditor.a11ychecker.version>1.1.1</ckeditor.a11ychecker.version>
     <ckeditor.balloonpanel.version>4.9.2</ckeditor.balloonpanel.version>
     <ckeditor.image2.version>4.9.2</ckeditor.image2.version>

diff --git a/webjars/ckeditor-autosave/README.md b/webjars/ckeditor-autosave/README.md
diff --git a/webjars/ckeditor-autosave/pom.xml b/webjars/ckeditor-autosave/pom.xml
diff --git a/webjars/ckeditor-image2/pom.xml b/webjars/ckeditor-image2/pom.xml
@@ -20,7 +20,7 @@
     <!-- They're separate here so this can be released independently of the rest of Sakai -->
     <!-- Either use a tag or a SHA so the version is predictable. -->
     <!-- Source at https://ckeditor.com/cke4/addon/image2 -->
-    <version>4.9.2</version>
+    <version>${ckeditor.image2.version}</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/webjars/ckeditor-wordcount/README.md b/webjars/ckeditor-wordcount/README.md
diff --git a/webjars/ckeditor-wordcount/pom.xml b/webjars/ckeditor-wordcount/pom.xml
diff --git a/webjars/pom.xml b/webjars/pom.xml
@@ -11,12 +11,7 @@
   <groupId>org.sakaiproject.webjars</groupId>
   <artifactId>webjars</artifactId>
   <packaging>pom</packaging>
-  <!-- You must keep these synced in master so they're picked up correctly in library -->
-  <!-- They're separate here so this can be released independently of the rest of Sakai -->
-  <properties>
-    <ckeditor.a11ychecker.version>1.1.1</ckeditor.a11ychecker.version>
-    <ckeditor.balloonpanel.version>4.9.2</ckeditor.balloonpanel.version>
-  </properties>
+
   <!-- Only build these during the release -->
   <profiles>
       <profile>
@@ -28,8 +23,6 @@
               </property>
           </activation>
           <modules>
-              <module>ckeditor-autosave</module>
-              <module>ckeditor-wordcount</module>
               <module>ckeditor-image2</module>
           </modules>
       </profile>