summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-08-15 16:32:47 +0200
committerGitHub <noreply@github.com>2022-08-15 16:32:47 +0200
commitd26af2f24b238a1a56409a0d23b335f344dd7942 (patch)
treeeb1ae370592054a89859fbe6e20f64afa324ba47
parent184aa7cf67ac4dec150bc90aaaf050234458f9ea (diff)
parent019ab5615dd299e46e7b3e708682d34825a6b7db (diff)
Merge pull request #23667 from vespa-engine/bjorncs/felix.log
Add Felix Logging to container-test
-rw-r--r--application/pom.xml4
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml3
2 files changed, 7 insertions, 0 deletions
diff --git a/application/pom.xml b/application/pom.xml
index 34bf1b56c0d..e2176d4deac 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -86,6 +86,10 @@
<artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</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 1a83afd1be5..a30cbb86299 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -189,6 +189,7 @@
<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.felix:org.apache.felix.log:1.0.1: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>
@@ -227,6 +228,8 @@
<include>org.junit.vintage:junit-vintage-engine:[${junit5.version}]:jar:test</include>
<include>org.lz4:lz4-java:[${org.lz4.version}]:jar:test</include>
<include>org.opentest4j:opentest4j:1.2.0:jar:test</include>
+ <include>org.osgi:org.osgi.compendium:4.1.0:jar:test</include>
+ <include>org.osgi:org.osgi.core:4.1.0:jar:test</include>
<include>xerces:xercesImpl:2.12.1:jar:test</include>
</allowed>
</enforceDependencies>