(ofbiz-plugins) branch trunk updated: Updated several (transitive) dependencies (OFBIZ-13123) (#125)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
     new a0fd3d02a Updated several (transitive) dependencies (OFBIZ-13123) 
(#125)
a0fd3d02a is described below

commit a0fd3d02a999a42c924a1d9ee774226de6a8ce2f
Author: Danny Trunk <dtrun...@gmail.com>
AuthorDate: Mon Oct 14 11:39:15 2024 +0200

    Updated several (transitive) dependencies (OFBIZ-13123) (#125)
    
    * Improved: Replace deprecated "with" method with "using"
    
    This method got removed in Gradle 8.
    See 
https://docs.gradle.org/current/userguide/upgrading_version_7.html#dependencysubstitution_api_cleanup
    
    * Improved: Update CAS LDAP support to 6.6.15
---
 ldap/build.gradle                                                      | 2 +-
 .../activedirectory/OFBizActiveDirectoryAuthenticationHandler.java     | 3 ++-
 .../org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java | 3 ++-
 solr/build.gradle                                                      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ldap/build.gradle b/ldap/build.gradle
index 4ae37ae6e..35930ef03 100644
--- a/ldap/build.gradle
+++ b/ldap/build.gradle
@@ -26,7 +26,7 @@
 //                LdapEntry entry = new LdapEntry(username);
 //                                                ^
 dependencies {
-    pluginLibsCompile 'org.apereo.cas:cas-server-support-ldap-core:5.0.10'
+    pluginLibsCompile 'org.apereo.cas:cas-server-support-ldap-core:6.6.15' // 
7.x+ requires Java 21
 }
 
 configurations.all {
diff --git 
a/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java
 
b/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java
index f98ddebf7..cbfe6667d 100644
--- 
a/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java
+++ 
b/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java
@@ -92,7 +92,8 @@ public final class OFBizActiveDirectoryAuthenticationHandler 
extends AbstractOFB
             }
             String filter = UtilXml.childElementValue(rootElement, "Filter", 
"(objectclass=*)");
             String attribute = UtilXml.childElementValue(rootElement, 
"Attribute", "uid=%u");
-            LdapEntry entry = new LdapEntry(username);
+            LdapEntry entry = new LdapEntry();
+            entry.setDn(username);
             attribute = LdapUtils.getString(entry, attribute);
             NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
                     // Filter expression
diff --git 
a/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java
 
b/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java
index daa6bd411..ff59e56f2 100644
--- 
a/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java
+++ 
b/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java
@@ -79,7 +79,8 @@ public final class OFBizLdapAuthenticationHandler extends 
AbstractOFBizAuthentic
             }
             String filter = UtilXml.childElementValue(rootElement, "Filter", 
"(objectclass=*)");
             String attribute = UtilXml.childElementValue(rootElement, 
"Attribute", "uid=%u");
-            LdapEntry entry = new LdapEntry(username);
+            LdapEntry entry = new LdapEntry();
+            entry.setDn(username);
             attribute = LdapUtils.getString(entry, attribute);
             NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
                     // Filter expression
diff --git a/solr/build.gradle b/solr/build.gradle
index 011c81f2b..df545c48e 100644
--- a/solr/build.gradle
+++ b/solr/build.gradle
@@ -27,7 +27,7 @@ dependencies {
 configurations.all {
     resolutionStrategy {
       dependencySubstitution {
-          substitute module('com.google.guava:guava') with 
module('com.google.guava:guava:28.0-jre')
+          substitute module('com.google.guava:guava') using 
module('com.google.guava:guava:28.0-jre')
       }
     }
 }