diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-07-29 10:51:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 10:51:43 +0200 |
| commit | 3afb44d4e4328b2732f65b4a436baa2ce2c850b0 (patch) | |
| tree | ce2a8377e18d78eabdda8a926e12f0d039346827 | |
| parent | aa641a8cdd116eba037f8c584bd32b9a9fed1b75 (diff) | |
| parent | 820147d4cd40c93d9ebe0a5484e24d66562e33dd (diff) | |
Merge pull request #23553 from vespa-engine/bjorncs/upgrade-org-json
Upgrade org.json:json to '20220320'
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 4 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 1 |
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 8f9dbd59019..1a83afd1be5 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -45,7 +45,7 @@ <jetty.version>9.4.48.v20220622</jetty.version> <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <org.lz4.version>1.8.0</org.lz4.version> - <org.json.version>20090211</org.json.version> + <org.json.version>20220320</org.json.version> <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> @@ -219,7 +219,7 @@ <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:test</include> <include>org.hamcrest:hamcrest-core:1.3:jar:test</include> <include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include> - <include>org.json:json:20090211:jar:test</include> + <include>org.json:json:${org.json.version}:jar:test</include> <include>org.junit.jupiter:junit-jupiter-api:[${junit5.version}]:jar:test</include> <include>org.junit.jupiter:junit-jupiter-engine:[${junit5.version}]:jar:test</include> <include>org.junit.platform:junit-platform-commons:[${junit5.platform.version}]:jar:test</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 709f9dc333a..695ee72df5c 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -242,7 +242,6 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> <jaxb.version>2.3.0</jaxb.version> - <org.json.version>20090211</org.json.version> <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> diff --git a/parent/pom.xml b/parent/pom.xml index d9e4f217b71..ddca2a36696 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1067,6 +1067,7 @@ <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <mockito.version>4.0.0</mockito.version> <onnxruntime.version>1.11.0</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> + <org.json.version>20220320</org.json.version> <org.lz4.version>1.8.0</org.lz4.version> <prometheus.client.version>0.6.0</prometheus.client.version> <protobuf.version>3.19.2</protobuf.version> |