diff options
| author | gjoranv <gv@yahooinc.com> | 2023-07-24 13:58:36 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahooinc.com> | 2023-07-24 15:18:39 +0200 |
| commit | 7487fd09a0306e0fa6b4134b0edda7e9fcf81285 (patch) | |
| tree | c16efe27de86a4494d5801e9fff9d758a856e10f | |
| parent | c73e69f6416766473cf07dd5f9119eae59631adb (diff) | |
Add version property for hamcrest
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 63f4e89f478..73cdafadf25 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -186,7 +186,7 @@ <include>org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}:test</include> <include>org.eclipse.jetty:jetty-util:${jetty.vespa.version}:test</include> - <include>org.hamcrest:hamcrest-core:1.3:test</include> + <include>org.hamcrest:hamcrest-core:${hamcrest.vespa.version}:test</include> <include>org.hdrhistogram:HdrHistogram:${hdrhistogram.vespa.version}:test</include> <include>org.json:json:${org.json.vespa.version}:test</include> <include>org.junit.jupiter:junit-jupiter-api:${junit.vespa.version}:test</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 8a274e2e6f8..ef00b370739 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -195,7 +195,7 @@ <include>org.eclipse.jetty:jetty-server:${jetty.vespa.version}:test</include> <include>org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}:test</include> <include>org.eclipse.jetty:jetty-util:${jetty.vespa.version}:test</include> - <include>org.hamcrest:hamcrest-core:1.3:test</include> + <include>org.hamcrest:hamcrest-core:${hamcrest.vespa.version}:test</include> <include>org.hdrhistogram:HdrHistogram:${hdrhistogram.vespa.version}:test</include> <include>org.json:json:${org.json.vespa.version}:test</include> <!-- TODO: Remove on Vespa 9 --> <include>org.lz4:lz4-java:${org.lz4.vespa.version}:test</include> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index f083ec0f1a6..db6861cb97a 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -76,6 +76,7 @@ <felix.vespa.version>7.0.5</felix.vespa.version> <felix.log.vespa.version>1.0.1</felix.log.vespa.version> <findbugs.vespa.version>3.0.2</findbugs.vespa.version> <!-- Should be kept in sync with guava --> + <hamcrest.vespa.version>1.3</hamcrest.vespa.version> <hdrhistogram.vespa.version>2.1.12</hdrhistogram.vespa.version> <icu4j.vespa.version>70.1</icu4j.vespa.version> <jersey.vespa.version>2.25</jersey.vespa.version> diff --git a/parent/pom.xml b/parent/pom.xml index 04d06a122cc..d45317d6878 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1005,19 +1005,19 @@ <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.3</version> + <version>${hamcrest.vespa.version}</version> <scope>test</scope> <!-- TODO: remove scope from parent pom --> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-core</artifactId> - <version>1.3</version> + <version>${hamcrest.vespa.version}</version> <scope>test</scope> <!-- TODO: remove scope from parent pom --> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> - <version>1.3</version> + <version>${hamcrest.vespa.version}</version> <scope>test</scope> <!-- TODO: remove scope from parent pom --> </dependency> <dependency> |