diff options
| author | gjoranv <gv@oath.com> | 2018-10-10 14:53:55 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:23 +0100 |
| commit | efa0bdb5ad7c8669c183af15e564e65efe23bb20 (patch) | |
| tree | d2044ef077a0670c63d3e5f63f7a62dec2613424 | |
| parent | 31ee8d29f9bb8b01b7a436bf2af07ba8c2812a9b (diff) | |
Remove Vespa 7 TODO that is unfeasible.
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 2 | ||||
| -rw-r--r-- | jdisc_core_test/test_bundles/cert-b/pom.xml | 1 |
2 files changed, 1 insertions, 2 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 973854aa59a..9c9957ae718 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 @@ -65,7 +65,7 @@ public class GenerateOsgiManifestMojo extends AbstractMojo { @Parameter(alias = "Bundle-Version", defaultValue = "${project.version}") private String bundleVersion = null; - // TODO Vespa 7: default should be ${project.groupId}.${project.artifactId} + // TODO: default should include groupId, but that will require a lot of changes both by us and users. @Parameter(alias = "Bundle-SymbolicName", defaultValue = "${project.artifactId}") private String bundleSymbolicName = null; diff --git a/jdisc_core_test/test_bundles/cert-b/pom.xml b/jdisc_core_test/test_bundles/cert-b/pom.xml index c634dda581a..f8791a7c298 100644 --- a/jdisc_core_test/test_bundles/cert-b/pom.xml +++ b/jdisc_core_test/test_bundles/cert-b/pom.xml @@ -21,7 +21,6 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <!-- The Vespa bundle-plugin doesn't include groupId. TODO Vespa 7: remove if that is fixed. --> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> </configuration> </plugin> |