Update more third-party dependencies (#221)

Author: labkey-jeckels

OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapConnectionWrapper.java

@@ -95,7 +95,7 @@ private LdapConnection getConnection() throws LdapException
     {
         try
         {
-            LdapConnection connection = _pool.makeObject();
+            LdapConnection connection = _pool.makeObject().getObject();
             connection.bind();
 
             if (!connection.isConnected())

OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncRunner.java

@@ -1,6 +1,6 @@
 package org.labkey.openldapsync.ldap;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.api.ldap.model.name.Dn;
@@ -347,7 +347,7 @@ private String getNameForGroup(LdapEntry group) throws LdapException
         //concatenate to the group name if the field is not empty
         if (StringUtils.trimToNull(_settings.getGroupNameSuffix()) != null)
         {
-            //Note: do not trim the suffix, as this allows the admin to provide leading whitespace.  for example: the suffix " (LDAP)" would result in "MyGroup (LDAP)"
+//            Note: do not trim the suffix, as this allows the admin to provide leading whitespace.  for example: the suffix " (LDAP)" would result in "MyGroup (LDAP)"
             groupName = groupName.concat(_settings.getGroupNameSuffix());
         }
 

SequenceAnalysis/build.gradle

@@ -23,7 +23,6 @@ repositories {
 configurations.all {
     resolutionStrategy {
         force "com.sun.activation:jakarta.activation:${activationVersion}"
-        force "javax.xml.bind:jaxb-api:2.3.0"  // CONSIDER: Exclude jaxb-api? It's essentially the same jar as jakarta.xml.bind-api (below)
         // NOTE: this should be kept in sync with mcc module:
         force "jakarta.xml.bind:jakarta.xml.bind-api:${jaxbVersion}"
     }
@@ -61,8 +60,8 @@ dependencies {
             ),
             {
                 // Exclude activation jars from webapp to avoid classloader conflicts with <tomcat>/lib/javax.activation.jar
-                exclude group: 'jakarta.activation', module: 'jakarta.activation-api'
                 exclude group: 'com.sun.activation', module: 'jakarta.activation'
+                exclude group: 'javax.activation', module: 'javax.activation-api'
             }
     )
 
@@ -79,8 +78,8 @@ dependencies {
             ),
             {
                 // Exclude activation jars from webapp to avoid classloader conflicts with <tomcat>/lib/javax.activation.jar
-                exclude group: 'jakarta.activation', module: 'jakarta.activation-api'
                 exclude group: 'com.sun.activation', module: 'jakarta.activation'
+                exclude group: 'javax.activation', module: 'javax.activation-api'
             }
     )