diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15ea9c83..b035e809 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,12 +19,14 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.5"
           - "2.6"
           - "2.7"
           - "3.0"
-          - "jruby-9.2"
-          - "truffleruby-21.0.0"
+          - "3.1"
+          - "3.2"
+          - "jruby-9.3"
+          - "jruby-9.4"
+          - "truffleruby-22"
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with Ruby ${{ matrix.ruby }}
diff --git a/.rubocop.yml b/.rubocop.yml
index 9049058b..b2f78bb0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,7 +13,7 @@ Lint/AssignmentInCondition:
 Style/ParallelAssignment:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 
 Style/TrailingCommaInArguments:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7699e8a6..c1d8b87a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,104 +1,176 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-07-12 00:41:11 -0400 using RuboCop version 0.49.1.
+# on 2023-03-29 17:13:45 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Layout/AlignArray:
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'net-ldap.gemspec'
+
+# Offense count: 1
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'net-ldap.gemspec'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_element, with_fixed_indentation
+Layout/ArrayAlignment:
   Exclude:
     - 'lib/net/ldap.rb'
-    - 'lib/net/ldap/auth_adapter/sasl.rb'
     - 'lib/net/ldap/connection.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentOneStep, IndentationWidth.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
 # SupportedStyles: case, end
 Layout/CaseIndentation:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
+# Offense count: 24
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/net/ber.rb'
+    - 'lib/net/ber/core_ext/array.rb'
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/auth_adapter.rb'
+    - 'lib/net/ldap/connection.rb'
+    - 'lib/net/ldap/dataset.rb'
+    - 'lib/net/ldap/entry.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'lib/net/snmp.rb'
+    - 'test/integration/test_ber.rb'
+
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLineAfterMagicComment:
   Exclude:
     - 'net-ldap.gemspec'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
 Layout/EmptyLineBetweenDefs:
   Exclude:
-    - 'lib/net/ldap.rb'
     - 'lib/net/ldap/dataset.rb'
+    - 'lib/net/ldap/error.rb'
     - 'lib/net/snmp.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLines:
   Exclude:
     - 'lib/net/snmp.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowAliasSyntax, AllowedMethods.
+# AllowedMethods: alias_method, public, protected, private
+Layout/EmptyLinesAroundAttributeAccessor:
+  Exclude:
+    - 'lib/net/ber.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
 Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'lib/net/ldap.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLinesAroundExceptionHandlingKeywords:
   Exclude:
     - 'lib/net/ldap/connection.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
+  Exclude:
+    - 'testserver/ldapserver.rb'
+
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
+# Offense count: 124
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/net/ber.rb'
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/auth_adapter/gss_spnego.rb'
+    - 'lib/net/ldap/connection.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'test/ber/test_ber.rb'
+    - 'test/integration/test_add.rb'
+    - 'test/integration/test_bind.rb'
+    - 'test/integration/test_delete.rb'
+    - 'test/integration/test_open.rb'
+    - 'test/test_helper.rb'
+    - 'test/test_ldap_connection.rb'
+
 # Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, AllowedPatterns.
 Layout/IndentationWidth:
   Exclude:
     - 'lib/net/ber.rb'
     - 'lib/net/ldap/password.rb'
     - 'lib/net/snmp.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
+# Offense count: 15
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 Layout/LeadingCommentSpace:
   Exclude:
     - 'lib/net/ber/core_ext/array.rb'
     - 'lib/net/ldap.rb'
     - 'lib/net/ldap/connection.rb'
+    - 'lib/net/ldap/entry.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'lib/net/ldap/pdu.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/SpaceAroundEqualsInParameterDefault:
   Exclude:
@@ -106,15 +178,16 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'lib/net/snmp.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceAroundKeyword:
   Exclude:
     - 'lib/net/ldap/entry.rb'
     - 'lib/net/snmp.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
 Layout/SpaceAroundOperators:
   Exclude:
     - 'lib/net/ber/ber_parser.rb'
@@ -123,8 +196,8 @@ Layout/SpaceAroundOperators:
     - 'lib/net/ldap/filter.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
@@ -132,30 +205,27 @@ Layout/SpaceInsideBlockBraces:
     - 'lib/net/ldap/dataset.rb'
 
 # Offense count: 8
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, compact, no_space
 Layout/SpaceInsideParens:
   Exclude:
     - 'lib/net/ldap/entry.rb'
     - 'lib/net/snmp.rb'
 
 # Offense count: 1
-Lint/AmbiguousBlockAssociation:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowComments.
+Lint/EmptyConditionalBody:
   Exclude:
-    - 'testserver/ldapserver.rb'
+    - 'lib/net/ldap/filter.rb'
 
 # Offense count: 1
+# Configuration parameters: AllowComments.
 Lint/EmptyWhen:
   Exclude:
     - 'lib/net/ldap/pdu.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Lint/EndAlignment:
-  Exclude:
-    - 'testserver/ldapserver.rb'
-
 # Offense count: 30
 Lint/ImplicitStringConcatenation:
   Exclude:
@@ -172,7 +242,7 @@ Lint/RescueException:
     - 'lib/net/ldap/pdu.rb'
 
 # Offense count: 9
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
   Exclude:
@@ -180,8 +250,8 @@ Lint/UnusedBlockArgument:
     - 'lib/net/snmp.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/net/ldap/entry.rb'
@@ -191,25 +261,27 @@ Lint/UnusedMethodArgument:
     - 'test/test_search.rb'
 
 # Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'lib/net/ldap/connection.rb'
 
-# Offense count: 6
+# Offense count: 5
 Lint/UselessAssignment:
   Exclude:
     - 'test/integration/test_add.rb'
     - 'test/test_ldap_connection.rb'
     - 'test/test_search.rb'
-    - 'test/test_snmp.rb'
 
-# Offense count: 48
+# Offense count: 38
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 116
+  Max: 120
 
-# Offense count: 4
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 3
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 119
 
@@ -219,42 +291,98 @@ Metrics/BlockNesting:
   Max: 4
 
 # Offense count: 11
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 445
+  Max: 443
 
-# Offense count: 23
+# Offense count: 20
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 41
-
-# Offense count: 216
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 360
+  Max: 44
 
 # Offense count: 74
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 128
 
 # Offense count: 1
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 103
 
-# Offense count: 15
+# Offense count: 12
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 38
+  Max: 44
 
 # Offense count: 1
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - 'lib/net/ldap.rb'
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Naming/BinaryOperatorParameterName:
+  Exclude:
+    - 'lib/net/ldap/filter.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedNames.
+# AllowedNames: module_parent
+Naming/ClassAndModuleCamelCase:
+  Exclude:
+    - 'lib/net/ldap/auth_adapter/gss_spnego.rb'
+
+# Offense count: 87
+Naming/ConstantName:
+  Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/connection.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'lib/net/ldap/pdu.rb'
+    - 'lib/net/snmp.rb'
+    - 'test/test_ldif.rb'
+    - 'testserver/ldapserver.rb'
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/net-ldap.rb'
+
+# Offense count: 11
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/entry.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'lib/net/snmp.rb'
+    - 'test/test_snmp.rb'
+    - 'testserver/ldapserver.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/net/ldap/pdu.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: separated, grouped
+Style/AccessorGrouping:
+  Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/pdu.rb'
+
 # Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
   Exclude:
@@ -264,13 +392,12 @@ Style/Alias:
     - 'lib/net/ldap/filter.rb'
     - 'lib/net/ldap/pdu.rb'
 
-# Offense count: 33
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Offense count: 12
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
 Style/AndOr:
   Exclude:
-    - 'lib/net/ber/ber_parser.rb'
     - 'lib/net/ldap.rb'
     - 'lib/net/ldap/connection.rb'
     - 'lib/net/ldap/dataset.rb'
@@ -278,88 +405,80 @@ Style/AndOr:
     - 'lib/net/ldap/pdu.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: percent_q, bare_percent
 Style/BarePercentLiterals:
   Exclude:
     - 'test/test_entry.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/BlockComments:
   Exclude:
     - 'test/test_rename.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: MinBranchesCount.
+Style/CaseLikeIf:
   Exclude:
-    - 'lib/net/ldap/auth_adapter/gss_spnego.rb'
-    - 'lib/net/snmp.rb'
+    - 'lib/net/ber/ber_parser.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/CharacterLiteral:
   Exclude:
     - 'lib/net/ldap/dataset.rb'
     - 'lib/net/ldap/entry.rb'
 
-# Offense count: 1
-Style/ClassAndModuleCamelCase:
-  Exclude:
-    - 'lib/net/ldap/auth_adapter/gss_spnego.rb'
-
 # Offense count: 23
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: is_a?, kind_of?
 Style/ClassCheck:
   Exclude:
     - 'lib/net/ber/core_ext/array.rb'
-    - 'lib/net/ldap/error.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Keywords, RequireColon.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
 Style/CommentAnnotation:
   Exclude:
     - 'lib/net/ber.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
-# SupportedStyles: assign_to_condition, assign_inside_condition
-Style/ConditionalAssignment:
-  Exclude:
-    - 'lib/net/ldap/dn.rb'
-
-# Offense count: 87
-Style/ConstantName:
+# Offense count: 8
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/CommentedKeyword:
   Exclude:
     - 'lib/net/ldap.rb'
     - 'lib/net/ldap/connection.rb'
+    - 'lib/net/ldap/entry.rb'
     - 'lib/net/ldap/filter.rb'
     - 'lib/net/ldap/pdu.rb'
-    - 'lib/net/snmp.rb'
-    - 'test/test_ldif.rb'
-    - 'testserver/ldapserver.rb'
 
-# Offense count: 17
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/net/ldap/dn.rb'
+
+# Offense count: 12
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
-    - 'lib/net/ber/core_ext.rb'
     - 'lib/net/ldap.rb'
     - 'lib/net/ldap/auth_adapter.rb'
     - 'lib/net/ldap/auth_adapter/sasl.rb'
@@ -373,25 +492,45 @@ Style/Documentation:
     - 'testserver/ldapserver.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
   Exclude:
     - 'test/test_auth_adapter.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/Encoding:
+  Exclude:
+    - 'net-ldap.gemspec'
+    - 'test/test_filter_parser.rb'
+
 # Offense count: 3
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/EvenOdd:
   Exclude:
     - 'lib/net/ldap/dn.rb'
 
 # Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Style/FileName:
+# This cop supports safe autocorrection (--autocorrect).
+Style/ExpandPathArguments:
   Exclude:
-    - 'lib/net-ldap.rb'
+    - 'net-ldap.gemspec'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/ExplicitBlockArgument:
+  Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/dataset.rb'
+
+# Offense count: 54
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
 
 # Offense count: 9
 # Configuration parameters: AllowedVariables.
@@ -399,16 +538,18 @@ Style/GlobalVars:
   Exclude:
     - 'testserver/ldapserver.rb'
 
-# Offense count: 2
-# Configuration parameters: MinBodyLength.
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
 # Offense count: 159
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent
 Style/HashSyntax:
   Exclude:
     - 'lib/net/ber.rb'
@@ -426,24 +567,31 @@ Style/HashSyntax:
     - 'testserver/ldapserver.rb'
 
 # Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Exclude:
     - 'lib/net/ldap/instrumentation.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
+# Offense count: 25
+# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/net/ber.rb'
     - 'lib/net/ber/core_ext/integer.rb'
     - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/auth_adapter.rb'
+    - 'lib/net/ldap/auth_adapter/sasl.rb'
+    - 'lib/net/ldap/auth_adapter/simple.rb'
+    - 'lib/net/ldap/connection.rb'
     - 'lib/net/ldap/filter.rb'
     - 'lib/net/snmp.rb'
+    - 'test/integration/test_delete.rb'
+    - 'test/integration/test_password_modify.rb'
 
 # Offense count: 21
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
 Style/MethodDefParentheses:
   Exclude:
@@ -453,19 +601,27 @@ Style/MethodDefParentheses:
     - 'testserver/ldapserver.rb'
 
 # Offense count: 2
-Style/MethodMissing:
+Style/MissingRespondToMissing:
   Exclude:
     - 'lib/net/ldap/dn.rb'
     - 'lib/net/ldap/entry.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/MultilineIfModifier:
   Exclude:
     - 'lib/net/ldap/connection.rb'
 
+# Offense count: 26
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineWhenThen:
+  Exclude:
+    - 'lib/net/ldap/dn.rb'
+
 # Offense count: 25
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
 Style/MutableConstant:
   Exclude:
     - 'lib/net/ber.rb'
@@ -479,22 +635,22 @@ Style/MutableConstant:
     - 'testserver/ldapserver.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: both, prefix, postfix
 Style/NegatedIf:
   Exclude:
     - 'test/test_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/NegatedWhile:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
 # Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, MinBodyLength.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
   Exclude:
@@ -502,49 +658,55 @@ Style/Next:
     - 'testserver/ldapserver.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: predicate, comparison
 Style/NilComparison:
   Exclude:
     - 'lib/net/ldap/connection.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: IncludeSemanticChanges.
 Style/NonNilCheck:
   Exclude:
     - 'lib/net/ber/ber_parser.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/Not:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
 # Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: Strict.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
 Style/NumericLiterals:
   MinDigits: 8
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# Offense count: 14
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
     - 'lib/net/ber/core_ext/integer.rb'
+    - 'lib/net/ldap/connection.rb'
     - 'lib/net/ldap/dn.rb'
+    - 'lib/net/ldap/filter.rb'
     - 'testserver/ldapserver.rb'
 
-# Offense count: 3
-Style/OpMethod:
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
-    - 'lib/net/ldap/filter.rb'
+    - 'lib/net/ldap/entry.rb'
 
 # Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AllowSafeAssignment.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
 Style/ParenthesesAroundCondition:
   Exclude:
     - 'lib/net/ldap.rb'
@@ -552,8 +714,8 @@ Style/ParenthesesAroundCondition:
     - 'lib/net/ldap/auth_adapter/sasl.rb'
     - 'lib/net/ldap/auth_adapter/simple.rb'
 
-# Offense count: 11
-# Cop supports --auto-correct.
+# Offense count: 13
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
@@ -565,17 +727,18 @@ Style/PercentLiteralDelimiters:
     - 'test/test_entry.rb'
     - 'test/test_helper.rb'
 
-# Offense count: 11
-# Cop supports --auto-correct.
+# Offense count: 20
+# This cop supports safe autocorrection (--autocorrect).
 Style/PerlBackrefs:
   Exclude:
     - 'lib/net/ldap/dataset.rb'
     - 'lib/net/ldap/filter.rb'
+    - 'test/test_ldif.rb'
     - 'testserver/ldapserver.rb'
 
 # Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Exclude:
@@ -583,21 +746,46 @@ Style/RaiseArgs:
     - 'lib/net/ldap/pdu.rb'
     - 'lib/net/snmp.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantBegin:
   Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/connection.rb'
     - 'lib/net/snmp.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantParentheses:
   Exclude:
     - 'lib/net/ldap/filter.rb'
     - 'test/test_filter.rb'
 
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantPercentQ:
+  Exclude:
+    - 'net-ldap.gemspec'
+    - 'test/test_entry.rb'
+
+# Offense count: 11
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpCharacterClass:
+  Exclude:
+    - 'lib/net/ber/core_ext/integer.rb'
+    - 'lib/net/ldap/dataset.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'testserver/ldapserver.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/net/ldap/dataset.rb'
+    - 'lib/net/ldap/filter.rb'
+
 # Offense count: 3
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Exclude:
@@ -606,7 +794,7 @@ Style/RedundantReturn:
     - 'lib/net/ldap/entry.rb'
 
 # Offense count: 8
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantSelf:
   Exclude:
     - 'lib/net/ber/core_ext/array.rb'
@@ -615,8 +803,8 @@ Style/RedundantSelf:
     - 'lib/net/ldap/filter.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
@@ -624,52 +812,91 @@ Style/RegexpLiteral:
     - 'net-ldap.gemspec'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RescueModifier:
   Exclude:
     - 'test/ber/core_ext/test_string.rb'
 
-# Offense count: 8
-# Cop supports --auto-correct.
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/net/snmp.rb'
+    - 'testserver/ldapserver.rb'
+
+# Offense count: 13
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/connection.rb'
+    - 'lib/net/ldap/dataset.rb'
+    - 'lib/net/ldap/pdu.rb'
+
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
   Exclude:
     - 'lib/net/ldap/dn.rb'
-    - 'lib/net/ldap/error.rb'
     - 'testserver/ldapserver.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: use_perl_names, use_english_names
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
+  Exclude:
+    - 'lib/net/ldap.rb'
+    - 'lib/net/ldap/connection.rb'
+
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireEnglish, EnforcedStyle.
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
 Style/SpecialGlobalVars:
   Exclude:
     - 'lib/net/snmp.rb'
-    - 'net-ldap.gemspec'
     - 'testserver/ldapserver.rb'
 
-# Offense count: 656
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# Offense count: 15
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/net/ldap/dn.rb'
+    - 'lib/net/ldap/filter.rb'
+    - 'lib/net/ldap/password.rb'
+    - 'test/ber/test_ber.rb'
+    - 'test/test_ldif.rb'
+    - 'test/test_snmp.rb'
+
+# Offense count: 683
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
 # Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/StructInheritance:
   Exclude:
     - 'test/test_ldap.rb'
 
 # Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: MinSize, SupportedStyles.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
   EnforcedStyle: brackets
 
 # Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
 Style/TernaryParentheses:
   Exclude:
@@ -677,47 +904,60 @@ Style/TernaryParentheses:
     - 'lib/net/ldap/connection.rb'
     - 'lib/net/ldap/dataset.rb'
 
+# Offense count: 38
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
-# Whitelist: to_ary, to_a, to_c, to_enum, to_h, to_hash, to_i, to_int, to_io, to_open, to_path, to_proc, to_r, to_regexp, to_str, to_s, to_sym
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, AllowedMethods.
+# AllowedMethods: to_ary, to_a, to_c, to_enum, to_h, to_hash, to_i, to_int, to_io, to_open, to_path, to_proc, to_r, to_regexp, to_str, to_s, to_sym
 Style/TrivialAccessors:
   Exclude:
     - 'lib/net/ldap/connection.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/UnpackFirst:
   Exclude:
-    - 'net-ldap.gemspec'
-    - 'test/test_entry.rb'
+    - 'lib/net/ber/ber_parser.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
+# This cop supports safe autocorrection (--autocorrect).
 Style/WhileUntilModifier:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, WordRegex.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
   EnforcedStyle: percent
   MinSize: 3
 
-# Offense count: 2
-# Cop supports --auto-correct.
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: forbid_for_all_comparison_operators, forbid_for_equality_operators_only, require_for_all_comparison_operators, require_for_equality_operators_only
 Style/YodaCondition:
   Exclude:
     - 'lib/net/ber/ber_parser.rb'
-    - 'testserver/ldapserver.rb'
 
 # Offense count: 6
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ZeroLengthPredicate:
   Exclude:
     - 'lib/net/ldap/connection.rb'
     - 'lib/net/ldap/filter.rb'
     - 'testserver/ldapserver.rb'
+
+# Offense count: 24
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 360
diff --git a/History.rdoc b/History.rdoc
index 5874a581..db63cbf6 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,3 +1,10 @@
+=== Net::LDAP 0.18.0
+* Fix escaping of # and space in attrs #408
+* Add support to use SNI #406
+* Drop Ruby 2.5 and JRuby 9.2 from CI tests
+* Bump rubocop to 1.48.1
+* Update CI for TruffleRuby 22
+
 === Net::LDAP 0.17.1
 * Fixed shebang of bash #385
 * Omit some tests for now until we update our CA cert #386
diff --git a/docker-compose.yml b/docker-compose.yml
index 88a1cfd9..6ada67bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,8 +24,8 @@ services:
     volumes:
       - ./test/fixtures/ldif:/ldif:ro
 
-  ci-2.5:
-    image: ruby:2.5
+  ci-2.6:
+    image: ruby:2.7
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -38,7 +38,7 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-2.6:
+  ci-2.7:
     image: ruby:2.7
     entrypoint: /code/ci-run.sh
     environment:
@@ -52,8 +52,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-2.7:
-    image: ruby:2.7
+  ci-3.0:
+    image: ruby:3.0
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -66,8 +66,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.0:
-    image: ruby:3.0
+  ci-3.1:
+    image: ruby:3.1
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -79,9 +79,38 @@ services:
     volumes:
       - .:/code
     working_dir: /code
-  
-  ci-truffleruby-21.0.0:
-    image: flavorjones/truffleruby:21.0.0
+
+  ci-3.2:
+    image: ruby:3.2
+    entrypoint: /code/ci-run.sh
+    environment:
+      INTEGRATION: openldap
+      INTEGRATION_HOST: ldap.example.org
+    depends_on:
+      - openldap
+    networks:
+      integration_test_network:
+    volumes:
+      - .:/code
+    working_dir: /code
+
+  # https://github.com/flavorjones/truffleruby/pkgs/container/truffleruby
+  ci-truffleruby-22:
+    image: ghcr.io/flavorjones/truffleruby:22.3.1
+    entrypoint: /code/ci-run.sh
+    environment:
+      INTEGRATION: openldap
+      INTEGRATION_HOST: ldap.example.org
+    depends_on:
+      - openldap
+    networks:
+      integration_test_network:
+    volumes:
+      - .:/code
+    working_dir: /code
+
+  ci-jruby-9.3:
+    image: jruby:9.3
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -94,8 +123,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-jruby-9.2:
-    image: jruby:9.2
+  ci-jruby-9.4:
+    image: jruby:9.4
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb
index f531db1c..6ca72fca 100644
--- a/lib/net/ldap/version.rb
+++ b/lib/net/ldap/version.rb
@@ -1,5 +1,5 @@
 module Net
   class LDAP
-    VERSION = "0.17.1"
+    VERSION = "0.18.0"
   end
 end
diff --git a/net-ldap.gemspec b/net-ldap.gemspec
index 3669545b..a5e53b88 100644
--- a/net-ldap.gemspec
+++ b/net-ldap.gemspec
@@ -31,7 +31,7 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).}
 
   s.add_development_dependency("flexmock", "~> 1.3")
   s.add_development_dependency("rake", "~> 12.3.3")
-  s.add_development_dependency("rubocop", "~> 0.49.0")
+  s.add_development_dependency("rubocop", "~> 1.48")
   s.add_development_dependency("test-unit", "~> 3.3")
   s.add_development_dependency("byebug", "~> 9.0.6") unless RUBY_PLATFORM == "java"
 end
diff --git a/test/test_ssl_ber.rb b/test/test_ssl_ber.rb
index 5677ea0d..766c8b84 100644
--- a/test/test_ssl_ber.rb
+++ b/test/test_ssl_ber.rb
@@ -31,12 +31,14 @@ def setup
 
   def test_transmit_strings
     omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket"
+    omit_if (RUBY_VERSION >= "3.1" || RUBY_ENGINE == "truffleruby"), "Ruby complains about connection not being open"
 
     assert_equal "foo", transmit("foo")
   end
 
   def test_transmit_ber_encoded_numbers
     omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket"
+    omit_if (RUBY_VERSION >= "3.1" || RUBY_ENGINE == "truffleruby"), "Ruby complains about connection not being open"
 
     @to.write 1234.to_ber
     assert_equal 1234, @from.read_ber