diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-07-10 17:15:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 17:15:42 +0200 |
| commit | 15890ec476af05469bc37921233025e9a502f0f3 (patch) | |
| tree | ddeaa53d9875d37e4c3e840532eaa9cc24dac271 | |
| parent | 358852ac25cee9ab4dec166a21e396d70f2ff498 (diff) | |
| parent | a6ee7f70a364cc56bfa88dd4fbb5cd85a627924a (diff) | |
Merge pull request #27714 from vespa-engine/renovate/felix.version
Update dependency org.apache.felix:org.apache.felix.framework to v7.0.5
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 85805da76a5..1094aa4d3c1 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -24,7 +24,7 @@ <bouncycastle.version>1.74</bouncycastle.version> <commons-codec.version>1.15</commons-codec.version> - <felix.version>7.0.1</felix.version> + <felix.version>7.0.5</felix.version> <httpclient5.version>5.2.1</httpclient5.version> <httpcore5.version>5.2.1</httpcore5.version> <httpclient.version>4.5.14</httpclient.version> diff --git a/parent/pom.xml b/parent/pom.xml index 169e7396c4a..88248571ee7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1146,7 +1146,7 @@ <commons-io.version>2.11.0</commons-io.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.version>7.0.5</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 --> <hdrhistogram.version>2.1.12</hdrhistogram.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index a66aec154d9..9b3dbf64be3 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -89,7 +89,7 @@ org.apache.commons:commons-math3:3.6.1 org.apache.curator:curator-client:5.4.0 org.apache.curator:curator-framework:5.4.0 org.apache.curator:curator-recipes:5.4.0 -org.apache.felix:org.apache.felix.framework:7.0.1 +org.apache.felix:org.apache.felix.framework:7.0.5 org.apache.felix:org.apache.felix.log:1.0.1 org.apache.httpcomponents:httpclient:4.5.14 org.apache.httpcomponents:httpcore:4.4.16 |