Revert "Use preferred 'version_cleanup' BND macro instead of 'maven_v…

…ersion'"

This reverts commit c2937fc.

This commit causes ch.qos.logback.classic.util.EnvUtilTest#versionTest to fail

Reverting

logback-access/pom.xml

@@ -146,7 +146,7 @@
                 Bnd's analysis of java code.
             -->
             <Import-Package>
-              ch.qos.logback.access*;version="${range;[==,+);${version_cleanup;${project.version}}}",
+              ch.qos.logback.access*;version="${range;[==,+);${maven_version;${project.version}}}",
               ch.qos.logback.core.rolling,
               ch.qos.logback.core.rolling.helper,
               org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,

logback-classic/pom.xml

@@ -324,7 +324,7 @@
                  config files). They won't be found by Bnd's analysis
                  of java code. -->
             <Import-Package>
-              ch.qos.logback.classic*;version="${range;[==,+);${version_cleanup;${project.version}}}",
+              ch.qos.logback.classic*;version="${range;[==,+);${maven_version;${project.version}}}",
               sun.reflect;resolution:=optional,
               jakarta.*;resolution:=optional,
               org.xml.*;resolution:=optional,

logback-core/pom.xml

@@ -141,7 +141,7 @@
           <instructions>
             <Export-Package>ch.qos.logback.core*</Export-Package>
             <Import-Package>
-              ch.qos.logback.core*;version="${range;[==,+);${version_cleanup;${project.version}}}",
+              ch.qos.logback.core*;version="${range;[==,+);${maven_version;${project.version}}}",
               jakarta.*;resolution:=optional,
               org.xml.*;resolution:=optional,
               org.fusesource.jansi;resolution:=optional,