From 8a63a985cbb3a223082b36708d2fbd79660dfbc4 Mon Sep 17 00:00:00 2001
From: Krzysztof Golebiowski <krzysiek.golebiowski@gmail.com>
Date: Thu, 14 Dec 2023 12:08:43 +0100
Subject: [PATCH] Updated and tested against Portal 7.4 U102

---
 gradle.properties                                             | 2 +-
 .../com/liferay/portal/security/sso/cas/internal/SSOImpl.java | 4 ++--
 .../security/sso/cas/internal/auto/login/CASAutoLogin.java    | 4 ++--
 .../security/sso/cas/internal/servlet/filter/CASFilter.java   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4cd0a0d..af61e26 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,4 @@ liferay.workspace.modules.dir=modules
 liferay.workspace.themes.dir=themes
 liferay.workspace.wars.dir=modules
 microsoft.translator.subscription.key=
-liferay.workspace.product=portal-7.4-ga93
+liferay.workspace.product=portal-7.4-ga102
diff --git a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/SSOImpl.java b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/SSOImpl.java
index 58b460c..0a6af7d 100644
--- a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/SSOImpl.java
+++ b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/SSOImpl.java
@@ -14,10 +14,10 @@
 
 package com.liferay.portal.security.sso.cas.internal;
 
+import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.module.configuration.ConfigurationException;
-import com.liferay.portal.kernel.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.security.sso.SSO;
 import com.liferay.portal.kernel.settings.CompanyServiceSettingsLocator;
 import com.liferay.portal.security.sso.cas.configuration.CASConfiguration;
@@ -103,4 +103,4 @@ private boolean _isCASAuthEnabled(long companyId) {
 
 	private ConfigurationProvider _configurationProvider;
 
-}
\ No newline at end of file
+}
diff --git a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java
index 990bca1..1d3cc39 100644
--- a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java
+++ b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java
@@ -15,13 +15,13 @@
 package com.liferay.portal.security.sso.cas.internal.auto.login;
 
 import com.liferay.petra.string.StringPool;
+import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.exception.NoSuchUserException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.model.User;
-import com.liferay.portal.kernel.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.security.auto.login.AutoLogin;
 import com.liferay.portal.kernel.security.auto.login.BaseAutoLogin;
 import com.liferay.portal.kernel.service.UserLocalService;
@@ -208,4 +208,4 @@ protected void setUserLocalService(UserLocalService userLocalService) {
 
 	private UserLocalService _userLocalService;
 
-}
\ No newline at end of file
+}
diff --git a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/servlet/filter/CASFilter.java b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/servlet/filter/CASFilter.java
index 459ff33..6320bda 100644
--- a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/servlet/filter/CASFilter.java
+++ b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/servlet/filter/CASFilter.java
@@ -14,10 +14,10 @@
 
 package com.liferay.portal.security.sso.cas.internal.servlet.filter;
 
+import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.servlet.BaseFilter;
 import com.liferay.portal.kernel.settings.CompanyServiceSettingsLocator;
 import com.liferay.portal.kernel.util.HashMapBuilder;
@@ -293,4 +293,4 @@ private TicketValidator _getTicketValidator(long companyId)
 	@Reference
 	private Portal _portal;
 
-}
\ No newline at end of file
+}