summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-06-08 10:51:42 +0200
committerGitHub <noreply@github.com>2018-06-08 10:51:42 +0200
commitfbcd12a89b58ffa85d0374d1085b27b2718f4231 (patch)
treed8500efc8ddad5d1f46d2c43296452579a016235
parent6bade22464c42e528308816964c32eaa15c0aa05 (diff)
parentcc88aa05d9eba7bb867238eaa2832d2453b9a84b (diff)
Merge pull request #6130 from vespa-engine/gjoranv/felix-5.4.0
Upgrade Felix to 5.4.0
-rw-r--r--container-dependency-versions/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index b4af6800768..f546a4e36d2 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -459,7 +459,7 @@
<properties>
<bouncycastle.version>1.58</bouncycastle.version>
- <felix.version>5.0.1</felix.version>
+ <felix.version>5.4.0</felix.version>
<findbugs.version>1.3.9</findbugs.version>
<guava.version>18.0</guava.version>
<guice.version>3.0</guice.version>