Remove local artifacts after merging features

features.cfg has references to some features, which we are probably
patching, hence we need to merge them before we perform removal
of artifacts from install request.

Change-Id: I42fad1a7eff17778dccdfdd8c0936c2aa35606b4
JIRA: ODLPARENT-194
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java b/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
index 894d2c509e7029085a9899b00106d4b36bb1c0a3..5159cf41623afca2aff2fd26fccb2650468efb15 100644 (file)
--- a/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
+++ b/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
@@ -121,8 +121,8 @@ public class PopulateLocalRepoMojo extends AbstractMojo {
                 LOG.info("Feature repository discovered recursively: {}", feature.getName());
             }
             Set<Artifact> artifacts = aetherUtil.resolveArtifacts(FeatureUtil.featuresToCoords(features));
-            featureUtil.removeLocalArtifacts(artifacts);
             artifacts.addAll(featureArtifacts);
+            featureUtil.removeLocalArtifacts(artifacts);
 
             Map<Gace, String> gaceVersions = new HashMap<>();
             for (Artifact artifact : artifacts) {