diff options
Diffstat (limited to 'openecomp-be/tools/compile-helper-plugin/src/main')
8 files changed, 24 insertions, 45 deletions
diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildHelper.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildHelper.java index d9767fdd1d..f042a7ca55 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildHelper.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildHelper.java @@ -16,13 +16,8 @@ package org.openecomp.sdc.onboarding; -import static org.openecomp.sdc.onboarding.Constants.CHECKSUM; -import static org.openecomp.sdc.onboarding.Constants.COLON; -import static org.openecomp.sdc.onboarding.Constants.DOT; -import static org.openecomp.sdc.onboarding.Constants.JAR; -import static org.openecomp.sdc.onboarding.Constants.JAVA_EXT; -import static org.openecomp.sdc.onboarding.Constants.SHA1; -import static org.openecomp.sdc.onboarding.Constants.UNICORN; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; import java.io.ByteArrayInputStream; import java.io.File; @@ -49,8 +44,8 @@ import java.util.concurrent.RecursiveTask; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; import java.util.stream.Collectors; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; + +import static org.openecomp.sdc.onboarding.Constants.*; class BuildHelper { diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildState.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildState.java index c8177989a5..2382b170aa 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildState.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/BuildState.java @@ -42,6 +42,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.Function; + import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/InitializationHelperMojo.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/InitializationHelperMojo.java index 552ae6ada1..2bc22dce49 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/InitializationHelperMojo.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/InitializationHelperMojo.java @@ -16,14 +16,6 @@ package org.openecomp.sdc.onboarding; -import static org.openecomp.sdc.onboarding.Constants.FORK_COUNT; -import static org.openecomp.sdc.onboarding.Constants.FORK_MODE; -import static org.openecomp.sdc.onboarding.Constants.JACOCO; -import static org.openecomp.sdc.onboarding.Constants.JACOCO_BUILD; -import static org.openecomp.sdc.onboarding.Constants.PREFIX; -import static org.openecomp.sdc.onboarding.Constants.SKIP_PMD; -import static org.openecomp.sdc.onboarding.Constants.UNICORN; - import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -33,6 +25,8 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; +import static org.openecomp.sdc.onboarding.Constants.*; + @Mojo(name = "init-helper", threadSafe = true, defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.TEST) public class InitializationHelperMojo extends AbstractMojo { 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 621e793ab6..a00e900b9a 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 @@ -16,18 +16,6 @@ package org.openecomp.sdc.onboarding; -import static org.openecomp.sdc.onboarding.Constants.INSTRUMENT_ONLY; -import static org.openecomp.sdc.onboarding.Constants.INSTRUMENT_WITH_TEST_ONLY; -import static org.openecomp.sdc.onboarding.Constants.RESOURCE_ONLY; -import static org.openecomp.sdc.onboarding.Constants.RESOURCE_WITH_TEST_ONLY; -import static org.openecomp.sdc.onboarding.Constants.SKIP_MAIN_SOURCE_COMPILE; -import static org.openecomp.sdc.onboarding.Constants.SKIP_PMD; -import static org.openecomp.sdc.onboarding.Constants.SKIP_TEST_SOURCE_COMPILE; -import static org.openecomp.sdc.onboarding.Constants.TEST_ONLY; -import static org.openecomp.sdc.onboarding.Constants.TEST_RESOURCE_ONLY; -import static org.openecomp.sdc.onboarding.Constants.UNICORN; - -import java.io.File; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; @@ -36,6 +24,10 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; +import java.io.File; + +import static org.openecomp.sdc.onboarding.Constants.*; + @Mojo(name = "post-compile-helper", threadSafe = true, defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.TEST) public class PostCompileHelperMojo extends AbstractMojo { diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostSourceGeneratorMojo.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostSourceGeneratorMojo.java index 36e5f8ac32..2aa6cc5df7 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostSourceGeneratorMojo.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostSourceGeneratorMojo.java @@ -16,6 +16,12 @@ package org.openecomp.sdc.onboarding; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; + import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -23,11 +29,6 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; import java.util.stream.Collectors; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.ResolutionScope; @Mojo(name = "post-source-generator-helper", threadSafe = true, defaultPhase = LifecyclePhase.GENERATE_RESOURCES, diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostTestRunHelperMojo.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostTestRunHelperMojo.java index c2816dbfbf..1291266e21 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostTestRunHelperMojo.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PostTestRunHelperMojo.java @@ -16,10 +16,6 @@ package org.openecomp.sdc.onboarding; -import static org.openecomp.sdc.onboarding.Constants.SKIP_TESTS; -import static org.openecomp.sdc.onboarding.Constants.SKIP_TEST_RUN; -import static org.openecomp.sdc.onboarding.Constants.UNICORN; - import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -29,6 +25,8 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; +import static org.openecomp.sdc.onboarding.Constants.*; + @Mojo(name = "post-test-run-helper", threadSafe = true, defaultPhase = LifecyclePhase.TEST, requiresDependencyResolution = ResolutionScope.NONE) public class PostTestRunHelperMojo extends AbstractMojo { diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreCompileHelperMojo.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreCompileHelperMojo.java index 3b51398bc7..29503b9f48 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreCompileHelperMojo.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreCompileHelperMojo.java @@ -68,6 +68,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; + import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Plugin; diff --git a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreTestCompileHelperMojo.java b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreTestCompileHelperMojo.java index a11d796464..8ca623c9a1 100644 --- a/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreTestCompileHelperMojo.java +++ b/openecomp-be/tools/compile-helper-plugin/src/main/java/org/openecomp/sdc/onboarding/PreTestCompileHelperMojo.java @@ -16,13 +16,6 @@ package org.openecomp.sdc.onboarding; -import static org.openecomp.sdc.onboarding.Constants.JACOCO_SKIP; -import static org.openecomp.sdc.onboarding.Constants.RESOURCES_CHANGED; -import static org.openecomp.sdc.onboarding.Constants.SKIP_TESTS; -import static org.openecomp.sdc.onboarding.Constants.SKIP_TEST_RUN; -import static org.openecomp.sdc.onboarding.Constants.UNICORN; - -import java.util.List; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -34,6 +27,10 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.xml.Xpp3Dom; +import java.util.List; + +import static org.openecomp.sdc.onboarding.Constants.*; + @Mojo(name = "pre-test-compile-helper", threadSafe = true, defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES, requiresDependencyResolution = ResolutionScope.TEST) public class PreTestCompileHelperMojo extends AbstractMojo { |