summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@yahooinc.com>2023-06-28 11:55:01 +0200
committergjoranv <gv@yahooinc.com>2023-06-30 16:31:35 +0200
commit4d626ff716f7493553d9c3c76045fa3b81965041 (patch)
treecebed57115401cae6c1588fa9d787b09577991b4
parent4750d563e7bb49530320c63b40bfddb98f0ff5f2 (diff)
minor: rearrange methods
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java10
1 files changed, 5 insertions, 5 deletions
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 261518d13f3..814a9667e8a 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
@@ -151,11 +151,6 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
};
}
- private BundleType effectiveBundleType() {
- if (bundleType != BundleType.USER) return bundleType;
- return isVespaInternalGroupId(project.getGroupId()) ? BundleType.INTERNAL : BundleType.USER;
- }
-
private void addAdditionalManifestProperties(Map<String, String> manifestContent) {
addIfNotEmpty(manifestContent, "Bundle-Activator", bundleActivator);
addIfNotEmpty(manifestContent, "X-JDisc-Privileged-Activator", jdiscPrivilegedActivator);
@@ -276,6 +271,11 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
}
}
+ private BundleType effectiveBundleType() {
+ if (bundleType != BundleType.USER) return bundleType;
+ return isVespaInternalGroupId(project.getGroupId()) ? BundleType.INTERNAL : BundleType.USER;
+ }
+
private boolean isVespaInternalGroupId(String groupId) {
return groupId.equals(VESPA_GROUP_ID)
|| groupId.equals(VESPA_GROUP_ID + ".hosted")