diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-09-05 12:49:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 12:49:39 +0200 |
| commit | 6d783357cf83163a1298372e88020d3d73c25e3c (patch) | |
| tree | 459daa166d10f7fe743031e707a32c78f839091e /parent | |
| parent | 2697fbc195ef428210925e4b05223e0ab64405a4 (diff) | |
| parent | 05df635cab10d2e312a10e0620a0e6558a4de013 (diff) | |
Merge branch 'master' into renovate/junit5-monorepo
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 0603ade1694..b1ea1e0dab9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -307,7 +307,7 @@ --> <groupId>org.openrewrite.maven</groupId> <artifactId>rewrite-maven-plugin</artifactId> - <version>5.4.2</version> + <version>5.5.0</version> <configuration> <activeRecipes> <recipe>org.openrewrite.java.testing.junit5.JUnit5BestPractices</recipe> @@ -504,8 +504,8 @@ <version>3.1.9</version> </dependency> <dependency> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> + <groupId>org.wiremock</groupId> + <artifactId>wiremock-standalone</artifactId> <version>${wiremock.vespa.version}</version> </dependency> <dependency> @@ -541,11 +541,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <version>${guava.vespa.version}</version> - </dependency> - <dependency> <groupId>com.google.jimfs</groupId> <artifactId>jimfs</artifactId> <version>${jimfs.vespa.version}</version> @@ -635,6 +630,16 @@ <version>${joda-time.vespa.version}</version> </dependency> <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>${byte-buddy.vespa.version}</version> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>${byte-buddy.vespa.version}</version> + </dependency> + <dependency> <groupId>net.openhft</groupId> <artifactId>zero-allocation-hashing</artifactId> <version>${zero-allocation-hashing.vespa.version}</version> @@ -1120,6 +1125,12 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>${xerces.vespa.version}</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <!-- TODO: Remove on Vespa 9 --> <groupId>org.json</groupId> @@ -1132,11 +1143,6 @@ <version>${error-prone-annotations.vespa.version}</version> </dependency> <dependency> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - <version>${checker-qual.vespa.version}</version> - </dependency> - <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-apache-v2</artifactId> <version>1.43.3</version> @@ -1151,7 +1157,11 @@ <artifactId>google-auth-library-oauth2-http</artifactId> <version>1.19.0</version> </dependency> - + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>${jakarta.inject.vespa.version}</version> + </dependency> </dependencies> </dependencyManagement> |