From 7547c497aa29bfc620d665011cf8b669169451fc Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Wed, 10 Jan 2018 15:37:09 +0100
Subject: [PATCH] add required software update sites to our composite site

---
 .../edelta.product.repository/pom.xml         | 71 +++++++++++++++---
 edelta.parent/edelta.repository/pom.xml       | 74 +++++++++++++++----
 2 files changed, 119 insertions(+), 26 deletions(-)

diff --git a/edelta.parent/edelta.product.repository/pom.xml b/edelta.parent/edelta.product.repository/pom.xml
index ea9dd9fa4..09d577e41 100644
--- a/edelta.parent/edelta.product.repository/pom.xml
+++ b/edelta.parent/edelta.product.repository/pom.xml
@@ -149,18 +149,6 @@
             <artifactId>tycho-eclipserun-plugin</artifactId>
             <version>${tycho-version}</version>
             <configuration>
-              <applicationsArgs>
-                <args>-application</args>
-                <args>org.eclipse.ant.core.antRunner</args>
-                <args>-buildfile</args>
-                <args>${ant-files-path}/packaging-p2composite.ant</args>
-                <args>p2.composite.add</args>
-                <args>-Dsite.label="${site.label}"</args>
-                <args>-Dcomposite.base.dir=${project.build.directory}</args>
-                <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
-                <args>-DbuildQualifier=${buildQualifier}</args>
-                <args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
-              </applicationsArgs>
               <repositories>
                 <repository>
                   <id>mars</id>
@@ -196,12 +184,71 @@
               </dependencies>
             </configuration>
             <executions>
+              <!-- First add composite of required software update sites... 
+                (if already present they won't be added again) -->
+              <execution>
+                <id>add-xtext-repository</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>eclipse-run</goal>
+                </goals>
+                <configuration>
+                  <applicationsArgs>
+                    <args>-application</args>
+                    <args>org.eclipse.ant.core.antRunner</args>
+                    <args>-buildfile</args>
+                    <args>${ant-files-path}/packaging-p2composite.ant</args>
+                    <args>p2.composite.add.external</args>
+                    <args>-Dsite.label="${site.label}"</args>
+                    <args>-Dcomposite.base.dir=${project.build.directory}</args>
+                    <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
+                    <args>-DbuildQualifier=${buildQualifier}</args>
+                    <args>-Dchild.repo="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtextVersion}/"</args>
+                  </applicationsArgs>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-eclipse-repository</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>eclipse-run</goal>
+                </goals>
+                <configuration>
+                  <applicationsArgs>
+                    <args>-application</args>
+                    <args>org.eclipse.ant.core.antRunner</args>
+                    <args>-buildfile</args>
+                    <args>${ant-files-path}/packaging-p2composite.ant</args>
+                    <args>p2.composite.add.external</args>
+                    <args>-Dsite.label="${site.label}"</args>
+                    <args>-Dcomposite.base.dir=${project.build.directory}</args>
+                    <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
+                    <args>-DbuildQualifier=${buildQualifier}</args>
+                    <args>-Dchild.repo="http://download.eclipse.org/releases/${eclipseVersion}/"</args>
+                  </applicationsArgs>
+                </configuration>
+              </execution>
+              <!-- ... then add our new child repository -->
               <execution>
                 <id>add-p2-composite-repository</id>
                 <phase>package</phase>
                 <goals>
                   <goal>eclipse-run</goal>
                 </goals>
+                <configuration>
+                  <applicationsArgs>
+                    <args>-application</args>
+                    <args>org.eclipse.ant.core.antRunner</args>
+                    <args>-buildfile</args>
+                    <args>${ant-files-path}/packaging-p2composite.ant</args>
+                    <args>p2.composite.add</args>
+                    <args>-Dsite.label="${site.label}"</args>
+                    <args>-Dcomposite.base.dir=${project.build.directory}</args>
+                    <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
+                    <args>-DbuildQualifier=${buildQualifier}</args>
+                    <args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
+                  </applicationsArgs>
+                </configuration>
               </execution>
             </executions>
           </plugin>
diff --git a/edelta.parent/edelta.repository/pom.xml b/edelta.parent/edelta.repository/pom.xml
index f1b00b5a4..d5d903583 100644
--- a/edelta.parent/edelta.repository/pom.xml
+++ b/edelta.parent/edelta.repository/pom.xml
@@ -84,10 +84,9 @@
                   <goal>run</goal>
                 </goals>
               </execution>
-
               <execution>
                 <!-- Deploy p2 repository, p2 composite updated metadata 
-                  and zipped p2 repository -->
+                  but no zipped p2 repository -->
                 <id>deploy-repository</id>
                 <phase>verify</phase>
                 <configuration>
@@ -109,18 +108,6 @@
             <artifactId>tycho-eclipserun-plugin</artifactId>
             <version>${tycho-version}</version>
             <configuration>
-              <applicationsArgs>
-                <args>-application</args>
-                <args>org.eclipse.ant.core.antRunner</args>
-                <args>-buildfile</args>
-                <args>${ant-files-path}/packaging-p2composite.ant</args>
-                <args>p2.composite.add</args>
-                <args>-Dsite.label="${site.label}"</args>
-                <args>-Dcomposite.base.dir=${project.build.directory}</args>
-                <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
-                <args>-DbuildQualifier=${buildQualifier}</args>
-                <args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
-              </applicationsArgs>
               <repositories>
                 <repository>
                   <id>mars</id>
@@ -156,12 +143,71 @@
               </dependencies>
             </configuration>
             <executions>
+              <!-- First add composite of required software update sites... 
+                (if already present they won't be added again) -->
+              <execution>
+                <id>add-xtext-repository</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>eclipse-run</goal>
+                </goals>
+                <configuration>
+                  <applicationsArgs>
+                    <args>-application</args>
+                    <args>org.eclipse.ant.core.antRunner</args>
+                    <args>-buildfile</args>
+                    <args>${ant-files-path}/packaging-p2composite.ant</args>
+                    <args>p2.composite.add.external</args>
+                    <args>-Dsite.label="${site.label}"</args>
+                    <args>-Dcomposite.base.dir=${project.build.directory}</args>
+                    <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
+                    <args>-DbuildQualifier=${buildQualifier}</args>
+                    <args>-Dchild.repo="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtextVersion}/"</args>
+                  </applicationsArgs>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-eclipse-repository</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>eclipse-run</goal>
+                </goals>
+                <configuration>
+                  <applicationsArgs>
+                    <args>-application</args>
+                    <args>org.eclipse.ant.core.antRunner</args>
+                    <args>-buildfile</args>
+                    <args>${ant-files-path}/packaging-p2composite.ant</args>
+                    <args>p2.composite.add.external</args>
+                    <args>-Dsite.label="${site.label}"</args>
+                    <args>-Dcomposite.base.dir=${project.build.directory}</args>
+                    <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
+                    <args>-DbuildQualifier=${buildQualifier}</args>
+                    <args>-Dchild.repo="http://download.eclipse.org/releases/${eclipseVersion}/"</args>
+                  </applicationsArgs>
+                </configuration>
+              </execution>
+              <!-- ... then add our new child repository -->
               <execution>
                 <id>add-p2-composite-repository</id>
                 <phase>package</phase>
                 <goals>
                   <goal>eclipse-run</goal>
                 </goals>
+                <configuration>
+                  <applicationsArgs>
+                    <args>-application</args>
+                    <args>org.eclipse.ant.core.antRunner</args>
+                    <args>-buildfile</args>
+                    <args>${ant-files-path}/packaging-p2composite.ant</args>
+                    <args>p2.composite.add</args>
+                    <args>-Dsite.label="${site.label}"</args>
+                    <args>-Dcomposite.base.dir=${project.build.directory}</args>
+                    <args>-DunqualifiedVersion=${unqualifiedVersion}</args>
+                    <args>-DbuildQualifier=${buildQualifier}</args>
+                    <args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
+                  </applicationsArgs>
+                </configuration>
               </execution>
             </executions>
           </plugin>