From ce9bc167a87f226c89abee686365618600b17d1c Mon Sep 17 00:00:00 2001 From: Alexander Diewald <diewald@fortiss.org> Date: Fri, 1 Feb 2019 10:54:00 +0100 Subject: [PATCH] Require the tooling p2 only if the tooling profile is not built This enables joint tooling + af3 builds as they occur on local builds. Issue-Ref: 3620 Issue-Url: https://af3-developer.fortiss.org/issues/3620 Signed-off-by: Alexander Diewald <diewald@fortiss.org> --- releng/org.fortiss.af3.configuration/pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/releng/org.fortiss.af3.configuration/pom.xml b/releng/org.fortiss.af3.configuration/pom.xml index c1fc992..a2b4080 100644 --- a/releng/org.fortiss.af3.configuration/pom.xml +++ b/releng/org.fortiss.af3.configuration/pom.xml @@ -55,7 +55,12 @@ </profile> <!-- Install the kernel p2 site for all af3 profiles --> <profile> - <id>af3</id> + <id>tooling-p2-local</id> + <activation> + <file> + <exists>file:///${user.dir}/releng/org.fortiss.tooling.update/target/repository/</exists> + </file> + </activation> <repositories> <repository> <!-- Place more centrally and combine with af3 profile --> -- GitLab