diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 10 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 4 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 4 | ||||
| -rw-r--r-- | tenant-cd-api/pom.xml | 4 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 13 | ||||
| -rw-r--r-- | vespa-maven-plugin/pom.xml | 1 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/pom.xml | 8 |
7 files changed, 31 insertions, 13 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 8871b8ac55a..c3c1f10697a 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -193,11 +193,11 @@ <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> - <include>org.junit.jupiter:junit-jupiter-engine:${junit.vespa.version}:test</include> - <include>org.junit.platform:junit-platform-commons:${junit.platform.vespa.version}:test</include> - <include>org.junit.platform:junit-platform-engine:${junit.platform.vespa.version}:test</include> - <include>org.junit.vintage:junit-vintage-engine:${junit.vespa.version}:test</include> + <include>org.junit.jupiter:junit-jupiter-api:${junit.vespa.tenant.version}:test</include> + <include>org.junit.jupiter:junit-jupiter-engine:${junit.vespa.tenant.version}:test</include> + <include>org.junit.platform:junit-platform-commons:${junit.platform.vespa.tenant.version}:test</include> + <include>org.junit.platform:junit-platform-engine:${junit.platform.vespa.tenant.version}:test</include> + <include>org.junit.vintage:junit-vintage-engine:${junit.vespa.tenant.version}:test</include> <include>org.lz4:lz4-java:${org.lz4.vespa.version}:test</include> <include>org.opentest4j:opentest4j:${opentest4j.vespa.version}:test</include> <include>xerces:xercesImpl:${xerces.vespa.version}:test</include> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 5242723a03a..5ac932d0ee2 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -130,6 +130,10 @@ <zero-allocation-hashing.vespa.version>0.16</zero-allocation-hashing.vespa.version> <zookeeper.client.vespa.version>3.8.0</zookeeper.client.vespa.version> + <!-- Versions used by tenant parent pom and testing framework --> + <!-- CAUTION: upgrading junit for tenants poms may break testing frameworks --> + <junit.vespa.tenant.version>5.8.1</junit.vespa.tenant.version> + <junit.platform.vespa.tenant.version>1.8.1</junit.platform.vespa.tenant.version> <!-- Maven plugins --> <clover-maven-plugin.vespa.version>4.4.1</clover-maven-plugin.vespa.version> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 6f21ed3aafc..33f47cf262f 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -43,8 +43,8 @@ <bundle-plugin.failOnWarnings>false</bundle-plugin.failOnWarnings> <target_jdk_version>17</target_jdk_version> - <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' --> - <junit.vespa.tenant.version>${junit.vespa.version}</junit.vespa.tenant.version> + <!-- NOTE: junit version must not be overridden by users --> + <test.categories>!integration</test.categories> <!-- To allow specialized base pom to include additional "test provided" dependencies --> diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml index 42e3fe150fa..bc17de1eb72 100644 --- a/tenant-cd-api/pom.xml +++ b/tenant-cd-api/pom.xml @@ -24,7 +24,7 @@ This version must match the string in all ExportPackage annotations in this module. It must also be in sync junit version specified in 'hosted-tenant-base'. --> - <hosted-tenant-base-junit-version>${junit.vespa.version}</hosted-tenant-base-junit-version> + <hosted-tenant-base-junit-version>${junit.vespa.tenant.version}</hosted-tenant-base-junit-version> </properties> @@ -69,7 +69,7 @@ <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-commons</artifactId> - <version>${junit.platform.vespa.version}</version> + <version>${junit.platform.vespa.tenant.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index bae58ce67d4..1c6a2957317 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -175,10 +175,11 @@ org.hdrhistogram:HdrHistogram:2.1.12 org.iq80.snappy:snappy:0.4 org.json:json:20230618 org.junit.jupiter:junit-jupiter-api:5.10.0 -org.junit.jupiter:junit-jupiter-engine:5.10.0 -org.junit.platform:junit-platform-commons:1.10.0 -org.junit.platform:junit-platform-engine:1.10.0 -org.junit.platform:junit-platform-launcher:1.10.0 +org.junit.jupiter:junit-jupiter-api:5.8.1 +org.junit.jupiter:junit-jupiter-engine:5.8.1 +org.junit.platform:junit-platform-commons:1.8.1 +org.junit.platform:junit-platform-engine:1.8.1 +org.junit.platform:junit-platform-launcher:1.8.1 org.kohsuke:libpam4j:1.11 org.lz4:lz4-java:1.8.0 org.opentest4j:opentest4j:1.3.0 @@ -206,8 +207,12 @@ net.bytebuddy:byte-buddy-agent:1.14.7 org.apache.curator:curator-test:5.5.0 org.assertj:assertj-core:3.24.2 org.junit.jupiter:junit-jupiter:5.10.0 +org.junit.jupiter:junit-jupiter-engine:5.10.0 org.junit.jupiter:junit-jupiter-params:5.10.0 +org.junit.platform:junit-platform-commons:1.10.0 +org.junit.platform:junit-platform-engine:1.10.0 org.junit.vintage:junit-vintage-engine:5.10.0 +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 diff --git a/vespa-maven-plugin/pom.xml b/vespa-maven-plugin/pom.xml index d4f2e8649af..02bf660f6fc 100644 --- a/vespa-maven-plugin/pom.xml +++ b/vespa-maven-plugin/pom.xml @@ -93,6 +93,7 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.vespa.tenant.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 17d9beb294e..6bc974408a0 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -33,6 +33,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.vespa.tenant.version}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -43,6 +49,7 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.vespa.tenant.version}</version> <exclusions> <exclusion> <groupId>org.junit.jupiter</groupId> @@ -65,6 +72,7 @@ <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> + <version>${junit.platform.vespa.tenant.version}</version> <exclusions> <exclusion> <groupId>org.junit.jupiter</groupId> |