summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2023-03-30 12:30:44 +0200
committerGitHub <noreply@github.com>2023-03-30 12:30:44 +0200
commitabea67baa0f5f10537268e73bc8402fb6e512f8f (patch)
tree89f97408879d88fdef31ab41ef91ef428a3791d6
parent0a49d0e39ddc0df8bf6959ba67c9fdde74613fd8 (diff)
parent4fbd6b05a907e4fc19b7b45f521b4b4111e0170d (diff)
Merge pull request #26646 from vespa-engine/balder/bump-aries-spifly-to-1.3.6
Bump aries.spifly from 1.3.5 to 1.3.6
-rw-r--r--parent/pom.xml2
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index b0ba6e89f6e..ace6a47d6bc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1170,7 +1170,7 @@
<org.lz4.version>1.8.0</org.lz4.version>
<prometheus.client.version>0.6.0</prometheus.client.version>
<protobuf.version>3.21.7</protobuf.version>
- <spifly.version>1.3.5</spifly.version>
+ <spifly.version>1.3.6</spifly.version>
<surefire.version>3.0.0-M9</surefire.version>
<wiremock.version>2.35.0</wiremock.version>
<zero-allocation-hashing.version>0.16</zero-allocation-hashing.version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 18475a8e4d9..95f1179b1a3 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -80,7 +80,7 @@ net.java.dev.jna:jna:5.11.0
net.openhft:zero-allocation-hashing:0.16
org.antlr:antlr-runtime:3.5.3
org.antlr:antlr4-runtime:4.11.1
-org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.5
+org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6
org.apache.commons:commons-compress:1.22
org.apache.commons:commons-csv:1.8
org.apache.commons:commons-exec:1.3