diff --git a/.github/workflows/maven-central-release.yml b/.github/workflows/maven-central-release.yml
index 8df337ec8..257df99fc 100644
--- a/.github/workflows/maven-central-release.yml
+++ b/.github/workflows/maven-central-release.yml
@@ -26,8 +26,8 @@ jobs:
         with:
           node-version: '20'
 
-      - name: Jackson 2 Integration Tests
-        run: mvn -pl mcp-test -am -Pjackson2 test
+      - name: Jackson 3 Integration Tests
+        run: mvn -pl mcp-test -am -Pjackson3 test
 
       - name: Build and Test
         run: mvn clean verify
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
index 1a61d336c..fdd52861b 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -2,7 +2,7 @@ name: Publish Snapshot
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "0.18.x" ]
 
 jobs:
   build:
diff --git a/README.md b/README.md
index c1f5f10c6..62070aefd 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ The following sections explain what we chose, why it made sense, and how the cho
 
 * **Why**: Jackson is widely adopted across the Java ecosystem, provides strong performance and a mature annotation model, and is familiar to the SDK team and many potential contributors.
 
-* **How we expose it**: Public APIs use a bundled abstraction. Jackson is shipped as the default implementation (`mcp-json-jackson3`), but alternatives can be plugged in.
+* **How we expose it**: Public APIs use a bundled abstraction. Jackson is shipped as the default implementation (`mcp-json-jackson2`), but alternatives can be plugged in.
 
 * **How it fits the SDK**: This offers a pragmatic default while keeping flexibility for projects that prefer different JSON libraries.
 
@@ -174,7 +174,7 @@ The SDK is organized into modules to separate concerns and allow adopters to bri
 * `mcp-core` – Reference implementation (STDIO, JDK HttpClient, Servlet), JSON binding interface definitions
 * `mcp-json-jackson2` – Jackson 2 implementation of JSON binding
 * `mcp-json-jackson3` – Jackson 3 implementation of JSON binding
-* `mcp` – Convenience bundle (core + Jackson 3)
+* `mcp` – Convenience bundle (core + Jackson 2)
 * `mcp-test` – Shared testing utilities
 * `mcp-spring` – Spring integrations (WebClient, WebFlux, WebMVC)
 
diff --git a/conformance-tests/client-jdk-http-client/pom.xml b/conformance-tests/client-jdk-http-client/pom.xml
index 64b6adc4a..74bdf43d3 100644
--- a/conformance-tests/client-jdk-http-client/pom.xml
+++ b/conformance-tests/client-jdk-http-client/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>conformance-tests</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>client-jdk-http-client</artifactId>
 	<packaging>jar</packaging>
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/conformance-tests/pom.xml b/conformance-tests/pom.xml
index 01ad51a33..2a8154096 100644
--- a/conformance-tests/pom.xml
+++ b/conformance-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>conformance-tests</artifactId>
 	<packaging>pom</packaging>
diff --git a/conformance-tests/server-servlet/pom.xml b/conformance-tests/server-servlet/pom.xml
index 482ad55e0..1fd60df27 100644
--- a/conformance-tests/server-servlet/pom.xml
+++ b/conformance-tests/server-servlet/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>conformance-tests</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>server-servlet</artifactId>
 	<packaging>jar</packaging>
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/mcp-bom/pom.xml b/mcp-bom/pom.xml
index f3d76d819..c8b641994 100644
--- a/mcp-bom/pom.xml
+++ b/mcp-bom/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.modelcontextprotocol.sdk</groupId>
         <artifactId>mcp-parent</artifactId>
-        <version>0.18.0-SNAPSHOT</version>
+        <version>0.18.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>mcp-bom</artifactId>
diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml
index 6dab41aff..44580c615 100644
--- a/mcp-core/pom.xml
+++ b/mcp-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>mcp-core</artifactId>
 	<packaging>jar</packaging>
@@ -35,14 +35,13 @@
 						<configuration>
 							<bnd><![CDATA[
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
-								version:                ${versionmask;===;${version_cleanup;${project.version}}}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
-								Bundle-Version:         ${version}
+								Bundle-Version:         ${project.version}
 								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
 								Import-Package:         jakarta.*;resolution:=optional, \
 								                        *;
 								Service-Component: 		OSGI-INF/io.modelcontextprotocol.json.McpJsonDefaults.xml
-								Export-Package:         io.modelcontextprotocol.*;version="${version}";-noimport:=true
+								Export-Package:         io.modelcontextprotocol.*;version="${project.version}";-noimport:=true
 								-noimportjava:          true;
 								-nouses:                true;
 								-removeheaders:         Private-Package
diff --git a/mcp-json-jackson2/pom.xml b/mcp-json-jackson2/pom.xml
index 37384fea9..643bfb59d 100644
--- a/mcp-json-jackson2/pom.xml
+++ b/mcp-json-jackson2/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>mcp-json-jackson2</artifactId>
 	<packaging>jar</packaging>
@@ -33,9 +33,8 @@
 						<configuration>
 							<bnd><![CDATA[
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
-								version:                ${versionmask;===;${version_cleanup;${project.version}}}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
-								Bundle-Version:         ${version}
+								Bundle-Version:         ${project.version}
 								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
 								Bundle-ActivationPolicy: lazy
 								Import-Package:         io.modelcontextprotocol.json,io.modelcontextprotocol.json.schema, \
@@ -71,7 +70,7 @@
         <dependency>
         	<groupId>io.modelcontextprotocol.sdk</groupId>
         	<artifactId>mcp-core</artifactId>
-        	<version>0.18.0-SNAPSHOT</version>
+        	<version>0.18.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
diff --git a/mcp-json-jackson3/pom.xml b/mcp-json-jackson3/pom.xml
index c02bc375b..070e2f8b5 100644
--- a/mcp-json-jackson3/pom.xml
+++ b/mcp-json-jackson3/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>mcp-json-jackson3</artifactId>
 	<packaging>jar</packaging>
@@ -33,9 +33,8 @@
 						<configuration>
 							<bnd><![CDATA[
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
-								version:                ${versionmask;===;${version_cleanup;${project.version}}}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
-								Bundle-Version:         ${version}
+								Bundle-Version:         ${project.version}
 								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
 								Bundle-ActivationPolicy: lazy
 								Import-Package:         io.modelcontextprotocol.json,io.modelcontextprotocol.json.schema, \
@@ -65,7 +64,7 @@
         <dependency>
         	<groupId>io.modelcontextprotocol.sdk</groupId>
         	<artifactId>mcp-core</artifactId>
-        	<version>0.18.0-SNAPSHOT</version>
+        	<version>0.18.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>tools.jackson.core</groupId>
diff --git a/mcp-spring/mcp-spring-webflux/pom.xml b/mcp-spring/mcp-spring-webflux/pom.xml
index 96a26b496..1731c9b48 100644
--- a/mcp-spring/mcp-spring-webflux/pom.xml
+++ b/mcp-spring/mcp-spring-webflux/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>mcp-spring-webflux</artifactId>
@@ -26,13 +26,13 @@
         <dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-core</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-test</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-json-jackson2</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/mcp-spring/mcp-spring-webmvc/pom.xml b/mcp-spring/mcp-spring-webmvc/pom.xml
index f53f8ff11..4d3af8726 100644
--- a/mcp-spring/mcp-spring-webmvc/pom.xml
+++ b/mcp-spring/mcp-spring-webmvc/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>mcp-spring-webmvc</artifactId>
@@ -26,7 +26,7 @@
         <dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-core</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -38,21 +38,21 @@
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-test</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-spring-webflux</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-json-jackson2</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/mcp-test/pom.xml b/mcp-test/pom.xml
index c77068f89..b2e0d1e8b 100644
--- a/mcp-test/pom.xml
+++ b/mcp-test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>mcp-test</artifactId>
 	<packaging>jar</packaging>
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-core</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -152,25 +152,25 @@
 	<profiles>
 		<profile>
 			<id>jackson3</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<dependencies>
 				<dependency>
 					<groupId>io.modelcontextprotocol.sdk</groupId>
 					<artifactId>mcp-json-jackson3</artifactId>
-					<version>0.18.0-SNAPSHOT</version>
+					<version>0.18.2-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
 			<id>jackson2</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<dependencies>
 				<dependency>
 					<groupId>io.modelcontextprotocol.sdk</groupId>
 					<artifactId>mcp-json-jackson2</artifactId>
-					<version>0.18.0-SNAPSHOT</version>
+					<version>0.18.2-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
diff --git a/mcp/pom.xml b/mcp/pom.xml
index db91bc288..9319047af 100644
--- a/mcp/pom.xml
+++ b/mcp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.modelcontextprotocol.sdk</groupId>
 		<artifactId>mcp-parent</artifactId>
-		<version>0.18.0-SNAPSHOT</version>
+		<version>0.18.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>mcp</artifactId>
 	<packaging>jar</packaging>
@@ -24,14 +24,14 @@
 
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp-json-jackson3</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<artifactId>mcp-json-jackson2</artifactId>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-core</artifactId>
-			<version>0.18.0-SNAPSHOT</version>
+			<version>0.18.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/pom.xml b/pom.xml
index 18b24ce2f..13ce3968e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>io.modelcontextprotocol.sdk</groupId>
 	<artifactId>mcp-parent</artifactId>
-	<version>0.18.0-SNAPSHOT</version>
+	<version>0.18.2-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 	<url>https://github.com/modelcontextprotocol/java-sdk</url>