From 7e4e4b0b0f9c4c763a764e97c3872b4e52e2e69d Mon Sep 17 00:00:00 2001 From: gjoranv Date: Sun, 5 Jun 2022 00:03:25 +0200 Subject: 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. --- application/pom.xml | 4 ++++ cloud-tenant-base-dependencies-enforcer/pom.xml | 7 ++----- container-dependencies-enforcer/pom.xml | 3 --- container-dependency-versions/pom.xml | 17 ----------------- container-dev/pom.xml | 12 ++++++++---- jdisc_core/pom.xml | 1 - .../java/com/yahoo/jdisc/bundle/k/CertificateK.java | 1 - parent/pom.xml | 18 ++++++++++++++++++ provided-dependencies/pom.xml | 4 ---- standalone-container/pom.xml | 5 +++++ vespa-osgi-testrunner/pom.xml | 5 +++++ 11 files changed, 42 insertions(+), 35 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 7e1b54a7904..ceb8653cd1c 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -99,6 +99,10 @@ org.antlr antlr4-runtime + + org.apache.felix + org.apache.felix.framework + org.apache.opennlp opennlp-tools diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 0253683f0e3..729cd91e314 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -21,6 +21,7 @@ 1.10.54 + 7.0.1 5.1.2 4.5.13 4.4.13 @@ -33,8 +34,6 @@ Copied here because vz-tenant-base does not have a parent. --> 1.0 1.68 - 7.0.1 - 1.0.1 27.1-jre 4.2.3 2.13.3 @@ -95,9 +94,6 @@ javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided - org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided - org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided - org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided @@ -214,6 +210,7 @@ org.apache.commons:commons-exec:1.3:jar:test org.apache.commons:commons-compress:1.21:jar:test org.apache.commons:commons-math3:3.6.1:jar:test + org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:test org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:jar:test org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:jar:test org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:jar:test diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index e507bffa7dc..56ebc92f88d 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -80,9 +80,6 @@ javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided - org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided - org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided - org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 771451084c8..a47b91f3231 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -129,21 +129,6 @@ - - org.apache.felix - org.apache.felix.framework - ${felix.version} - - - org.apache.felix - org.apache.felix.log - ${felix.log.version} - - - org.apache.felix - org.apache.felix.main - ${felix.version} - org.bouncycastle bcpkix-jdk15on @@ -261,8 +246,6 @@ 1.0 1.68 - 7.0.1 - 1.0.1 27.1-jre 4.2.3 2.13.3 diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 39276b888b1..fbea41e94a4 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -28,6 +28,14 @@ jdisc_core ${project.version} + + org.apache.felix + org.apache.felix.framework + + + org.apache.felix + org.apache.felix.log + org.jvnet.hudson annotation-indexer @@ -52,10 +60,6 @@ guice no_aop - - org.apache.felix - org.apache.felix.main - commons-logging commons-logging diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 1c5933a02e6..8d09ea1198f 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -215,7 +215,6 @@ ${exportPackagesFile} __REPLACE_VERSION__${project.build.directory}/dependency/guava.jar ${project.build.directory}/dependency/guice-no_aop.jar - ${project.build.directory}/dependency/org.apache.felix.log.jar ${project.build.directory}/dependency/slf4j-api.jar ${project.build.directory}/dependency/slf4j-jdk14.jar ${project.build.directory}/dependency/jcl-over-slf4j.jar 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; diff --git a/parent/pom.xml b/parent/pom.xml index c23b19a64bf..05b3df87e51 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -666,6 +666,22 @@ commons-csv 1.8 + + org.apache.felix + org.apache.felix.framework + ${felix.version} + + + org.codehaus.mojo + animal-sniffer-annotations + + + + + org.apache.felix + org.apache.felix.log + ${felix.log.version} + org.apache.httpcomponents httpcore @@ -972,6 +988,8 @@ 1.15 3.6.1 11.0.0 + 7.0.1 + 1.0.1 3.0.2 2.8.9 2.1.12 diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index f9f6780c72c..a52e7fe7caf 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -49,10 +49,6 @@ guice no_aop - - org.apache.felix - org.apache.felix.main - diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 25c4b8f801f..b9b58f37c00 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -72,6 +72,11 @@ ${project.version} provided + + org.apache.felix + org.apache.felix.framework + provided + diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 98cb158b71e..03de830e658 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -75,6 +75,11 @@ ${project.version} provided + + org.apache.felix + org.apache.felix.framework + provided + -- cgit v1.2.3