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 | |
| parent | 2ff6029a7e8f4c3bf53ad714822e8a5d462ad74c (diff) | |
| parent | 47c4da22fba9fd1c448bafb4b4dd29ae3cd3c1d8 (diff) | |
Merge pull request #19697 from vespa-engine/felix-7.0.1
Felix 7.0.1
4 files changed, 5 insertions, 3 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 636dbf91a57..bcff251f2c2 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -22,7 +22,7 @@ <aopalliance.version>1.0</aopalliance.version> <athenz.version>1.10.14</athenz.version> <bouncycastle.version>1.68</bouncycastle.version> - <felix.version>6.0.3</felix.version> + <felix.version>7.0.1</felix.version> <felix.log.version>1.0.1</felix.log.version> <findbugs.version>1.3.9</findbugs.version> <guava.version>20.0</guava.version> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 27f7374b802..677931d68cf 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -403,7 +403,7 @@ <properties> <aopalliance.version>1.0</aopalliance.version> <bouncycastle.version>1.68</bouncycastle.version> - <felix.version>6.0.3</felix.version> + <felix.version>7.0.1</felix.version> <felix.log.version>1.0.1</felix.log.version> <findbugs.version>1.3.9</findbugs.version> <guava.version>20.0</guava.version> 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; } + } } |