From c20cdd760660f59203a667be18e00d0fe3006723 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Fri, 30 Jun 2023 16:56:28 +0200 Subject: Move constant to Artifacts class --- .../com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 3 +-- .../src/main/java/com/yahoo/container/plugin/util/Artifacts.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'bundle-plugin/src') 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 7ea1b11b935..55a29ea1535 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 @@ -33,6 +33,7 @@ import static com.yahoo.container.plugin.bundle.AnalyzeBundle.providedArtifactsA import static com.yahoo.container.plugin.classanalysis.Packages.disallowedImports; 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.Artifacts.VESPA_GROUP_ID; import static com.yahoo.container.plugin.util.Files.allDescendantFiles; @@ -49,8 +50,6 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { USER } - private static final String VESPA_GROUP_ID = "com.yahoo.vespa"; - @Parameter private String discApplicationClass = null; diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/Artifacts.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/Artifacts.java index bde0c124229..a2789b682b9 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/Artifacts.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/Artifacts.java @@ -13,6 +13,10 @@ import java.util.List; * @author ollivir */ public class Artifacts { + + public static final String VESPA_GROUP_ID = "com.yahoo.vespa"; + + interface ScopeTranslator { String scopeOf(Artifact artifact); } -- cgit v1.2.3