Merge pull request #1324 from Alfresco/fix/MNT-22547_upgrade_jquery

MNT-22547: upgrade jquery to 3.5.1

search-services/packaging/pom.xml

@@ -175,6 +175,8 @@
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.9.0.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.3.0.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.3.0.jar" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/libs/jquery-2.1.3.min.js" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/js/lib/jquery-1.7.2.min.js" />
                             </target>
 
                         </configuration>
@@ -295,6 +297,22 @@
                         </replacements>
                      </configuration>
                   </execution>
+                   <execution>
+                       <id>jquery-upgrade</id>
+                       <phase>prepare-package</phase>
+                       <goals>
+                           <goal>replace</goal>
+                       </goals>
+                       <configuration>
+                           <file>${solr.directory}/server/solr-webapp/webapp/index.html</file>
+                           <replacements>
+                               <replacement>
+                                   <token>libs/jquery-2.1.3.min.js</token>
+                                   <value>libs/jquery-3.5.1.min.js</value>
+                               </replacement>
+                           </replacements>
+                       </configuration>
+                   </execution>
                </executions>
             </plugin>
             <plugin>

search-services/packaging/src/assembly/solr-distribution.xml

@@ -12,6 +12,16 @@
             <outputDirectory>./solr/server/solr-webapp/webapp/img</outputDirectory>
             <filtered>false</filtered>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.outputDirectory}/solr/server/solr-webapp/webapp/js/lib</directory>
+            <outputDirectory>./solr/server/solr-webapp/webapp/js/lib</outputDirectory>
+            <filtered>false</filtered>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.outputDirectory}/solr/server/solr-webapp/webapp/libs</directory>
+            <outputDirectory>./solr/server/solr-webapp/webapp/libs</outputDirectory>
+            <filtered>false</filtered>
+        </fileSet>
         <fileSet>
             <directory>${project.build.outputDirectory}</directory>
             <outputDirectory>.</outputDirectory>

search-services/packaging/src/main/resources/licenses/3rd-party/MITlike-jquery.txt

@@ -0,0 +1,20 @@
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

search-services/packaging/src/main/resources/licenses/js-notice.txt

@@ -0,0 +1,44 @@
+Copyright (c) 2005-2019 Alfresco Software, Ltd. and others.
+All rights reserved.  This program and the accompanying materials are made available under the terms of the Alfresco
+agreement located at www.alfresco.com/legal/agreements/ or other commercial agreement between Alfresco Software, Ltd.
+("Alfresco") and the user of this program.
+Portions of this product distribution require certain copyright or other notices to
+be included with the product distribution.  These notices may also appear in individual
+source files.
+
+Below is the list of licenses and modules used under corresponding licenses. Licenses for libraries used by Apache Solr are listed separately.
+
+
+=== MIT ===
+jquery-3.5.1.min.js https://github.com/jquery/jquery/blob/3.5.1/LICENSE.txt
+
+
+=== Part of Apache Solr (Licenses listed separately) ===
+angular-chosen.js
+angular-cookies.js
+angular-cookies.min.js
+angular-resource.min.js
+angular-route.js
+angular-route.min.js
+angular-sanitize.js
+angular-sanitize.min.js
+angular.js
+angular.min.js
+chosen.jquery.js
+chosen.jquery.min.js
+chosen.js
+console.js
+d3.js
+highlight.js
+jquery.ajaxfileupload.js
+jquery.blockUI.js
+jquery.cookie.js
+jquery.form.js
+jquery.jstree.js
+jquery.sammy.js
+jquery.timeago.js
+linker.js
+naturalSort.js
+ngtimeago.js
+order.js
+ZeroClipboard.js