diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-10-24 10:03:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-24 10:03:39 +0200 |
| commit | 30e050f52399200e32f44e50326deb43fb762f31 (patch) | |
| tree | 520b44c29e1436a1a12ee5cdcdec080ce1eec8f0 | |
| parent | f81f3db7ce3c25c590e80dc4f07f57d57ecac47b (diff) | |
| parent | 796a7108f2e82a7078423a1467308e1537834b22 (diff) | |
Merge pull request #19710 from vespa-engine/jonmv/fixit
Revert felix 7.0.1
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index bcff251f2c2..636dbf91a57 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>7.0.1</felix.version> + <felix.version>6.0.3</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 cc44ada80b4..cdf0dd814fd 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>7.0.1</felix.version> + <felix.version>6.0.3</felix.version> <felix.log.version>1.0.1</felix.log.version> <!-- TODO Vespa 8: upgrade! --> <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/OsgiLogHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java index b7993de5d82..50ac90b6181 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,8 +168,5 @@ class OsgiLogHandler extends Handler { return new Hashtable<>(); } - @Override - public <A> A adapt(Class<A> aClass) { return null; } - } } |