This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 893cc639013fe0e125d49817b24b0878a8f13270 Merge: 0022cb04c d558a44c8 Author: Michael Jumper <[email protected]> AuthorDate: Fri Oct 11 12:53:56 2024 -0700 Merge changes from main branch back to next. .../jdbc/base/ModeledDirectoryObjectMapper.java | 21 ++++++- .../jdbc/base/ModeledDirectoryObjectService.java | 28 +++++++-- .../auth/jdbc/base/ObjectRelationMapper.java | 16 ++++- .../guacamole/auth/jdbc/base/RelatedObjectSet.java | 22 ++++++- .../auth/jdbc/permission/UserPermissionMapper.java | 2 +- .../tunnel/AbstractGuacamoleTunnelService.java | 4 +- .../guacamole/auth/jdbc/user/UserMapper.java | 70 +--------------------- .../guacamole/auth/jdbc/user/UserService.java | 5 ++ .../jdbc/usergroup/UserGroupMemberUserMapper.java | 57 +----------------- .../jdbc/usergroup/UserGroupMemberUserSet.java | 12 ++++ .../mysql/MySQLAuthenticationProviderModule.java | 16 +++++ .../auth/mysql/conf/MySQLEnvironment.java | 15 +---- .../SQLServerAuthenticationProviderModule.java | 16 +++++ .../auth/sqlserver/conf/SQLServerEnvironment.java | 9 --- 14 files changed, 132 insertions(+), 161 deletions(-)
