diff options
Diffstat (limited to 'hosted-tenant-base/pom.xml')
| -rw-r--r-- | hosted-tenant-base/pom.xml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index f2d4c6ab012..8f6063bf44e 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -35,12 +35,12 @@ <vespaversion>${project.version}</vespaversion> <bundle-plugin.failOnWarnings>false</bundle-plugin.failOnWarnings> <target_jdk_version>17</target_jdk_version> - <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> - <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> - <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version> - <jackson2.version>2.15.2</jackson2.version> + <maven-compiler-plugin.vespa.version>3.10.1</maven-compiler-plugin.vespa.version> + <maven-surefire-plugin.vespa.version>2.22.2</maven-surefire-plugin.vespa.version> + <maven-dependency-plugin.vespa.version>3.6.0</maven-dependency-plugin.vespa.version> + <jackson2.vespa.version>2.15.2</jackson2.vespa.version> <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' --> - <vespa.junit.version>5.8.1</vespa.junit.version> + <vespa.junit.vespa.version>5.8.1</vespa.junit.vespa.version> <test.categories>!integration</test.categories> <!-- To allow specialized base pom to include additional "test provided" dependencies --> @@ -98,19 +98,19 @@ <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>${vespa.junit.version}</version> + <version>${vespa.junit.vespa.version}</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> - <version>${vespa.junit.version}</version> + <version>${vespa.junit.vespa.version}</version> </dependency> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> - <version>${vespa.junit.version}</version> + <version>${vespa.junit.vespa.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -163,7 +163,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> + <version>${maven-surefire-plugin.vespa.version}</version> <configuration> <groups>${test.categories}</groups> <redirectTestOutputToFile>false</redirectTestOutputToFile> @@ -186,7 +186,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> + <version>${maven-surefire-plugin.vespa.version}</version> <configuration> <reportsDirectory>${env.TEST_DIR}</reportsDirectory> </configuration> @@ -245,8 +245,8 @@ <exclude>org.junit.jupiter:junit-jupiter-api:*:jar:compile</exclude> <exclude>org.junit.jupiter:junit-jupiter-api:*:jar:provided</exclude> <exclude>org.junit.jupiter:junit-jupiter-api:*:jar:runtime</exclude> - <exclude>org.junit.jupiter:junit-jupiter-api:(,${vespa.junit.version}):jar:*</exclude> - <exclude>org.junit.jupiter:junit-jupiter-api:(${vespa.junit.version},):jar:*</exclude> + <exclude>org.junit.jupiter:junit-jupiter-api:(,${vespa.junit.vespa.version}):jar:*</exclude> + <exclude>org.junit.jupiter:junit-jupiter-api:(${vespa.junit.vespa.version},):jar:*</exclude> </excludes> </bannedDependencies> </rules> @@ -377,7 +377,7 @@ </property> </activation> <properties> - <vespaversion>${vespa.compile.version}</vespaversion> + <vespaversion>${vespa.compile.vespa.version}</vespaversion> </properties> </profile> @@ -389,7 +389,7 @@ </property> </activation> <properties> - <vespaVersion>${vespa.runtime.version}</vespaVersion> + <vespaVersion>${vespa.runtime.vespa.version}</vespaVersion> </properties> </profile> <profile> @@ -404,7 +404,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>${maven.gpg.plugin.version}</version> + <version>${maven.gpg.plugin.vespa.version}</version> <executions> <execution> <id>sign-artifacts</id> @@ -424,7 +424,7 @@ <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> - <version>${nexus.staging.maven.plugin.version}</version> + <version>${nexus.staging.maven.plugin.vespa.version}</version> <extensions>true</extensions> <configuration> <serverId>ossrh</serverId> @@ -452,7 +452,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> + <version>${maven-dependency-plugin.vespa.version}</version> </plugin> </plugins> </pluginManagement> @@ -460,7 +460,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> + <version>${maven-compiler-plugin.vespa.version}</version> <configuration> <release>${target_jdk_version}</release> <showWarnings>true</showWarnings> |