summaryrefslogtreecommitdiffstats
path: root/jdisc_core_test
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-06-05 00:03:25 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:29 +0200
commit7e4e4b0b0f9c4c763a764e97c3872b4e52e2e69d (patch)
tree5deff26e735f8875b00691300857f30778e3fb68 /jdisc_core_test
parentb5f1fa75c245516f080c47ef986f4960561100fc (diff)
Don't provide any felix artifacts via 'container'
+ Stop exporting felix.log packages (org.osgi.service.log) + Completely remove felix.main (the felix launcher including everything in felix.framework). This was probably never needed by vespa. * Add explicit felix.framework dep to vespa-osgi-testrunner and standalone-container, as it's no longer included in container-dev. (The packages are still exported by jdisc_core, so imports will be generated.) * Add felix.framework to 'application', as it's needed for unit tests. * Exclude animal-sniffer-annotations from felix.framework in parent. Not needed anywhere by Vespa.
Diffstat (limited to 'jdisc_core_test')
-rw-r--r--jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java
index 0c3e6e25bae..17a9ca29b1d 100644
--- a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java
+++ b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java
@@ -142,7 +142,6 @@ public class CertificateK {
private final org.osgi.framework.AdminPermission permission = null;
private final org.osgi.framework.hooks.service.FindHook hook = null;
private final org.osgi.framework.launch.Framework framework = null;
- private final org.osgi.service.log.LogEntry entry = null;
private final org.osgi.service.packageadmin.ExportedPackage pkg = null;
private final org.osgi.service.startlevel.StartLevel level = null;
private final org.osgi.service.url.URLConstants constants = null;