diff --git a/pom.xml b/pom.xml
index 761fb88d0..96d08831b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,8 @@
   </distributionManagement>
 
   <properties>
+    <japicmp.skip>true</japicmp.skip>
+
     <failIfNoTests>false</failIfNoTests>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.homepage>http://www.querydsl.com</project.homepage>
@@ -134,7 +136,6 @@
     <mvn.version>3.9.9</mvn.version>
     <guava.version>33.3.0-jre</guava.version>
     <codegen.version>0.6.8</codegen.version>
-    <mysema.lang.version>0.2.4</mysema.lang.version>
     <byte-buddy.version>1.15.0</byte-buddy.version>
     <slf4j.version>2.0.16</slf4j.version>
     <surefire.version>3.4.0</surefire.version>
diff --git a/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java b/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java
index 27e963979..362bd8a68 100644
--- a/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java
+++ b/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java
@@ -13,8 +13,7 @@
  */
 package com.querydsl.collections;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.FetchableQuery;
 import com.querydsl.core.JoinType;
 import com.querydsl.core.NonUniqueResultException;
@@ -180,7 +179,7 @@ public <P> Q leftJoin(MapExpression<?, P> target, Path<P> alias) {
   public CloseableIterator<T> iterate() {
     @SuppressWarnings("unchecked") // This is the built type
     var projection = (Expression<T>) queryMixin.getMetadata().getProjection();
-    return new IteratorAdapter<>(fetch().iterator());
+    return CloseableIterator.of(fetch().iterator());
   }
 
   @Override
diff --git a/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java b/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java
index 9a5cd30f4..73be7ea9c 100644
--- a/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java
+++ b/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java
@@ -13,8 +13,8 @@
  */
 package com.querydsl.collections;
 
-import com.mysema.commons.lang.IteratorAdapter;
 import com.querydsl.codegen.utils.Evaluator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.JoinExpression;
 import com.querydsl.core.JoinType;
 import com.querydsl.core.QueryMetadata;
@@ -166,7 +166,7 @@ private List evaluateSingleSource(
     if (iterable instanceof List<?> list1) {
       list = list1;
     } else {
-      list = IteratorAdapter.asList(iterable.iterator());
+      list = CloseableIterator.asList(iterable.iterator());
     }
 
     // from & where
diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java
index c41ef643b..6abc6fd6f 100644
--- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java
+++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java
@@ -7,7 +7,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.FetchableQuery;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.annotations.QueryEntity;
diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java
index 6bb473c85..44f11d203 100644
--- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java
+++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java
@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.QueryModifiers;
 import com.querydsl.core.QueryResults;
 import com.querydsl.core.types.dsl.Expressions;
@@ -55,7 +55,8 @@ private void assertResultSize(int total, int size, QueryModifiers modifiers) {
     assertThat(createQuery(modifiers).fetchCount()).isEqualTo(total);
 
     // via iterator
-    assertThat(IteratorAdapter.asList(createQuery(modifiers).select(var).iterate())).hasSize(size);
+    assertThat(CloseableIterator.asList(createQuery(modifiers).select(var).iterate()))
+        .hasSize(size);
   }
 
   private CollQuery<?> createQuery(QueryModifiers modifiers) {
diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml
index d2a298491..b4bcb6dd3 100644
--- a/querydsl-libraries/querydsl-core/pom.xml
+++ b/querydsl-libraries/querydsl-core/pom.xml
@@ -18,11 +18,6 @@
       <artifactId>annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.mysema.commons</groupId>
-      <artifactId>mysema-commons-lang</artifactId>
-      <version>${mysema.lang.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/CloseableIterator.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/CloseableIterator.java
new file mode 100644
index 000000000..bb96f837d
--- /dev/null
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/CloseableIterator.java
@@ -0,0 +1,58 @@
+package com.querydsl.core;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+public interface CloseableIterator<T> extends Iterator<T>, AutoCloseable {
+
+  @Override
+  void close();
+
+  public static <E> List<E> asList(CloseableIterator<E> iterator) {
+    try (iterator) {
+      return StreamSupport.stream(
+              Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
+          .collect(Collectors.toList());
+    }
+  }
+
+  public static <E> CloseableIterator<E> of(Iterator<E> iterator) {
+    return of(iterator, () -> {});
+  }
+
+  public static <E> CloseableIterator<E> of(CloseableIterator<E> iterator) {
+    return of(iterator, iterator);
+  }
+
+  public static <E> CloseableIterator<E> of(Iterator<E> iterator, AutoCloseable closeable) {
+    return new CloseableIterator<E>() {
+
+      @Override
+      public boolean hasNext() {
+        return iterator.hasNext();
+      }
+
+      @Override
+      public E next() {
+        return iterator.next();
+      }
+
+      @Override
+      public void close() {
+        try {
+          closeable.close();
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+      }
+    };
+  }
+
+  public static <E> List<E> asList(Iterator<E> iterator) {
+    return asList(of(iterator));
+  }
+}
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java
index eaa643208..5b706a077 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java
@@ -13,7 +13,6 @@
  */
 package com.querydsl.core;
 
-import com.mysema.commons.lang.CloseableIterator;
 import java.util.List;
 import java.util.Spliterator;
 import java.util.Spliterators;
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Pair.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Pair.java
new file mode 100644
index 000000000..864ad82a2
--- /dev/null
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/Pair.java
@@ -0,0 +1,18 @@
+package com.querydsl.core;
+
+public record Pair<F, S>(F first, S second) {
+
+  @Deprecated
+  public F getFirst() {
+    return first();
+  }
+
+  @Deprecated
+  public S getSecond() {
+    return second();
+  }
+
+  public static <T, U> Pair<T, U> of(T key, U value) {
+    return new Pair<>(key, value);
+  }
+}
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java
index 13b4ebf9f..9bdf9847e 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.core.group;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
index 4f1d0f6de..4030c189e 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.core.group;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Projections;
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java
index 516ff6380..0896255ba 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.core.group;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.FactoryExpression;
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java
index d7f0d8899..3c34a379b 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java
@@ -15,7 +15,7 @@
 
 import static com.querydsl.core.util.TupleUtils.toTuple;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.FetchableQuery;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Expression;
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/QPair.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/QPair.java
index 4a929abae..e5b4c8cf7 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/QPair.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/group/QPair.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.core.group;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.types.ConstructorExpression;
 import com.querydsl.core.types.Expression;
 
diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java
index 603a140f8..60703dd50 100644
--- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java
+++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java
@@ -13,8 +13,7 @@
  */
 package com.querydsl.core.support;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.FetchableQuery;
 import com.querydsl.core.NonUniqueResultException;
@@ -40,7 +39,7 @@ public FetchableQueryBase(QueryMixin<Q> queryMixin) {
 
   @Override
   public List<T> fetch() {
-    return IteratorAdapter.asList(iterate());
+    return CloseableIterator.asList(iterate());
   }
 
   @Override
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java
index 30a5478d1..02a30fe86 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java
@@ -1,6 +1,6 @@
 package com.querydsl.core.group;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.support.DummyFetchableQuery;
 import com.querydsl.core.types.ConstructorExpression;
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java
index 05527433d..3bac79232 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java
@@ -19,9 +19,8 @@
 import static com.querydsl.core.group.GroupBy.set;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.CloseableIterator;
+import com.querydsl.core.Pair;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
 import java.util.Arrays;
@@ -41,7 +40,7 @@ public class GroupByIterateTest extends AbstractGroupByTest {
   public void group_order() {
     CloseableIterator<Group> resultsIt =
         BASIC_RESULTS.transform(groupBy(postId).iterate(postName, set(commentId)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
   }
@@ -52,7 +51,7 @@ public void first_set_and_list() {
     CloseableIterator<Group> resultsIt =
         BASIC_RESULTS.transform(
             groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -70,7 +69,7 @@ public void group_by_null() {
     CloseableIterator<Group> resultsIt =
         BASIC_RESULTS.transform(
             groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -87,7 +86,7 @@ public void noSuchElementException() {
     CloseableIterator<Group> resultsIt =
         BASIC_RESULTS.transform(
             groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -101,7 +100,7 @@ public void classCastException() {
     CloseableIterator<Group> resultsIt =
         BASIC_RESULTS.transform(
             groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -114,7 +113,7 @@ public void classCastException() {
   public void map1() {
     CloseableIterator<Group> resultsIt =
         MAP_RESULTS.transform(groupBy(postId).iterate(postName, map(commentId, commentText)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -129,7 +128,7 @@ public void map1() {
   public void map2() {
     CloseableIterator<Map<Integer, String>> resultsIt =
         MAP2_RESULTS.transform(groupBy(postId).iterate(map(commentId, commentText)));
-    List<Map<Integer, String>> results = IteratorAdapter.asList(resultsIt);
+    List<Map<Integer, String>> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -142,7 +141,7 @@ public void map2() {
   public void map22() {
     CloseableIterator<Map<Integer, String>> results =
         MAP2_RESULTS.transform(groupBy(postId).iterate(map(commentId, commentText)));
-    List<Map<Integer, String>> actual = IteratorAdapter.asList(results);
+    List<Map<Integer, String>> actual = CloseableIterator.asList(results);
 
     Object commentId = null;
     Map<Integer, String> comments = null;
@@ -170,7 +169,7 @@ public void map22() {
   public void map3() {
     CloseableIterator<Map<Integer, Map<Integer, String>>> results =
         MAP3_RESULTS.transform(groupBy(postId).iterate(map(postId, map(commentId, commentText))));
-    List<Map<Integer, Map<Integer, String>>> actual = IteratorAdapter.asList(results);
+    List<Map<Integer, Map<Integer, String>>> actual = CloseableIterator.asList(results);
 
     Object postId = null;
     Map<Integer, Map<Integer, String>> posts = null;
@@ -199,7 +198,7 @@ public void map3() {
   public void map4() {
     CloseableIterator<Map<Map<Integer, String>, String>> results =
         MAP4_RESULTS.transform(groupBy(postId).iterate(map(map(postId, commentText), postName)));
-    List<Map<Map<Integer, String>, String>> actual = IteratorAdapter.asList(results);
+    List<Map<Map<Integer, String>, String>> actual = CloseableIterator.asList(results);
 
     Object commentId = null;
     Map<Map<Integer, String>, String> comments = null;
@@ -229,7 +228,7 @@ public void array_access() {
     CloseableIterator<Group> resultsIt =
         BASIC_RESULTS.transform(
             groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-    List<Group> results = IteratorAdapter.asList(resultsIt);
+    List<Group> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -248,7 +247,7 @@ public void transform_results() {
         POST_W_COMMENTS.transform(
             groupBy(postId)
                 .iterate(Projections.constructor(Post.class, postId, postName, set(qComment))));
-    List<Post> results = IteratorAdapter.asList(resultsIt);
+    List<Post> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -267,7 +266,7 @@ public void transform_as_bean() {
             groupBy(postId)
                 .iterate(
                     Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))));
-    List<Post> results = IteratorAdapter.asList(resultsIt);
+    List<Post> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(4);
 
@@ -289,7 +288,7 @@ public void oneToOneToMany_projection() {
                         User.class,
                         userName,
                         Projections.constructor(Post.class, postId, postName, set(qComment)))));
-    List<User> results = IteratorAdapter.asList(resultsIt);
+    List<User> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(2);
 
@@ -312,7 +311,7 @@ public void oneToOneToMany_projection_as_bean() {
                         userName,
                         Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))
                             .as("latestPost"))));
-    List<User> results = IteratorAdapter.asList(resultsIt);
+    List<User> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(2);
 
@@ -335,7 +334,7 @@ public void oneToOneToMany_projection_as_bean_and_constructor() {
                         userName,
                         Projections.constructor(Post.class, postId, postName, set(qComment))
                             .as("latestPost"))));
-    List<User> results = IteratorAdapter.asList(resultsIt);
+    List<User> results = CloseableIterator.asList(resultsIt);
 
     assertThat(results).hasSize(2);
 
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java
index c5b082f97..6be036676 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java
@@ -19,9 +19,8 @@
 import static com.querydsl.core.group.GroupBy.set;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.CloseableIterator;
+import com.querydsl.core.Pair;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
 import java.util.Arrays;
@@ -176,7 +175,7 @@ private Map<Integer, Map<Integer, String>> findPostsById(
   public void map4() {
     CloseableIterator<Map<Map<Integer, String>, String>> results =
         MAP4_RESULTS.transform(groupBy(postId).iterate(map(map(postId, commentText), postName)));
-    List<Map<Map<Integer, String>, String>> actual = IteratorAdapter.asList(results);
+    List<Map<Map<Integer, String>, String>> actual = CloseableIterator.asList(results);
 
     Object commentId = null;
     Map<Map<Integer, String>, String> comments = null;
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java
index 46932e727..2c6bd1599 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java
@@ -23,7 +23,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.within;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java
index 8141defd0..1cce406c6 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java
@@ -1,7 +1,6 @@
 package com.querydsl.core.support;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryModifiers;
@@ -19,7 +18,7 @@ public DummyFetchable(List<T> results) {
 
   @Override
   public CloseableIterator<T> iterate() {
-    return new IteratorAdapter<>(results.iterator());
+    return CloseableIterator.of(results.iterator());
   }
 
   @Override
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java
index 84d1c1133..8a5c1d593 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java
@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringPath;
diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java
index 3e3479426..ab35d59a2 100644
--- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java
+++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -117,7 +117,7 @@ public void test() {
     List<Integer> list1 = asList(1, 2, 3, 4);
     List<Integer> list2 = asList(10, 20, 30);
     var iterator = new MultiIterator<>(asList(list1, list2));
-    List<Object[]> list = IteratorAdapter.asList(iterator);
+    List<Object[]> list = CloseableIterator.asList(iterator);
 
     assertThat(asList(list.getFirst())).isEqualTo(asList(1, 10));
     assertThat(asList(list.get(1))).isEqualTo(asList(1, 20));
diff --git a/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java b/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java
index 7e9a5299c..798aac772 100644
--- a/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java
+++ b/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.TreeMultimap;
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.group.AbstractGroupExpression;
 import com.querydsl.core.group.GroupCollector;
 import com.querydsl.core.group.GroupExpression;
diff --git a/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java b/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java
index 86cf3b0b6..8a7aab40f 100644
--- a/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java
+++ b/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java
@@ -16,7 +16,7 @@
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 import com.google.common.collect.TreeBasedTable;
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.group.AbstractGroupExpression;
 import com.querydsl.core.group.GroupCollector;
 import com.querydsl.core.group.GroupExpression;
diff --git a/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java b/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java
index 5540319c8..5b7e0c65a 100644
--- a/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java
+++ b/querydsl-libraries/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java
@@ -17,7 +17,7 @@
 import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.Table;
 import com.google.common.collect.TreeBasedTable;
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.group.AbstractGroupExpression;
 import com.querydsl.core.group.GroupBy;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java
index 233991a4c..28ae1d81a 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java
@@ -13,8 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.types.FactoryExpression;
 import jakarta.persistence.Query;
 import java.util.Iterator;
@@ -53,7 +52,7 @@ public <T> CloseableIterator<T> iterate(
     if (projection != null) {
       return new TransformingIterator<>(iterator, projection);
     } else {
-      return new IteratorAdapter<>(iterator);
+      return CloseableIterator.of(iterator);
     }
   }
 
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java
index eacef47c8..fe4e028ef 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java
@@ -13,8 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.types.FactoryExpression;
 import jakarta.persistence.PersistenceException;
 import jakarta.persistence.Query;
@@ -96,7 +95,7 @@ public T next() {
     if (projection != null) {
       return new TransformingIterator<>(iterator, closeable, projection);
     } else {
-      return new IteratorAdapter<>(iterator, closeable);
+      return CloseableIterator.of(iterator, closeable);
     }
   }
 
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
index 5c5375446..c014f9599 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
@@ -13,8 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.types.FactoryExpression;
 import jakarta.persistence.PersistenceException;
 import jakarta.persistence.Query;
@@ -63,7 +62,7 @@ public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projec
       if (projection != null) {
         return new TransformingIterator<>(iterator, projection);
       } else {
-        return new IteratorAdapter<>(iterator);
+        return CloseableIterator.of(iterator);
       }
     }
   }
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java
index d10bf1b1c..44f5a5084 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryMetadata;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java
index 833c218e7..2c2e08711 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.types.FactoryExpression;
 import jakarta.persistence.Query;
 import java.util.stream.Stream;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java
index 402aea4c6..4be986252 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java
@@ -10,7 +10,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java
index 76e013cf2..9db5f0ff5 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.types.FactoryExpression;
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java
index d4842c244..04fb83ebf 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa.hibernate;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryException;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
index 854d8b3d1..105102753 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa.hibernate.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryMetadata;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java
index e7fa43851..22bba4d1f 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa.impl;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryMetadata;
diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java
index 36752634c..c8976cf1c 100644
--- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java
+++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryMetadata;
diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
index 6f2269642..b5dc1a431 100644
--- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
+++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
@@ -24,10 +24,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.within;
 
-import com.mysema.commons.lang.Pair;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.FilterFactory;
 import com.querydsl.core.MatchingFiltersFactory;
+import com.querydsl.core.Pair;
 import com.querydsl.core.ProjectionsFactory;
 import com.querydsl.core.QueryExecution;
 import com.querydsl.core.QuerydslModule;
diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java
index 4b2871944..2d75cb555 100644
--- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java
+++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java
@@ -16,7 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.Target;
 import com.querydsl.core.Tuple;
diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java
index b10d025ac..503429e74 100644
--- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java
+++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java
@@ -8,7 +8,7 @@
 import static org.easymock.EasyMock.verify;
 import static org.hibernate.ScrollMode.FORWARD_ONLY;
 
-import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.types.FactoryExpression;
 import com.querydsl.jpa.domain4.Library;
 import jakarta.persistence.PersistenceException;
@@ -119,7 +119,7 @@ public void should_return_iterator_adapter_when_call_iterate_function() {
     expect(queryResultList.iterator()).andReturn(iterator);
     replay(query);
 
-    assertThat(hibernateHandler.iterate(query, null).getClass()).isEqualTo(IteratorAdapter.class);
+    assertThat(hibernateHandler.iterate(query, null)).isInstanceOf(CloseableIterator.class);
   }
 
   @Test
diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java
index 5a01c6e1b..bc3e664bd 100644
--- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java
+++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.jpa;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryMetadata;
diff --git a/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java b/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java
index 78190fec2..8696b11af 100644
--- a/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java
+++ b/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java
@@ -18,7 +18,7 @@
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
 import com.mongodb.ReadPreference;
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.JoinExpression;
diff --git a/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java b/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java
index 8d79eb293..f682df6ac 100644
--- a/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java
+++ b/querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java
@@ -17,7 +17,7 @@
 
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.QueryModifiers;
diff --git a/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/JDBCTypeMapping.java b/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/JDBCTypeMapping.java
index c4523154a..1b6c06f3c 100644
--- a/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/JDBCTypeMapping.java
+++ b/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/JDBCTypeMapping.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.r2dbc;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.sql.types.Null;
 import io.r2dbc.spi.Blob;
 import java.math.BigDecimal;
diff --git a/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/group/ReactiveGroupBy.java b/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/group/ReactiveGroupBy.java
index e943127c7..c15df6151 100644
--- a/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/group/ReactiveGroupBy.java
+++ b/querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/group/ReactiveGroupBy.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.r2dbc.group;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.core.ResultTransformer;
 import com.querydsl.core.group.AbstractGroupExpression;
 import com.querydsl.core.group.GAvg;
diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java
index f3ae940b3..3bd38cd34 100644
--- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java
+++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java
@@ -37,8 +37,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Maps;
-import com.mysema.commons.lang.Pair;
 import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.Pair;
 import com.querydsl.core.QueryException;
 import com.querydsl.core.QuerydslModule;
 import com.querydsl.core.ReactiveFetchable;
diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java
index cdcd5685f..2714e3b80 100644
--- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java
+++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java
@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.r2dbc.binding.BindMarkersFactory;
 import com.querydsl.r2dbc.binding.BindTarget;
 import com.querydsl.r2dbc.binding.StatementWrapper;
diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java
index 16208d07f..109be7e45 100644
--- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java
+++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.QueryException;
 import com.querydsl.core.QueryFlag;
diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java
index af02dae9c..b11698c0a 100644
--- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java
+++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import com.querydsl.sql.types.Null;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java
index d1385df9c..4326a16de 100644
--- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java
+++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.QueryException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Union.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Union.java
index ae14fb974..6ed4c2441 100644
--- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Union.java
+++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Union.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.OrderSpecifier;
diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java
index bc53a62d9..7750ad56e 100644
--- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java
+++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.Query;
 import com.querydsl.core.QueryMetadata;
diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java
index df4434992..76728d684 100644
--- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java
+++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql;
 
-import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.QueryMetadata;
 import com.querydsl.core.QueryResults;
diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
index 49d96991f..c82b917f1 100644
--- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
+++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
@@ -38,9 +38,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import com.mysema.commons.lang.Pair;
 import com.querydsl.core.Fetchable;
 import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.Pair;
 import com.querydsl.core.QueryException;
 import com.querydsl.core.QueryExecution;
 import com.querydsl.core.QuerydslModule;
diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java
index 02953cb21..b50135c6c 100644
--- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java
+++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java
@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Pair;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;