diff --git a/pom.xml b/pom.xml index d34fc1360c..593c546d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -1313,7 +1313,25 @@ process-resources - oss + + + expand + + expand + expand + expand + expand + expand + expand + expand + expand + expand + expand + expand + expand + expand + expand + ${project.build.directory} ${project.artifactId}-${project.version}.pom diff --git a/src/it/incrementals-and-plugin-bom/pom.xml b/src/it/incrementals-and-plugin-bom/pom.xml index 692048a441..8e24af634d 100644 --- a/src/it/incrementals-and-plugin-bom/pom.xml +++ b/src/it/incrementals-and-plugin-bom/pom.xml @@ -15,6 +15,7 @@ 1.0 -SNAPSHOT 2.361.4 + 1580.v47b_429a_c853a @@ -34,7 +35,7 @@ io.jenkins.tools.bom bom-2.361.x - 1580.v47b_429a_c853a + ${bom.version} import pom diff --git a/src/it/incrementals-and-plugin-bom/postbuild.groovy b/src/it/incrementals-and-plugin-bom/postbuild.groovy index d213f568db..231763ac64 100644 --- a/src/it/incrementals-and-plugin-bom/postbuild.groovy +++ b/src/it/incrementals-and-plugin-bom/postbuild.groovy @@ -1,3 +1,13 @@ assert new File(basedir, '../../local-repo/io/jenkins/plugins/incrementals-and-plugin-bom/1.0-SNAPSHOT/incrementals-and-plugin-bom-1.0-SNAPSHOT.hpi').file assert new File(basedir, '../../local-repo/io/jenkins/plugins/incrementals-and-plugin-bom/1.0-rc1234.deadbeef5678/incrementals-and-plugin-bom-1.0-rc1234.deadbeef5678.hpi').file +String pomXml = new File(basedir, '../../local-repo/io/jenkins/plugins/incrementals-and-plugin-bom/1.0-rc1234.deadbeef5678/incrementals-and-plugin-bom-1.0-rc1234.deadbeef5678.pom').text +assert pomXml.contains('version>1.0-rc1234.deadbeef5678') +// https://github.com/jenkinsci/plugin-pom/issues/705 +// line endings need normalising +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