diff options
Diffstat (limited to 'bundle-plugin/src/main/java/com')
8 files changed, 28 insertions, 21 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java index bed7610e82f..441d7b5a7b8 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.plugin.mojo; +import com.yahoo.container.plugin.util.Artifacts; import org.apache.maven.model.Build; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleTestBundleMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleTestBundleMojo.java index ddf382b02dc..98176e62b93 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleTestBundleMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleTestBundleMojo.java @@ -1,6 +1,8 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.plugin.mojo; +import com.yahoo.container.plugin.util.Artifacts; +import com.yahoo.container.plugin.util.TestBundleDependencyScopeTranslator; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -10,8 +12,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver; import java.nio.file.Path; import java.nio.file.Paths; -import static com.yahoo.container.plugin.mojo.TestBundleUtils.archiveFile; -import static com.yahoo.container.plugin.mojo.TestBundleUtils.manifestFile; +import static com.yahoo.container.plugin.util.TestBundleUtils.archiveFile; +import static com.yahoo.container.plugin.util.TestBundleUtils.manifestFile; /** * @author bjorncs diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java index 4d5b0e327d5..e94e05512aa 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java @@ -5,6 +5,7 @@ import com.google.common.base.Preconditions; import com.yahoo.container.plugin.bundle.AnalyzeBundle; import com.yahoo.container.plugin.osgi.ProjectBundleClassPaths; import com.yahoo.container.plugin.osgi.ProjectBundleClassPaths.BundleClasspathMapping; +import com.yahoo.container.plugin.util.Artifacts; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java index be71c9c149f..892eb9aac05 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java @@ -8,6 +8,7 @@ import com.yahoo.container.plugin.classanalysis.PackageTally; import com.yahoo.container.plugin.osgi.ExportPackages; import com.yahoo.container.plugin.osgi.ExportPackages.Export; import com.yahoo.container.plugin.osgi.ImportPackages.Import; +import com.yahoo.container.plugin.util.Artifacts; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java index 0d4b4dbc8a4..819b47aa417 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java @@ -6,6 +6,8 @@ import com.yahoo.container.plugin.classanalysis.ClassFileMetaData; import com.yahoo.container.plugin.classanalysis.PackageTally; import com.yahoo.container.plugin.osgi.ExportPackages.Export; import com.yahoo.container.plugin.osgi.ImportPackages; +import com.yahoo.container.plugin.util.Artifacts; +import com.yahoo.container.plugin.util.TestBundleDependencyScopeTranslator; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -18,7 +20,7 @@ import java.util.Map; import java.util.stream.Stream; import static com.yahoo.container.plugin.bundle.AnalyzeBundle.exportedPackagesAggregated; -import static com.yahoo.container.plugin.mojo.TestBundleUtils.outputDirectory; +import static com.yahoo.container.plugin.util.TestBundleUtils.outputDirectory; import static com.yahoo.container.plugin.osgi.ExportPackages.exportsByPackageName; import static com.yahoo.container.plugin.osgi.ImportPackages.calculateImports; import static com.yahoo.container.plugin.util.Files.allDescendantFiles; diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/Artifacts.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/Artifacts.java index 0dbed043de0..fc771e23fa7 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/Artifacts.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/Artifacts.java @@ -1,5 +1,5 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.plugin.mojo; +package com.yahoo.container.plugin.util; import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; @@ -12,16 +12,16 @@ import java.util.List; * @author Tony Vaagenes * @author ollivir */ -class Artifacts { +public class Artifacts { interface ScopeTranslator { String scopeOf(Artifact artifact); } - static class NoopScopeTranslator implements ScopeTranslator { + private static class NoopScopeTranslator implements ScopeTranslator { @Override public String scopeOf(Artifact artifact) { return artifact.getScope(); } } - static class ArtifactSet { + public static class ArtifactSet { private final List<Artifact> jarArtifactsToInclude; private final List<Artifact> jarArtifactsProvided; @@ -36,22 +36,22 @@ class Artifacts { this.nonJarArtifacts = nonJarArtifacts; } - List<Artifact> getJarArtifactsToInclude() { + public List<Artifact> getJarArtifactsToInclude() { return jarArtifactsToInclude; } - List<Artifact> getJarArtifactsProvided() { + public List<Artifact> getJarArtifactsProvided() { return jarArtifactsProvided; } - List<Artifact> getNonJarArtifacts() { + public List<Artifact> getNonJarArtifacts() { return nonJarArtifacts; } } - static ArtifactSet getArtifacts(MavenProject project) { return getArtifacts(project, new NoopScopeTranslator()); } + public static ArtifactSet getArtifacts(MavenProject project) { return getArtifacts(project, new NoopScopeTranslator()); } - static ArtifactSet getArtifacts(MavenProject project, ScopeTranslator scopeTranslator) { + public static ArtifactSet getArtifacts(MavenProject project, ScopeTranslator scopeTranslator) { List<Artifact> jarArtifactsToInclude = new ArrayList<>(); List<Artifact> jarArtifactsProvided = new ArrayList<>(); List<Artifact> nonJarArtifactsToInclude = new ArrayList<>(); @@ -76,7 +76,7 @@ class Artifacts { return new ArtifactSet(jarArtifactsToInclude, jarArtifactsProvided, nonJarArtifactsToInclude); } - static Collection<Artifact> getArtifactsToInclude(MavenProject project) { + public static Collection<Artifact> getArtifactsToInclude(MavenProject project) { return getArtifacts(project, new NoopScopeTranslator()).getJarArtifactsToInclude(); } } diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestBundleDependencyScopeTranslator.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java index 92023df8b23..04ede59e2fe 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestBundleDependencyScopeTranslator.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslator.java @@ -1,5 +1,5 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.plugin.mojo; +package com.yahoo.container.plugin.util; import org.apache.maven.artifact.Artifact; @@ -25,7 +25,7 @@ import static java.util.stream.Collectors.toList; * * @author bjorncs */ -class TestBundleDependencyScopeTranslator implements Artifacts.ScopeTranslator { +public class TestBundleDependencyScopeTranslator implements Artifacts.ScopeTranslator { private static final Logger log = Logger.getLogger(TestBundleDependencyScopeTranslator.class.getName()); @@ -37,7 +37,7 @@ class TestBundleDependencyScopeTranslator implements Artifacts.ScopeTranslator { @Override public String scopeOf(Artifact artifact) { return Objects.requireNonNull(dependencyScopes.get(artifact)); } - static TestBundleDependencyScopeTranslator from(Map<String, Artifact> dependencies, String rawConfig) { + public static TestBundleDependencyScopeTranslator from(Map<String, Artifact> dependencies, String rawConfig) { List<DependencyOverride> dependencyOverrides = toDependencyOverrides(rawConfig); Map<Artifact, String> dependencyScopes = new HashMap<>(); for (Artifact dependency : dependencies.values()) { diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestBundleUtils.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleUtils.java index 9a3fc89bbd5..b8824952995 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/TestBundleUtils.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/TestBundleUtils.java @@ -1,5 +1,5 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.plugin.mojo; +package com.yahoo.container.plugin.util; import org.apache.maven.project.MavenProject; @@ -10,14 +10,14 @@ import java.util.jar.JarFile; /** * @author bjorncs */ -class TestBundleUtils { +public class TestBundleUtils { private TestBundleUtils() {} - static Path outputDirectory(MavenProject project) { return targetDirectory(project).resolve("test-bundle/"); } + public static Path outputDirectory(MavenProject project) { return targetDirectory(project).resolve("test-bundle/"); } - static Path manifestFile(MavenProject project) { return outputDirectory(project).resolve(JarFile.MANIFEST_NAME); } + public static Path manifestFile(MavenProject project) { return outputDirectory(project).resolve(JarFile.MANIFEST_NAME); } - static Path archiveFile(MavenProject project) { + public static Path archiveFile(MavenProject project) { return targetDirectory(project).resolve(project.getBuild().getFinalName() + "-tests.jar"); } |