diff options
| author | jonmv <venstad@gmail.com> | 2022-05-05 13:20:05 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-05-05 13:20:05 +0200 |
| commit | 31a28ed7c99eab34535d57c0544e4b0dd44f41dd (patch) | |
| tree | 1315cb478279f846d709b82a0a89e560de655308 /tenant-base | |
| parent | 1b6aa30113bd77a24c5587426d86adf54112e90b (diff) | |
Revert "Work around strange Maven plugin resolution"
This reverts commit 31856c1e4e1897f725bea9f6eadb3d846787ec0f.
Diffstat (limited to 'tenant-base')
| -rw-r--r-- | tenant-base/pom.xml | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 6a6ea3b77a3..8d54fe53f46 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -304,23 +304,6 @@ <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> </properties> </profile> - <profile> - <id>default-build</id> <!-- Delays resolution of bundle plugin to where Maven has the repos from child projects? --> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${vespaversion}</version> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </profile> - </profiles> <build> @@ -440,6 +423,13 @@ </plugin> <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <version>${vespaversion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> |