diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml index 2d50a7618..b34757c75 100644 --- a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml +++ b/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml @@ -13,7 +13,7 @@ jar - test.user.test.osgi + test.user.test.hello hello-esa-plugin @@ -29,25 +29,6 @@ copy-resources - - ${user.home}/.m2/repository/test/user/test/osgi/hello-bom/1.0 - - - src/test/resources - - hello-bom-1.0.pom - - - - - - - copy-resource-two - process-test-resources - - copy-resources - - ${user.home}/.m2/repository/test/user/test/osgi/hello-esa-plugin/1.0 @@ -61,26 +42,26 @@ - copy-resource-three + copy-resource-two process-test-resources copy-resources - ${user.home}/.m2/repository/test/user/test/osgi/SimpleActivator-bom/1.0 + ${user.home}/.m2/repository/test/user/test/osgi/features-bom/1.0 src/test/resources - SimpleActivator-bom-1.0.pom + features-bom-1.0.pom - copy-resource-four + copy-resource-three process-test-resources copy-resources @@ -156,18 +137,12 @@ - - ${bom.group.id} - hello-bom - 1.0 - pom - - - test.user.test.osgi - SimpleActivator-bom - 1.0 - pom - + + test.user.test.osgi + features-bom + 1.0 + pom + diff --git a/liberty-maven-plugin/src/it/verify-user-feature-it/src/test/resources/SimpleActivator-bom-1.0.pom b/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/features-bom-1.0.pom similarity index 64% rename from liberty-maven-plugin/src/it/verify-user-feature-it/src/test/resources/SimpleActivator-bom-1.0.pom rename to liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/features-bom-1.0.pom index fa36c3706..576fd24b0 100644 --- a/liberty-maven-plugin/src/it/verify-user-feature-it/src/test/resources/SimpleActivator-bom-1.0.pom +++ b/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/features-bom-1.0.pom @@ -2,7 +2,7 @@ 4.0.0 test.user.test.osgi - SimpleActivator-bom + features-bom 1.0 pom @@ -15,5 +15,16 @@ esa + + + + test.user.test.osgi + + ${esa.artifact.id} + 1.0 + esa + runtime + + diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/hello-bom-1.0.pom b/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/hello-bom-1.0.pom deleted file mode 100644 index 52996e7d8..000000000 --- a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/hello-bom-1.0.pom +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - test.user.test.osgi - hello-bom - 1.0 - pom - user features bill of materials - user features bill of materials - https://openliberty.io/ - - - - - test.user.test.osgi - - ${esa.artifact.id} - 1.0 - esa - runtime - - - - diff --git a/liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml b/liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml index d8d04bf4a..383190459 100644 --- a/liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml +++ b/liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml @@ -41,12 +41,12 @@ - ${user.home}/.m2/repository/test/user/test/osgi/SimpleActivator-bom/1.0 + ${user.home}/.m2/repository/test/user/test/osgi/features-bom/1.0 src/test/resources - SimpleActivator-bom-1.0.pom + features-bom-1.0.pom @@ -159,7 +159,7 @@ test.user.test.osgi - SimpleActivator-bom + features-bom 1.0 pom diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/SimpleActivator-bom-1.0.pom b/liberty-maven-plugin/src/it/verify-user-feature-it/src/test/resources/features-bom-1.0.pom similarity index 93% rename from liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/SimpleActivator-bom-1.0.pom rename to liberty-maven-plugin/src/it/verify-user-feature-it/src/test/resources/features-bom-1.0.pom index fa36c3706..5b3078179 100644 --- a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/src/test/resources/SimpleActivator-bom-1.0.pom +++ b/liberty-maven-plugin/src/it/verify-user-feature-it/src/test/resources/features-bom-1.0.pom @@ -2,7 +2,7 @@ 4.0.0 test.user.test.osgi - SimpleActivator-bom + features-bom 1.0 pom