MNT-24586 - Upgrade PDFS to 1.10.100 (#1453)

* Remove DefaultAnnotationHandlerMapping bean * Remove rogue gitignore file * Add quickshare config that surf needs * Upgrade node modules * Use minified version of tinymce * Upgrade PDFJS to 1.10.100 * Run build and test on release and fix branches * Comment SCS (cherry picked from commit 6cceba8)
Alfresco · Sep 5, 2024 · a28c1b3 · a28c1b3
1 parent 106927a
commit a28c1b3
Show file tree

Hide file tree

Showing 13 changed files with 59,841 additions and 46,598 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,8 @@ env:
 
 jobs:
   Build:
-    if: ${{ ( startsWith(github.ref_name, 'support/') || github.ref_name == 'develop' || startsWith(github.ref_name, 'SP/') ||  contains(github.ref_name, 'APPS') || startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'fix/')   ) &&
+    if: ${{ ( startsWith(github.ref_name, 'support/') || github.ref_name == 'develop' || startsWith(github.ref_name, 'SP/') ||
+      contains(github.ref_name, 'APPS')  || startsWith(github.ref_name, 'fix/') || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request' &&
       github.event.repository.fork==false }}
     runs-on: ubuntu-latest

diff --git a/aikau-sandpit-application/src/main/webapp/WEB-INF/config/web-application-config.xml b/aikau-sandpit-application/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -31,20 +31,6 @@
          </list>
       </constructor-arg>
    </bean>
-
-   <!-- Maps requests to @Controllers based on @RequestMapping("path") annotation values
-       If no annotation-based path mapping is found, Spring MVC sends a 404 response and logs a pageNotFound warning. -->
-   <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
-      <property name="order" value="1" />
-
-      <!-- SURF: required interceptors -->
-        <property name="interceptors">
-            <list>
-               <ref bean="requestContextInterceptor"/>
-               <ref bean="themeInterceptor"/>
-            </list>
-        </property>
-   </bean>
 
    <!-- This overrides the default configuration for the presets persister which determines the store to use when creating
         Surf objects from presets. By default Surf will attempt to use a remote store (which is not configured) so instead

diff --git a/aikau-sandpit-application/src/main/webapp/WEB-INF/local-store/.gitignore b/aikau-sandpit-application/src/main/webapp/WEB-INF/local-store/.gitignore
diff --git a/aikau/package.json b/aikau/package.json
@@ -2,29 +2,29 @@
   "name": "Aikau",
   "version": "0.0.1",
   "devDependencies": {
-    "forever": "0.15.1",
-    "grunt": "1.0.1",
+    "forever": "^4.0.3",
+    "grunt": "^1.6.1",
     "grunt-contrib-clean": "1.0.0",
     "grunt-contrib-connect": "1.0.2",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-jshint": "1.0.0",
-    "grunt-contrib-watch": "1.0.0",
-    "grunt-http": "2.0.1",
-    "grunt-jsdoc": "2.2.1",
+    "grunt-contrib-jshint": "^3.2.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-http": "2.3.3",
+    "grunt-jsdoc": "2.4.1",
     "grunt-notify": "0.4.5",
     "grunt-prompt": "1.3.3",
-    "grunt-shell-spawn": "0.3.10",
-    "grunt-wait-server": "0.2.1",
-    "intern": "3.1.1",
+    "grunt-shell-spawn": "^0.3.12",
+    "grunt-wait-server": "0.3.1",
+    "intern": "^4.10.1",
     "istanbul": "0.4.3",
-    "jsdoc": "3.4.0",
+    "jsdoc": "^4.0.3",
     "jshint-stylish": "2.2.0",
     "less": "2.7.1",
     "load-grunt-tasks": "3.5.0",
     "node-coverage": "1.0.7",
-    "properties-reader": "0.0.15",
+    "properties-reader": "^2.3.0",
     "safe-json-serialiser": "0.1.1",
-    "tcp-port-used": "0.1.2",
+    "tcp-port-used": "^1.0.2",
     "time-grunt": "1.3.0"
   }
 }
diff --git a/aikau/src/main/resources/alfresco/editors/TinyMCE.js b/aikau/src/main/resources/alfresco/editors/TinyMCE.js
@@ -63,7 +63,7 @@ define(["dojo/_base/declare",
        * @instance
        * @type {String[]}
        */
-      nonAmdDependencies: ["/js/lib/tinymce/tinymce.js"],
+      nonAmdDependencies: ["/js/lib/tinymce/tinymce.min.js"],
 
       /**
        * The HTML template to use for the widget.

diff --git a/aikau/src/main/resources/alfresco/preview/PdfJs/PdfJs.js b/aikau/src/main/resources/alfresco/preview/PdfJs/PdfJs.js
@@ -88,8 +88,7 @@ define(["dojo/_base/declare",
        * @instance
        * @type {String[]}
        */
-      nonAmdDependencies: ["/js/lib/pdfjs/compatibility.js",
-                           "/js/lib/pdfjs/pdf.js",
+      nonAmdDependencies: ["/js/lib/pdfjs/pdf.js",
                            "/js/lib/pdfjs/pdf.worker.js",
                            "/js/lib/3rd-party/spin.js"],