From e2a727d98dfbe5e26b69ae1976679f90e9a35350 Mon Sep 17 00:00:00 2001
From: Nguyen Van Nguyen <nguyennv1981@gmail.com>
Date: Fri, 21 Apr 2023 08:59:09 +0700
Subject: [PATCH] Update pac4j to version 4.5.7

Signed-off-by: Nguyen Van Nguyen <nguyennv1981@gmail.com>
---
 Makefile  |  2 +-
 build.xml | 30 +++++++++++++++---------------
 pom.xml   |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 1a95201..7ae29bb 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,6 @@ rpmbuild:
 install: dist/zm-sso
 	mkdir -p /opt/zimbra/lib/ext/zm-sso
 	cp target/*.jar /opt/zimbra/lib/ext/zm-sso
-	cp target/dependencies/*.jar /opt/zimbra/jetty_base/common/lib
+	cp target/dependencies/*.jar /opt/zimbra/lib/ext-common
 	cp conf/zm.sso.properties /opt/zimbra/conf
 	su - zimbra -c '/opt/zimbra/bin/zmmailboxdctl restart'
diff --git a/build.xml b/build.xml
index 0f533a0..74ef427 100644
--- a/build.xml
+++ b/build.xml
@@ -73,52 +73,52 @@
 
     <target name="check-pac4j-core">
         <condition property="available-pac4j-core">
-            <available file="${deps}/pac4j-core-4.5.4.jar" />
+            <available file="${deps}/pac4j-core-4.5.7.jar" />
         </condition>
     </target>
     <target name="download-pac4j-core" depends="check-pac4j-core" unless="available-pac4j-core">
-        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-core/4.5.4/pac4j-core-4.5.4.jar"
-             dest="${deps}/pac4j-core-4.5.4.jar" usetimestamp="true"/>
+        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-core/4.5.7/pac4j-core-4.5.7.jar"
+             dest="${deps}/pac4j-core-4.5.7.jar" usetimestamp="true"/>
     </target>
 
     <target name="check-pac4j-cas">
         <condition property="available-pac4j-cas">
-            <available file="${deps}/pac4j-cas-4.5.4.jar" />
+            <available file="${deps}/pac4j-cas-4.5.7.jar" />
         </condition>
     </target>
     <target name="download-pac4j-cas" depends="check-pac4j-cas" unless="available-pac4j-cas">
-        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-cas/4.5.4/pac4j-cas-4.5.4.jar"
-             dest="${deps}/pac4j-cas-4.5.4.jar" usetimestamp="true"/>
+        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-cas/4.5.7/pac4j-cas-4.5.7.jar"
+             dest="${deps}/pac4j-cas-4.5.7.jar" usetimestamp="true"/>
     </target>
 
     <target name="check-pac4j-oidc">
         <condition property="available-pac4j-oidc">
-            <available file="${deps}/pac4j-oidc-4.5.4.jar" />
+            <available file="${deps}/pac4j-oidc-4.5.7.jar" />
         </condition>
     </target>
     <target name="download-pac4j-oidc" depends="check-pac4j-oidc" unless="available-pac4j-oidc">
-        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-oidc/4.5.4/pac4j-oidc-4.5.4.jar"
-             dest="${deps}/pac4j-oidc-4.5.4.jar" usetimestamp="true"/>
+        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-oidc/4.5.7/pac4j-oidc-4.5.7.jar"
+             dest="${deps}/pac4j-oidc-4.5.7.jar" usetimestamp="true"/>
     </target>
 
     <target name="check-pac4j-opensamlv3">
         <condition property="available-pac4j-opensamlv3">
-            <available file="${deps}/pac4j-saml-opensamlv3-4.5.4.jar" />
+            <available file="${deps}/pac4j-saml-opensamlv3-4.5.7.jar" />
         </condition>
     </target>
     <target name="download-pac4j-opensamlv3" depends="check-pac4j-opensamlv3" unless="available-pac4j-opensamlv3">
-        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-saml-opensamlv3/4.5.4/pac4j-saml-opensamlv3-4.5.4.jar"
-             dest="${deps}/pac4j-saml-opensamlv3-4.5.4.jar" usetimestamp="true"/>
+        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-saml-opensamlv3/4.5.7/pac4j-saml-opensamlv3-4.5.7.jar"
+             dest="${deps}/pac4j-saml-opensamlv3-4.5.7.jar" usetimestamp="true"/>
     </target>
 
     <target name="check-pac4j-config">
         <condition property="available-pac4j-config">
-            <available file="${deps}/pac4j-config-4.5.4.jar" />
+            <available file="${deps}/pac4j-config-4.5.7.jar" />
         </condition>
     </target>
     <target name="download-pac4j-config" depends="check-pac4j-config" unless="available-pac4j-config">
-        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-config/4.5.4/pac4j-config-4.5.4.jar"
-             dest="${deps}/pac4j-config-4.5.4.jar" usetimestamp="true"/>
+        <get src="https://repo1.maven.org/maven2/org/pac4j/pac4j-config/4.5.7/pac4j-config-4.5.7.jar"
+             dest="${deps}/pac4j-config-4.5.7.jar" usetimestamp="true"/>
     </target>
 
     <target name="check-commons-io">
diff --git a/pom.xml b/pom.xml
index 097ac4c..f7e57ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <pac4j.version>4.5.4</pac4j.version>
+        <pac4j.version>4.5.7</pac4j.version>
         <zimbra.version>8.8.15</zimbra.version>
         <zimbra.lib.dir>${project.basedir}/lib</zimbra.lib.dir>
     </properties>