1 files changed, 14 insertions, 9 deletions
diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostCompileHelperMojo.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostCompileHelperMojo.java
index 04e0ca8e23..621e793ab6 100644
--- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostCompileHelperMojo.java
+++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostCompileHelperMojo.java
@@ -65,15 +65,8 @@ public class PostCompileHelperMojo extends AbstractMojo {
             project.getProperties().setProperty(SKIP_MAIN_SOURCE_COMPILE, Boolean.TRUE.toString());
             project.getProperties().remove(TEST_ONLY);
         }
-        if (project.getProperties().containsKey(INSTRUMENT_ONLY)) {
-            project.getProperties().setProperty(SKIP_MAIN_SOURCE_COMPILE, Boolean.TRUE.toString());
-            project.getProperties().setProperty(SKIP_TEST_SOURCE_COMPILE, Boolean.TRUE.toString());
-            project.getProperties().remove(INSTRUMENT_ONLY);
-        }
-        if (project.getProperties().containsKey(INSTRUMENT_WITH_TEST_ONLY)) {
-            project.getProperties().setProperty(SKIP_MAIN_SOURCE_COMPILE, Boolean.TRUE.toString());
-            project.getProperties().remove(INSTRUMENT_WITH_TEST_ONLY);
-        }
+        postProcessInstrumentedModules();
+
         if (project.getProperties().containsKey(RESOURCE_WITH_TEST_ONLY)) {
             project.getProperties().setProperty(SKIP_MAIN_SOURCE_COMPILE, Boolean.TRUE.toString());
             project.getProperties().remove(RESOURCE_WITH_TEST_ONLY);
@@ -97,4 +90,16 @@ public class PostCompileHelperMojo extends AbstractMojo {
         }
         buildState.saveModuleBuildData(moduleCoordinates);
     }
+
+    private void postProcessInstrumentedModules() {
+        if (project.getProperties().containsKey(INSTRUMENT_ONLY)) {
+            project.getProperties().setProperty(SKIP_MAIN_SOURCE_COMPILE, Boolean.TRUE.toString());
+            project.getProperties().setProperty(SKIP_TEST_SOURCE_COMPILE, Boolean.TRUE.toString());
+            project.getProperties().remove(INSTRUMENT_ONLY);
+        }
+        if (project.getProperties().containsKey(INSTRUMENT_WITH_TEST_ONLY)) {
+            project.getProperties().setProperty(SKIP_MAIN_SOURCE_COMPILE, Boolean.TRUE.toString());
+            project.getProperties().remove(INSTRUMENT_WITH_TEST_ONLY);
+        }
+    }
 }