[SM-5439] Create OSGi bundles for Spring 6.0.4
diff --git a/pom.xml b/pom.xml
index 5ca9ac7..17bca91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,25 @@
       <module>hapi-fhir-structures-dstu3-6.2.5</module>
       <module>hapi-fhir-structures-r4-6.2.5</module>
       <module>hapi-fhir-validation-6.2.5</module>
+      <module>spring-aop-6.0.4</module>
+      <module>spring-aspects-6.0.4</module>
+      <module>spring-beans-6.0.4</module>
+      <module>spring-context-6.0.4</module>
+      <module>spring-context-support-6.0.4</module>
+      <module>spring-core-6.0.4</module>
+      <module>spring-expression-6.0.4</module>
+      <module>spring-instrument-6.0.4</module>
+      <module>spring-jdbc-6.0.4</module>
+      <module>spring-jms-6.0.4</module>
+      <module>spring-messaging-6.0.4</module>
+      <module>spring-orm-6.0.4</module>
+      <module>spring-oxm-6.0.4</module>
+      <module>spring-test-6.0.4</module>
+      <module>spring-tx-6.0.4</module>
+      <module>spring-web-6.0.4</module>
+      <module>spring-webflux-6.0.4</module>
+      <module>spring-webmvc-6.0.4</module>
+      <module>spring-websocket-6.0.4</module>
     </modules>
 
 </project>
diff --git a/spring-aop-6.0.3/pom.xml b/spring-aop-6.0.4/pom.xml
similarity index 97%
rename from spring-aop-6.0.3/pom.xml
rename to spring-aop-6.0.4/pom.xml
index 39a0c00..c4bde57 100644
--- a/spring-aop-6.0.3/pom.xml
+++ b/spring-aop-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-aop</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-aop-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-aop-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-aop-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-aop-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-aspects-6.0.3/pom.xml b/spring-aspects-6.0.4/pom.xml
similarity index 97%
rename from spring-aspects-6.0.3/pom.xml
rename to spring-aspects-6.0.4/pom.xml
index 8cc0b39..3516c46 100644
--- a/spring-aspects-6.0.3/pom.xml
+++ b/spring-aspects-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-aspects</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-aspects</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-aspects-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-aspects-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-aspects-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-aspects-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-beans-6.0.3/pom.xml b/spring-beans-6.0.4/pom.xml
similarity index 97%
rename from spring-beans-6.0.3/pom.xml
rename to spring-beans-6.0.4/pom.xml
index aeeae41..c8dad83 100644
--- a/spring-beans-6.0.3/pom.xml
+++ b/spring-beans-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-beans</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-beans-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-beans-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-beans-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-beans-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-context-6.0.3/pom.xml b/spring-context-6.0.4/pom.xml
similarity index 98%
rename from spring-context-6.0.3/pom.xml
rename to spring-context-6.0.4/pom.xml
index 81165f0..e419de3 100644
--- a/spring-context-6.0.3/pom.xml
+++ b/spring-context-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-context</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-context-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-context-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-context-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-context-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-context-support-6.0.3/pom.xml b/spring-context-support-6.0.4/pom.xml
similarity index 98%
rename from spring-context-support-6.0.3/pom.xml
rename to spring-context-support-6.0.4/pom.xml
index 5522b0e..e231099 100644
--- a/spring-context-support-6.0.3/pom.xml
+++ b/spring-context-support-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-context-support</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-context-support</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-context-support-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-context-support-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-context-support-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-context-support-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-core-6.0.3/pom.xml b/spring-core-6.0.4/pom.xml
similarity index 97%
rename from spring-core-6.0.3/pom.xml
rename to spring-core-6.0.4/pom.xml
index c9c857e..f3d5d5c 100644
--- a/spring-core-6.0.3/pom.xml
+++ b/spring-core-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-core</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-core-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-core-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-core-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-core-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-expression-6.0.3/pom.xml b/spring-expression-6.0.4/pom.xml
similarity index 96%
rename from spring-expression-6.0.3/pom.xml
rename to spring-expression-6.0.4/pom.xml
index dd8cb4f..857c4af 100644
--- a/spring-expression-6.0.3/pom.xml
+++ b/spring-expression-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-expression</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-expression</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-expression-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-expression-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-expression-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-expression-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-instrument-6.0.3/pom.xml b/spring-instrument-6.0.4/pom.xml
similarity index 96%
rename from spring-instrument-6.0.3/pom.xml
rename to spring-instrument-6.0.4/pom.xml
index 7311abc..fc4fc6c 100644
--- a/spring-instrument-6.0.3/pom.xml
+++ b/spring-instrument-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-instrument</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-instrument</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-instrument-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-instrument-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-instrument-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-instrument-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-jdbc-6.0.3/pom.xml b/spring-jdbc-6.0.4/pom.xml
similarity index 97%
rename from spring-jdbc-6.0.3/pom.xml
rename to spring-jdbc-6.0.4/pom.xml
index dd5a284..78f6ed5 100644
--- a/spring-jdbc-6.0.3/pom.xml
+++ b/spring-jdbc-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-jdbc</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-jdbc</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-jdbc-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-jdbc-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-jdbc-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-jdbc-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-jms-6.0.3/pom.xml b/spring-jms-6.0.4/pom.xml
similarity index 98%
rename from spring-jms-6.0.3/pom.xml
rename to spring-jms-6.0.4/pom.xml
index 18b1cb4..2c9f855 100644
--- a/spring-jms-6.0.3/pom.xml
+++ b/spring-jms-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-jms</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-jms</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-jms-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-jms-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-jms-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-jms-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-messaging-6.0.3/pom.xml b/spring-messaging-6.0.4/pom.xml
similarity index 97%
rename from spring-messaging-6.0.3/pom.xml
rename to spring-messaging-6.0.4/pom.xml
index 9322953..2e5a446 100644
--- a/spring-messaging-6.0.3/pom.xml
+++ b/spring-messaging-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-messaging</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-messaging</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-messaging-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-messaging-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-messaging-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-messaging-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-orm-6.0.3/pom.xml b/spring-orm-6.0.4/pom.xml
similarity index 98%
rename from spring-orm-6.0.3/pom.xml
rename to spring-orm-6.0.4/pom.xml
index c970d03..e1e69c5 100644
--- a/spring-orm-6.0.3/pom.xml
+++ b/spring-orm-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-orm</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-orm</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-orm-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-orm-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-orm-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-orm-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-oxm-6.0.3/pom.xml b/spring-oxm-6.0.4/pom.xml
similarity index 97%
rename from spring-oxm-6.0.3/pom.xml
rename to spring-oxm-6.0.4/pom.xml
index fa40a8b..9f9936d 100644
--- a/spring-oxm-6.0.3/pom.xml
+++ b/spring-oxm-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-oxm</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-oxm</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-oxm-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-oxm-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-oxm-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-oxm-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-test-6.0.3/pom.xml b/spring-test-6.0.4/pom.xml
similarity index 98%
rename from spring-test-6.0.3/pom.xml
rename to spring-test-6.0.4/pom.xml
index 90b7020..460cf24 100644
--- a/spring-test-6.0.3/pom.xml
+++ b/spring-test-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-test</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-test</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-test-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-test-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-test-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-test-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-tx-6.0.3/pom.xml b/spring-tx-6.0.4/pom.xml
similarity index 97%
rename from spring-tx-6.0.3/pom.xml
rename to spring-tx-6.0.4/pom.xml
index 5995607..eab4c49 100644
--- a/spring-tx-6.0.3/pom.xml
+++ b/spring-tx-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-tx</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-tx</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-tx-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-tx-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-tx-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-tx-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-web-6.0.3/pom.xml b/spring-web-6.0.4/pom.xml
similarity index 98%
rename from spring-web-6.0.3/pom.xml
rename to spring-web-6.0.4/pom.xml
index 40e5159..aa44718 100644
--- a/spring-web-6.0.3/pom.xml
+++ b/spring-web-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-web</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-web</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-web-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-web-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-web-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-web-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-webflux-6.0.3/pom.xml b/spring-webflux-6.0.4/pom.xml
similarity index 98%
rename from spring-webflux-6.0.3/pom.xml
rename to spring-webflux-6.0.4/pom.xml
index e305449..687c737 100644
--- a/spring-webflux-6.0.3/pom.xml
+++ b/spring-webflux-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-webflux</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-webflux</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-webflux-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-webflux-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-webflux-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-webflux-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-webmvc-6.0.3/pom.xml b/spring-webmvc-6.0.4/pom.xml
similarity index 98%
rename from spring-webmvc-6.0.3/pom.xml
rename to spring-webmvc-6.0.4/pom.xml
index 4d373f3..155c3a8 100644
--- a/spring-webmvc-6.0.3/pom.xml
+++ b/spring-webmvc-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-webmvc</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,14 +38,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-webmvc</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
-	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
+        <pkgVersion>6.0.4</pkgVersion>
+	      <servicemix.osgi.source.version>6.0.4.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
         </servicemix.osgi.export.pkg>
diff --git a/spring-webmvc-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-webmvc-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-webmvc-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-webmvc-6.0.4/src/main/resources/OSGI-INF/bundle.info
diff --git a/spring-websocket-6.0.3/pom.xml b/spring-websocket-6.0.4/pom.xml
similarity index 98%
rename from spring-websocket-6.0.3/pom.xml
rename to spring-websocket-6.0.4/pom.xml
index eb63ac3..46a4ed2 100644
--- a/spring-websocket-6.0.3/pom.xml
+++ b/spring-websocket-6.0.4/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-websocket</artifactId>
-    <version>6.0.3_2-SNAPSHOT</version>
+    <version>6.0.4_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
 
@@ -38,13 +38,12 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.springframework</pkgGroupId>
         <pkgArtifactId>spring-websocket</pkgArtifactId>
-        <pkgVersion>6.0.3</pkgVersion>
+        <pkgVersion>6.0.4</pkgVersion>
 	      <servicemix.osgi.source.version>6.0.3.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             org.springframework
diff --git a/spring-websocket-6.0.3/src/main/resources/OSGI-INF/bundle.info b/spring-websocket-6.0.4/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-websocket-6.0.3/src/main/resources/OSGI-INF/bundle.info
rename to spring-websocket-6.0.4/src/main/resources/OSGI-INF/bundle.info