Merge branch 'feature/SEARCH-1973_UpgradeCxf' into 'master'

SEARCH-1973 Upgrade to cxf-* 3.2.5.

See merge request search_discovery/insightengine!232

search-services/alfresco-search/pom.xml

@@ -96,6 +96,57 @@
             <version>2.3.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-core</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-soap</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-xml</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-databinding-jaxb</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-simple</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-addr</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>

search-services/packaging/pom.xml

@@ -111,7 +111,7 @@
                                     <version>${project.version}</version>
                                     <classifier>libs</classifier>
                                     <outputDirectory>${project.build.directory}/solr-libs</outputDirectory>
-                                    <excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar,**/annotations-1.0.0.jar</excludes>
+                                    <excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar,**/annotations-1.0.0.jar,**/woodstox-core-asl-4.4.1.jar</excludes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -157,7 +157,9 @@
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-asl-1.9.13.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/dom4j-1.6.1.jar" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/woodstox-core-asl-4.4.1.jar" />
                             </target>
+
                         </configuration>
                     </execution>
                     <!-- Set the default solr home directory to solrhome -->

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

@@ -32,24 +32,24 @@ json-20160212.jar       http://code.google.com/p/json-simple/
 
 === Apache 2.0 ===
 xml-resolver-1.2.jar    https://github.com/FasterXML/jackson
-neethi-3.0.3.jar        http://ws.apache.org/commons/neethi/
+neethi-3.1.1.jar http://ws.apache.org/commons/neethi/
 commons-logging-1.2.jar http://jakarta.apache.org/commons/
 commons-lang3-3.9.jar http://jakarta.apache.org/commons/
 mybatis-3.3.0.jar       http://www.mybatis.org/
 chemistry-opencmis-commons-impl-1.1.0.jar      http://chemistry.apache.org/
 chemistry-opencmis-commons-api-1.1.0.jar       http://chemistry.apache.org/
-xmlschema-core-2.2.1.jar        http://ws.apache.org/commons/XmlSchema/
+xmlschema-core-2.2.3.jar http://ws.apache.org/commons/XmlSchema/
 HikariCP-java7-2.4.13.jar https://github.com/brettwooldridge/HikariCP
-cxf-core-3.0.12.jar https://cxf.apache.org/
-cxf-rt-bindings-soap-3.0.12.jar https://cxf.apache.org/
-cxf-rt-bindings-xml-3.0.12.jar https://cxf.apache.org/
-cxf-rt-databinding-jaxb-3.0.12.jar https://cxf.apache.org/
-cxf-rt-frontend-jaxws-3.0.12.jar https://cxf.apache.org/
-cxf-rt-frontend-simple-3.0.12.jar https://cxf.apache.org/
-cxf-rt-transports-http-3.0.12.jar https://cxf.apache.org/
-cxf-rt-ws-addr-3.0.12.jar https://cxf.apache.org/
-cxf-rt-ws-policy-3.0.12.jar https://cxf.apache.org/
-cxf-rt-wsdl-3.0.12.jar https://cxf.apache.org/
+cxf-core-3.2.5.jar https://cxf.apache.org/
+cxf-rt-bindings-soap-3.2.5.jar https://cxf.apache.org/
+cxf-rt-bindings-xml-3.2.5.jar https://cxf.apache.org/
+cxf-rt-databinding-jaxb-3.2.5.jar https://cxf.apache.org/
+cxf-rt-frontend-jaxws-3.2.5.jar https://cxf.apache.org/
+cxf-rt-frontend-simple-3.2.5.jar https://cxf.apache.org/
+cxf-rt-transports-http-3.2.5.jar https://cxf.apache.org/
+cxf-rt-ws-addr-3.2.5.jar https://cxf.apache.org/
+cxf-rt-ws-policy-3.2.5.jar https://cxf.apache.org/
+cxf-rt-wsdl-3.2.5.jar https://cxf.apache.org/
 mybatis-spring-1.2.5.jar        http://www.mybatis.org/
 chemistry-opencmis-server-support-1.0.0.jar     http://chemistry.apache.org/
 chemistry-opencmis-server-bindings-1.0.0.jar    http://chemistry.apache.org/
@@ -87,6 +87,7 @@ jetty-servlets-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
 jetty-util-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
 jetty-webapp-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
 jetty-xml-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
+woodstox-core-5.0.3.jar https://github.com/FasterXML/woodstox
 
 
 === CDDL 1.0 ===
@@ -229,7 +230,6 @@ tika-parsers-1.16.jar
 tika-xmp-1.16.jar
 vorbis-java-core-0.8.jar
 vorbis-java-tika-0.8.jar
-woodstox-core-asl-4.4.1.jar
 xmlbeans-2.6.0.jar
 xmpcore-5.1.2.jar
 xz-1.6.jar

search-services/pom.xml

@@ -15,6 +15,7 @@
     <name>Alfresco Solr Search parent</name>
     <properties>
         <slf4j.version>1.7.29</slf4j.version>
+        <cxf.version>3.2.5</cxf.version>
     </properties>
     <modules>
         <module>alfresco-solrclient-lib</module>