Skip to content

Commit 1e0827b

Browse files
committed
Revert "Use preferred 'version_cleanup' BND macro instead of 'maven_version'"
This reverts commit c2937fc. This commit causes ch.qos.logback.classic.util.EnvUtilTest#versionTest to fail Reverting
1 parent c2937fc commit 1e0827b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

logback-access/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
Bnd's analysis of java code.
147147
-->
148148
<Import-Package>
149-
ch.qos.logback.access*;version="${range;[==,+);${version_cleanup;${project.version}}}",
149+
ch.qos.logback.access*;version="${range;[==,+);${maven_version;${project.version}}}",
150150
ch.qos.logback.core.rolling,
151151
ch.qos.logback.core.rolling.helper,
152152
org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,

logback-classic/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
config files). They won't be found by Bnd's analysis
325325
of java code. -->
326326
<Import-Package>
327-
ch.qos.logback.classic*;version="${range;[==,+);${version_cleanup;${project.version}}}",
327+
ch.qos.logback.classic*;version="${range;[==,+);${maven_version;${project.version}}}",
328328
sun.reflect;resolution:=optional,
329329
jakarta.*;resolution:=optional,
330330
org.xml.*;resolution:=optional,

logback-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<instructions>
142142
<Export-Package>ch.qos.logback.core*</Export-Package>
143143
<Import-Package>
144-
ch.qos.logback.core*;version="${range;[==,+);${version_cleanup;${project.version}}}",
144+
ch.qos.logback.core*;version="${range;[==,+);${maven_version;${project.version}}}",
145145
jakarta.*;resolution:=optional,
146146
org.xml.*;resolution:=optional,
147147
org.fusesource.jansi;resolution:=optional,

0 commit comments

Comments
 (0)