From 31856c1e4e1897f725bea9f6eadb3d846787ec0f Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Wed, 4 May 2022 15:45:26 +0200
Subject: Work around strange Maven plugin resolution

---
 tenant-base/pom.xml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'tenant-base')

diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml
index 8d54fe53f46..6a6ea3b77a3 100644
--- a/tenant-base/pom.xml
+++ b/tenant-base/pom.xml
@@ -304,6 +304,23 @@
                 <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>
@@ -422,13 +439,6 @@
                 </executions>
             </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>
-- 
cgit v1.2.3