From 7d434a5005db616294c005574df28f16666ec285 Mon Sep 17 00:00:00 2001
From: UmaShankar Avagadda <umagmrit@gmail.com>
Date: Thu, 27 Apr 2023 11:26:54 +0530
Subject: [PATCH] ZBUG-3233 : Upgrade Apache CXF to 3.5.5 (#104)

* ZBUG-3233:Upgrade Apache CXF to 3.5.5

* ZBUG-3233:Upgrade Spring Framework Jars to 6.0.8
---
 ivy.xml        | 18 +++++++++---------
 pkg-builder.pl | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 0e4ef54..f3f32aa 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -68,10 +68,10 @@
     <dependency org="org.apache.curator" name="curator-framework" rev="2.0.1-incubating"/>
     <dependency org="org.apache.curator" name="curator-recipes" rev="2.0.1-incubating"/>
     <dependency org="org.apache.curator" name="curator-x-discovery" rev="2.0.1-incubating"/>
-    <dependency org="org.apache.cxf" name="cxf-core" rev="3.5.1" />
-    <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.5.1" />
-    <dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.5.1" />
-    <dependency org="org.apache.cxf" name="cxf-rt-bindings-soap" rev="3.5.1" />
+    <dependency org="org.apache.cxf" name="cxf-core" rev="3.5.5" />
+    <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.5.5" />
+    <dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.5.5" />
+    <dependency org="org.apache.cxf" name="cxf-rt-bindings-soap" rev="3.5.5" />
     <dependency org="org.apache.helix" name="helix-core" rev="0.6.1-incubating"/>
     <dependency org="org.apache.httpcomponents" name="httpasyncclient" rev="4.1.4"/>
     <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.8"/>
@@ -119,11 +119,11 @@
     <dependency org="org.scijava" name="native-lib-loader" rev="2.3.5"/>
     <dependency org="org.slf4j" name="slf4j-api" rev="1.7.36"/>
     <dependency org="org.slf4j" name="slf4j-simple" rev="1.7.36"/>
-    <dependency org="org.springframework" name="spring-aop" rev="5.3.18"/>
-    <dependency org="org.springframework" name="spring-beans" rev="5.3.18"/>
-    <dependency org="org.springframework" name="spring-context" rev="5.3.18"/>
-    <dependency org="org.springframework" name="spring-core" rev="5.3.18"/>
-    <dependency org="org.springframework" name="spring-expression" rev="5.3.18"/>
+    <dependency org="org.springframework" name="spring-aop" rev="6.0.8"/>
+    <dependency org="org.springframework" name="spring-beans" rev="6.0.8"/>
+    <dependency org="org.springframework" name="spring-context" rev="6.0.8"/>
+    <dependency org="org.springframework" name="spring-core" rev="6.0.8"/>
+    <dependency org="org.springframework" name="spring-expression" rev="6.0.8"/>
     <dependency org="org.syslog4j" name="syslog4j" rev="0.9.46" transitive="false"/>
     <dependency org="org.xerial" name="sqlite-jdbc" rev="3.7.15-M1"/>
     <dependency org="redis.clients" name="jedis" rev="2.9.0"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 28dffae..fd3118f 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -128,7 +128,7 @@ ($)
         cpy_file("build/dist/curator-framework-2.0.1-incubating.jar",               "$stage_base_dir/opt/zimbra/lib/jars/curator-framework-2.0.1-incubating.jar");
         cpy_file("build/dist/curator-recipes-2.0.1-incubating.jar",                 "$stage_base_dir/opt/zimbra/lib/jars/curator-recipes-2.0.1-incubating.jar");
         cpy_file("build/dist/curator-x-discovery-2.0.1-incubating.jar",             "$stage_base_dir/opt/zimbra/lib/jars/curator-x-discovery-2.0.1-incubating.jar");
-        cpy_file("build/dist/cxf-core-3.5.1.jar",                                   "$stage_base_dir/opt/zimbra/lib/jars/cxf-core-3.5.1.jar");
+        cpy_file("build/dist/cxf-core-3.5.5.jar",                                   "$stage_base_dir/opt/zimbra/lib/jars/cxf-core-3.5.5.jar");
         cpy_file("build/dist/dom4j-2.1.1.jar",                                      "$stage_base_dir/opt/zimbra/lib/jars/dom4j-2.1.1.jar");
         cpy_file("build/dist/freemarker-2.3.19.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/freemarker-2.3.19.jar");
         cpy_file("build/dist/gifencoder-0.9.jar",                                   "$stage_base_dir/opt/zimbra/lib/jars/gifencoder-0.9.jar");
@@ -198,11 +198,11 @@ ($)
         cpy_file("build/dist/policy-2.3.jar",                                       "$stage_base_dir/opt/zimbra/lib/jars/policy-2.3.jar");
         cpy_file("build/dist/slf4j-api-1.7.36.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/slf4j-api-1.7.36.jar");
         cpy_file("build/dist/slf4j-simple-1.7.36.jar",                             "$stage_base_dir/opt/zimbra/lib/jars/slf4j-simple-1.7.36.jar");
-        cpy_file("build/dist/spring-aop-5.3.18.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/spring-aop-5.3.18.jar");
-        cpy_file("build/dist/spring-beans-5.3.18.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/spring-beans-5.3.18.jar");
-        cpy_file("build/dist/spring-context-5.3.18.jar",                            "$stage_base_dir/opt/zimbra/lib/jars/spring-context-5.3.18.jar");
-        cpy_file("build/dist/spring-core-5.3.18.jar",                               "$stage_base_dir/opt/zimbra/lib/jars/spring-core-5.3.18.jar");
-        cpy_file("build/dist/spring-expression-5.3.18.jar",                         "$stage_base_dir/opt/zimbra/lib/jars/spring-expression-5.3.18.jar");
+        cpy_file("build/dist/spring-aop-6.0.8.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/spring-aop-6.0.8.jar");
+        cpy_file("build/dist/spring-beans-6.0.8.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/spring-beans-6.0.8.jar");
+        cpy_file("build/dist/spring-context-6.0.8.jar",                            "$stage_base_dir/opt/zimbra/lib/jars/spring-context-6.0.8.jar");
+        cpy_file("build/dist/spring-core-6.0.8.jar",                               "$stage_base_dir/opt/zimbra/lib/jars/spring-core-6.0.8.jar");
+        cpy_file("build/dist/spring-expression-6.0.8.jar",                         "$stage_base_dir/opt/zimbra/lib/jars/spring-expression-6.0.8.jar");
         cpy_file("build/dist/spymemcached-2.12.1.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/spymemcached-2.12.1.jar");
         cpy_file("build/dist/jedis-2.9.0.jar",                                      "$stage_base_dir/opt/zimbra/lib/jars/jedis-2.9.0.jar");
         cpy_file("build/dist/commons-pool2-2.4.2.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/commons-pool2-2.4.2.jar");