diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-10-22 10:46:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 10:46:31 +0200 |
| commit | 477354aea222aad8b23bb121ce6c4add8da1c462 (patch) | |
| tree | d62bb8b027555f8e567af6ef3a52182749bc0892 /jdisc_core | |
| parent | 2ff6029a7e8f4c3bf53ad714822e8a5d462ad74c (diff) | |
| parent | 47c4da22fba9fd1c448bafb4b4dd29ae3cd3c1d8 (diff) | |
Merge pull request #19697 from vespa-engine/felix-7.0.1
Felix 7.0.1
Diffstat (limited to 'jdisc_core')
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java | 1 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java index 402c6c288f3..90f7d7aab01 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java @@ -54,7 +54,6 @@ public class FelixParams { Map<String, String> ret = new HashMap<>(); ret.put(BundleCache.CACHE_ROOTDIR_PROP, cachePath); ret.put(Constants.FRAMEWORK_SYSTEMPACKAGES, exportPackages.toString()); - ret.put(Constants.SUPPORTS_BOOTCLASSPATH_EXTENSION, "true"); ret.put(Constants.FRAMEWORK_BOOTDELEGATION, "com.yourkit.runtime,com.yourkit.probes,com.yourkit.probes.builtin,com.singularity.*"); ret.put(Constants.FRAMEWORK_BSNVERSION, Constants.FRAMEWORK_BSNVERSION_MANAGED); return ret; diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java index 50ac90b6181..b7993de5d82 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java @@ -168,5 +168,8 @@ class OsgiLogHandler extends Handler { return new Hashtable<>(); } + @Override + public <A> A adapt(Class<A> aClass) { return null; } + } } |