diff --git a/pom.xml b/pom.xml index b96c014859..593c546d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -1313,9 +1313,9 @@ process-resources - + - interpolate + expand expand expand diff --git a/src/it/incrementals-and-plugin-bom/postbuild.groovy b/src/it/incrementals-and-plugin-bom/postbuild.groovy index a04cf50408..231763ac64 100644 --- a/src/it/incrementals-and-plugin-bom/postbuild.groovy +++ b/src/it/incrementals-and-plugin-bom/postbuild.groovy @@ -4,16 +4,10 @@ String pomXml = new File(basedir, '../../local-repo/io/jenkins/plugins/increment assert pomXml.contains('version>1.0-rc1234.deadbeef5678') // https://github.com/jenkinsci/plugin-pom/issues/705 // line endings need normalising -assert pomXml.replace("\r\n", "\n").contains(''' - - - - io.jenkins.tools.bom - bom-2.361.x - 1580.v47b_429a_c853a - pom - import - - - '''.replace("\r\n", "\n")) +assert pomXml.matches('(?s).*\\s*' +// something from the parent pom dependencyManagement ++ '.*\\s*javax.servlet\\s*javax.servlet-api\\s*3.1.0\\s*' +// something from the bom ++ '.*\\s*io.jenkins.plugins\\s*caffeine-api\\s*2.9.3-65.v6a_47d0f4d1fe\\s*' ++ '.*\\s*.*') return true