diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-04-17 09:26:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 09:26:52 +0200 |
| commit | f843387444f2c92f648aa826f7f5b3cc78435d6e (patch) | |
| tree | 158de51b51652fc3bceb2ab71e2349b1bc8015ea | |
| parent | 8ee27958b2f51eff74f3e4e8eff945f186243a92 (diff) | |
| parent | 8d3571875d7ca286716cdf048c0164f1ff3b2230 (diff) | |
Merge pull request #26748 from vespa-engine/balder/bump-json
Balder/bump json
| -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 daf3683ad26..4d5d801e0e3 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -46,7 +46,7 @@ <jaxb.version>2.3.0</jaxb.version> <jetty.version>11.0.14</jetty.version> <org.lz4.version>1.8.0</org.lz4.version> - <org.json.version>20220320</org.json.version> <!-- TODO: Remove on Vespa 9 --> + <org.json.version>20230227</org.json.version> <!-- TODO: Remove on Vespa 9 --> <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom --> <xml-apis.version>1.4.01</xml-apis.version> </properties> diff --git a/parent/pom.xml b/parent/pom.xml index ace6a47d6bc..8d2f802e34b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1166,7 +1166,7 @@ <netty.version>4.1.86.Final</netty.version> <netty-tcnative.version>2.0.54.Final</netty-tcnative.version> <onnxruntime.version>1.13.1</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> - <org.json.version>20220320</org.json.version> + <org.json.version>20230227</org.json.version> <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> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 95f1179b1a3..b5841d1c9e4 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -182,7 +182,7 @@ org.glassfish.jersey.media:jersey-media-multipart:2.25 org.hdrhistogram:HdrHistogram:2.1.12 org.iq80.snappy:snappy:0.4 org.javassist:javassist:3.20.0-GA -org.json:json:20220320 +org.json:json:20230227 org.junit.jupiter:junit-jupiter-api:5.8.1 org.junit.jupiter:junit-jupiter-engine:5.8.1 org.junit.platform:junit-platform-commons:1.8.1 |