deal with p2.mirrorsURL for artifacts.xml.xz

Change-Id: I13b5728751696fb103d9c8a8a911c358dfab9c81
eclipse-emf-parsley · Nov 21, 2016 · 0f3c9b0 · 0f3c9b0
1 parent fb19510
commit 0f3c9b0
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 9 deletions.
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -60,7 +60,7 @@
 		<tycho-version>0.25.0</tycho-version>
 		<tycho-extras-version>0.25.0</tycho-extras-version>
 		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
-		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
 		<junit-version>4.11</junit-version>
 		<jacoco-version>0.7.4.201502262128</jacoco-version>
 		<findbugs-version>3.0.1</findbugs-version>

diff --git a/releng/org.eclipse.emf.parsley.repository/pom.xml b/releng/org.eclipse.emf.parsley.repository/pom.xml
@@ -14,7 +14,7 @@
 	<packaging>eclipse-repository</packaging>
 
 	<properties>
-		<p2.mirrorsPrefix>/emf-parsley/updates</p2.mirrorsPrefix>
+		<p2.mirrorsPrefix>/emf-parsley/${parsley.updates.dir}</p2.mirrorsPrefix>
 		<p2.versionMajorMinor>1.1</p2.versionMajorMinor>
 		<p2.statsURL>http://download.eclipse.org/stats</p2.statsURL>
 		<p2.mirrorsURL>http://www.eclipse.org/downloads/download.php?format=xml&amp;file=${p2.mirrorsPrefix}/${p2.versionMajorMinor}/${qualifiedVersion}/</p2.mirrorsURL>
@@ -104,14 +104,31 @@
 						<version>${tycho-version}</version>
 						<executions>
 							<execution>
+								<!--
+									(1)
+									See <http://wiki.eclipse.org/Equinox/p2/p2.mirrorsURL>.
+									This will add the mirror and statistics properties to your
+									artifacts.jar, but NOT to artifacts.xml.xz,
+									since p2 can only read artifacts.xml.zx but now write into it
+									(https://bugs.eclipse.org/bugs/show_bug.cgi?id=467779).
+									artifacts.xml.xz will be handled later (from (2) on). -->
 								<id>add-repo-properties</id>
 								<goals>
 									<goal>eclipse-run</goal>
 								</goals>
 								<phase>package</phase>
 								<configuration>
-									<appArgLine>-application org.eclipse.wtp.releng.tools.addRepoProperties</appArgLine>
-									<argLine><![CDATA[-DartifactRepoDirectory=${project.build.directory}/repository -Dp2MirrorsURL=${p2.mirrorsURL} -Dp2StatsURI=${p2.statsURL} -DstatsTrackedArtifacts=${p2.statsTrackedArtifacts} -DstatsArtifactsSuffix=-${project.version}]]></argLine>
+									<applicationsArgs>
+										<arg>-application</arg>
+										<arg>org.eclipse.wtp.releng.tools.addRepoProperties</arg>
+									</applicationsArgs>
+									<jvmArgs>
+										<arg>-DartifactRepoDirectory=${project.build.directory}/repository</arg>
+										<arg>-Dp2MirrorsURL=${p2.mirrorsURL}</arg>
+										<arg>-Dp2StatsURI=${p2.statsURL}</arg>
+										<arg>-DstatsTrackedArtifacts=${p2.statsTrackedArtifacts}</arg>
+										<arg>-DstatsArtifactsSuffix=-${project.version}</arg>
+									</jvmArgs>
 									<work>${project.build.directory}/eclipserun-work-first</work>
 									<dependencies>
 										<dependency>
@@ -125,7 +142,7 @@
 											<layout>p2</layout>
 										</repository>
 										<repository>
-											<url>http://download.eclipse.org/releases/mars</url>
+											<url>http://download.eclipse.org/releases/neon</url>
 											<layout>p2</layout>
 										</repository>
 									</repositories>
@@ -136,14 +153,27 @@
 								<goals>
 									<goal>eclipse-run</goal>
 								</goals>
-								<phase>package</phase>
+								<!-- this must be executed after package, since during package we also
+									deal with XZ compressed artifacts -->
+								<phase>verify</phase>
 								<configuration>
-									<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.parent/ant/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.updates.dir} -Dsite.label="Emf Parsley Site" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
+									<applicationsArgs>
+										<arg>-application</arg>
+										<arg>org.eclipse.ant.core.antRunner</arg>
+										<arg>-buildfile</arg>
+										<arg>${project.basedir}/../org.eclipse.emf.parsley.parent/ant/packaging-p2composite.ant</arg>
+										<arg>p2.composite.add</arg>
+										<arg>-Dsoftware.download.area=${parsley.download.area}</arg>
+										<arg>-Dupdates.dir=${parsley.updates.dir}</arg>
+										<arg>-Dsite.label="Emf Parsley Site"</arg>
+										<arg>-Dproject.build.directory=${project.build.directory}</arg>
+										<arg>-DunqualifiedVersion=${unqualifiedVersion}</arg>
+										<arg>-DbuildQualifier=${buildQualifier}</arg>
+									</applicationsArgs>
 									<repositories>
 										<repository>
-											<id>mars</id>
+											<url>http://download.eclipse.org/releases/neon</url>
 											<layout>p2</layout>
-											<url>http://download.eclipse.org/releases/mars</url>
 										</repository>
 									</repositories>
 									<dependencies>
@@ -181,6 +211,14 @@
 						<!-- copy the zipped p2 repository into download zips area  -->
 						<artifactId>maven-antrun-plugin</artifactId>
 						<version>${maven-antrun-plugin.version}</version>
+						<dependencies>
+							<!-- Needed for XZ compression -->
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-compress</artifactId>
+								<version>1.4</version>
+							</dependency>
+						</dependencies>
 						<executions>
 							<execution>
 								<id>copy-to-zips-download</id>
@@ -203,6 +241,53 @@
 									<goal>run</goal>
 								</goals>
 							</execution>
+							<execution>
+								<!-- (2)
+									Unpack artifacts.jar (which has already been processed) -->
+								<id>unjar-artifacts</id>
+								<phase>package</phase>
+								<configuration>
+									<target>
+										<unzip src="${project.build.directory}/repository/artifacts.jar"
+											dest="${project.build.directory}/repository/" />
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+							<execution>
+								<!-- (3)
+									pack artifacts.xml into artifacts.xml.xz (rewrite) -->
+								<id>xz-artifacts</id>
+								<phase>package</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target name="xz-artifacts-xml">
+										<taskdef resource="org/apache/ant/compress/antlib.xml"
+											classpathref="maven.plugin.classpath" />
+										<xz
+											srcfile="${project.build.directory}/repository/artifacts.xml"
+											destfile="${project.build.directory}/repository/artifacts.xml.xz" />
+									</target>
+								</configuration>
+							</execution>
+							<execution>
+								<!-- (4)
+									Remove artifacts.xml (we don't need that anymore) -->
+								<id>remove-artifacts-xml</id>
+								<phase>package</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<delete file="${project.build.directory}/repository/artifacts.xml"/>
+									</target>
+								</configuration>
+							</execution>
 						</executions>
 					</plugin>
 				</plugins>