From 28f4b318f440abd988f761e410d43ae8cdb022ca Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Sat, 14 Feb 2026 14:43:42 -0800
Subject: [PATCH] Fix and simplification for osgi manifest.mf contents
 generation.

Cherry-picked from main (159eb964cc6252afb977c7fc8531748d24954784)

Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
---
 mcp-core/pom.xml          | 5 ++---
 mcp-json-jackson2/pom.xml | 3 +--
 mcp-json-jackson3/pom.xml | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml
index af500ed..e666e25 100644
--- a/mcp-core/pom.xml
+++ b/mcp-core/pom.xml
@@ -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 c0a5630..a97cdf6 100644
--- a/mcp-json-jackson2/pom.xml
+++ b/mcp-json-jackson2/pom.xml
@@ -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, \
diff --git a/mcp-json-jackson3/pom.xml b/mcp-json-jackson3/pom.xml
index ef28be7..c2ed163 100644
--- a/mcp-json-jackson3/pom.xml
+++ b/mcp-json-jackson3/pom.xml
@@ -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, \