Updated and tested against Portal 7.4 U102

kgolebiowski · Dec 14, 2023 · 8a63a98 · 8a63a98
1 parent 1bae8a3
commit 8a63a98
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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/...rity-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/SSOImpl.java b/...rity-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;
 
-}
+}
diff --git a/...l/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java b/...l/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;
 
-}
+}
diff --git a/.../src/main/java/com/liferay/portal/security/sso/cas/internal/servlet/filter/CASFilter.java b/.../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;
 
-}
+}