diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-10-26 12:04:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-26 12:04:51 +0200 |
| commit | 4bc54df04097788c49f31f1cfe1d0446c26d8c42 (patch) | |
| tree | 218c0b35deaa521e934ca595ea40642e1908bc54 | |
| parent | 40202e160b8b3a386b840d045b58899a3f206105 (diff) | |
| parent | 8681384112a32cab522ca73fd7d361e0fbb9fe48 (diff) | |
Merge pull request #24594 from vespa-engine/jonmv/restore-json-deps-test-scope
Jonmv/restore json deps test scope
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-test/pom.xml | 5 | ||||
| -rw-r--r-- | parent/pom.xml | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 5dfded1de09..03f14d7d65f 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -46,6 +46,7 @@ <jetty.version>9.4.49.v20220914</jetty.version> <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <org.lz4.version>1.8.0</org.lz4.version> + <org.json.version>20220320</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> @@ -218,6 +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:${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-test/pom.xml b/container-test/pom.xml index 2b1b20a9ed0..ed33c0ba4cd 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -101,6 +101,11 @@ <scope>compile</scope> </dependency> <dependency> + <!-- not used by Vespa, but was historically on test classpath --> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </dependency> + <dependency> <!-- TODO: this, and probably others, could be removed from here if we make the fat jar the default artifact for jdisc_core --> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> diff --git a/parent/pom.xml b/parent/pom.xml index 57c718ee4f5..b019db32e93 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -994,6 +994,11 @@ <artifactId>xercesImpl</artifactId> <version>2.12.2</version> </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${org.json.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -1052,6 +1057,7 @@ <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <mockito.version>4.0.0</mockito.version> <onnxruntime.version>1.12.1</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.21.7</protobuf.version> |