diff options
| -rw-r--r-- | application/pom.xml | 4 | ||||
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 7 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 3 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 17 | ||||
| -rw-r--r-- | container-dev/pom.xml | 12 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 1 | ||||
| -rw-r--r-- | jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 18 | ||||
| -rwxr-xr-x | provided-dependencies/pom.xml | 4 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 5 | ||||
| -rw-r--r-- | 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 @@ -100,6 +100,10 @@ <artifactId>antlr4-runtime</artifactId> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + </dependency> + <dependency> <groupId>org.apache.opennlp</groupId> <artifactId>opennlp-tools</artifactId> </dependency> 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 @@ <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml --> <athenz.version>1.10.54</athenz.version> + <felix.version>7.0.1</felix.version> <httpclient5.version>5.1.2</httpclient5.version> <httpclient.version>4.5.13</httpclient.version> <httpcore.version>4.4.13</httpcore.version> @@ -33,8 +34,6 @@ Copied here because vz-tenant-base does not have a parent. --> <aopalliance.version>1.0</aopalliance.version> <bouncycastle.version>1.68</bouncycastle.version> - <felix.version>7.0.1</felix.version> - <felix.log.version>1.0.1</felix.log.version> <guava.version>27.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.13.3</jackson2.version> @@ -95,9 +94,6 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> @@ -214,6 +210,7 @@ <include>org.apache.commons:commons-exec:1.3:jar:test</include> <include>org.apache.commons:commons-compress:1.21:jar:test</include> <include>org.apache.commons:commons-math3:3.6.1:jar:test</include> + <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:test</include> <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:jar:test</include> <include>org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:jar:test</include> <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:jar:test</include> 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 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> 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 @@ -130,21 +130,6 @@ <!-- jaxb end --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${felix.version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${felix.log.version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>${felix.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> <version>${bouncycastle.version}</version> @@ -261,8 +246,6 @@ <properties> <aopalliance.version>1.0</aopalliance.version> <bouncycastle.version>1.68</bouncycastle.version> - <felix.version>7.0.1</felix.version> - <felix.log.version>1.0.1</felix.log.version> <guava.version>27.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.13.3</jackson2.version> 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 @@ -29,6 +29,14 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + </exclusion> + <exclusion> <groupId>org.jvnet.hudson</groupId> <artifactId>annotation-indexer</artifactId> </exclusion> @@ -53,10 +61,6 @@ <classifier>no_aop</classifier> </dependency> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> 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 @@ <argument>${exportPackagesFile}</argument> <argument>__REPLACE_VERSION__${project.build.directory}/dependency/guava.jar</argument> <argument>${project.build.directory}/dependency/guice-no_aop.jar</argument> - <argument>${project.build.directory}/dependency/org.apache.felix.log.jar</argument> <argument>${project.build.directory}/dependency/slf4j-api.jar</argument> <argument>${project.build.directory}/dependency/slf4j-jdk14.jar</argument> <argument>${project.build.directory}/dependency/jcl-over-slf4j.jar</argument> 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 @@ -667,6 +667,22 @@ <version>1.8</version> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>${felix.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${felix.log.version}</version> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>${apache.httpcore.version}</version> @@ -972,6 +988,8 @@ <commons.codec.version>1.15</commons.codec.version> <commons.math3.version>3.6.1</commons.math3.version> <eclipse-collections.version>11.0.0</eclipse-collections.version> + <felix.version>7.0.1</felix.version> + <felix.log.version>1.0.1</felix.log.version> <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava --> <gson.version>2.8.9</gson.version> <hdrhistogram.version>2.1.12</hdrhistogram.version> 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 @@ <artifactId>guice</artifactId> <classifier>no_aop</classifier> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - </dependency> <!-- Dependencies used by container-core --> <dependency> 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 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> 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 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> |