diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-31 15:56:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 15:56:00 +0200 |
| commit | b096340d1b736808701954c1c682fce5622f14bb (patch) | |
| tree | 3d7a528b0fe18e9c3c609dd3792a5e4fd90eb530 | |
| parent | 9855d486b19f202a6cf759f31c4f28f34beeabc3 (diff) | |
| parent | 03e0591706c9aa03d8a86025af58ce4b9472c035 (diff) | |
Merge pull request #28318 from vespa-engine/renovate/major-wiremock.vespa.version
Update dependency com.github.tomakehurst:wiremock-jre8-standalone to v3
| -rw-r--r-- | configserver/pom.xml | 2 | ||||
| -rw-r--r-- | container-core/pom.xml | 2 | ||||
| -rw-r--r-- | controller-server/pom.xml | 2 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | http-client/pom.xml | 2 | ||||
| -rw-r--r-- | metrics-proxy/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index bfef0748989..fedeec61fb3 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -96,7 +96,7 @@ </dependency> <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <artifactId>wiremock-standalone</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/container-core/pom.xml b/container-core/pom.xml index 3df232406ca..5c6a85a1279 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -374,7 +374,7 @@ <!-- TEST scope --> <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <artifactId>wiremock-standalone</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 5e738a2dd4a..8104647c2b8 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -191,7 +191,7 @@ <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <artifactId>wiremock-standalone</artifactId> <scope>test</scope> </dependency> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 072e88d3047..ff802753999 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -125,7 +125,7 @@ <spifly.vespa.version>1.3.6</spifly.vespa.version> <snappy.vespa.version>1.1.10.3</snappy.vespa.version> <surefire.vespa.version>3.1.2</surefire.vespa.version> - <wiremock.vespa.version>2.35.0</wiremock.vespa.version> + <wiremock.vespa.version>3.0.0</wiremock.vespa.version> <xerces.vespa.version>2.12.2</xerces.vespa.version> <zero-allocation-hashing.vespa.version>0.16</zero-allocation-hashing.vespa.version> <zookeeper.client.vespa.version>3.8.0</zookeeper.client.vespa.version> diff --git a/http-client/pom.xml b/http-client/pom.xml index c8a58330f24..661cc68f2b7 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <artifactId>wiremock-standalone</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index ee1439fb5f6..f67989afd76 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -112,7 +112,7 @@ <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <artifactId>wiremock-standalone</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index f60a4fea530..c92927437d0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -505,7 +505,7 @@ </dependency> <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <artifactId>wiremock-standalone</artifactId> <version>${wiremock.vespa.version}</version> </dependency> <dependency> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 05ad7674a1f..6a491526c6d 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -215,7 +215,6 @@ xml-apis:xml-apis:1.4.01 #[test-only] # Contains dependencies that are used exclusively in 'test' scope -com.github.tomakehurst:wiremock-jre8-standalone:2.35.0 com.google.guava:guava-testlib:32.1.2-jre com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.3.0 @@ -231,3 +230,4 @@ org.junit.vintage:junit-vintage-engine:5.8.1 org.mockito:mockito-core:5.5.0 org.mockito:mockito-junit-jupiter:5.5.0 org.objenesis:objenesis:3.3 +org.wiremock:wiremock-standalone:3.0.0 |