diff --git a/pom.xml b/pom.xml
index 176e383..7c6d4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,11 +24,11 @@
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
     <version>43</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <artifactId>mybatis-bom</artifactId>
-  <version>3.5.10-SNAPSHOT</version>
+  <version>3.5.16-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>mybatis-bom</name>
@@ -64,11 +64,11 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- Bundle Descriptor -->
+      <!-- Mybatis -->
       <dependency>
         <groupId>org.mybatis</groupId>
-        <artifactId>base-bundle-descriptor</artifactId>
-        <version>11</version>
+        <artifactId>mybatis</artifactId>
+        <version>3.5.16</version>
       </dependency>
 
       <!-- Caches -->
@@ -77,13 +77,6 @@
         <artifactId>mybatis-caffeine</artifactId>
         <version>1.0.0</version>
       </dependency>
-      <!-- Not released yet
-            <dependency>
-                <groupId>org.mybatis.caches</groupId>
-                <artifactId>mybatis-couchbase</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-            </dependency>
-            -->
       <dependency>
         <groupId>org.mybatis.caches</groupId>
         <artifactId>mybatis-ehcache</artifactId>
@@ -104,28 +97,12 @@
         <artifactId>mybatis-memcached</artifactId>
         <version>1.1.1</version>
       </dependency>
-      <!-- Retired
-            <dependency>
-                <groupId>org.mybatis.caches</groupId>
-                <artifactId>mybatis-oscache</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            -->
       <dependency>
         <groupId>org.mybatis.caches</groupId>
         <artifactId>mybatis-redis</artifactId>
         <version>1.0.0-beta2</version>
       </dependency>
 
-      <!-- Converters -->
-      <!-- Not released yet
-            <groupId>
-                <groupId>org.mybatis</groupId>
-                <artifactId>ibatis2mybatis</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-            </groupId>
-            -->
-
       <!-- Extensions -->
       <dependency>
         <groupId>org.mybatis</groupId>
@@ -155,7 +132,7 @@
         <version>1.5.0</version>
       </dependency>
 
-      <!-- ibatis -->
+      <!-- ibatis (legacy support) -->
       <dependency>
         <groupId>org.mybatis</groupId>
         <artifactId>mybatis2</artifactId>
@@ -173,25 +150,6 @@
         <artifactId>mybatis-migrations</artifactId>
         <version>3.3.11</version>
       </dependency>
-      <dependency>
-        <groupId>org.mybatis.maven</groupId>
-        <artifactId>migrations-maven-plugin</artifactId>
-        <version>1.1.4</version>
-      </dependency>
-
-      <!-- Mybatis -->
-      <dependency>
-        <groupId>org.mybatis</groupId>
-        <artifactId>mybatis</artifactId>
-        <version>3.5.16</version>
-      </dependency>
-
-      <!-- Samples -->
-      <dependency>
-        <groupId>org.mybatis</groupId>
-        <artifactId>jpetstore</artifactId>
-        <version>6.1.0</version>
-      </dependency>
 
       <!-- Scala -->
       <dependency>
@@ -224,23 +182,7 @@
         <version>2.3.2</version>
       </dependency>
 
-      <!-- Spring Native -->
-      <!-- Not released yet
-            <dependency>
-                <groupId>org.mybatis.spring.native</groupId>
-                <artifactId>mybatis-spring-native-core</artifactId>
-                <version>0.1.0-SNAPSHOT</version>
-            </dependency>
-            -->
-
-      <!-- Typehandlers -->
-      <!-- retired
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-typehandlers-jsr310</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            -->
+      <!-- Addons -->
       <dependency>
         <groupId>org.mybatis</groupId>
         <artifactId>mybatis-typehandlers-threeten-extra</artifactId>