Build is broken due to use of disappeared milestone URLs Move to Tycho 1.4.0 and fix build by using final release p2 repo URLs that will be retained indefinitely. Bug: 542523 Change-Id: I824c81a181a68648e01f298fcb758d4085553f2e Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/bundles/org.eclipse.epp.logging.aeri.core/pom.xml b/bundles/org.eclipse.epp.logging.aeri.core/pom.xml index 2a82815..a827792 100644 --- a/bundles/org.eclipse.epp.logging.aeri.core/pom.xml +++ b/bundles/org.eclipse.epp.logging.aeri.core/pom.xml
@@ -18,6 +18,7 @@ <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> <configuration> + <executionEnvironment>JavaSE-${javaVersion}</executionEnvironment> <!-- linebreaks not permitted in this arg line --> <appArgLine>-data "${basedir}${file.separator}..${file.separator}workspace" -application org.eclipse.emf.codegen.ecore.Generator -projects "${basedir}${file.separator}..${file.separator}" -model "${basedir}${file.separator}models${file.separator}aeri.genmodel"</appArgLine> <dependencies> @@ -28,9 +29,9 @@ </dependencies> <repositories> <repository> - <id>mars</id> + <id>2018-09</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/mars</url> + <url>http://download.eclipse.org/releases/2018-09</url> </repository> </repositories> </configuration>
diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml b/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml index 82da948..ebb4cbf 100644 --- a/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml +++ b/bundles/org.eclipse.epp.logging.aeri.ide/pom.xml
@@ -18,6 +18,7 @@ <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> <configuration> + <executionEnvironment>JavaSE-${javaVersion}</executionEnvironment> <!-- linebreaks not permitted in this arg line --> <appArgLine>-data "${basedir}${file.separator}..${file.separator}workspace" -application org.eclipse.emf.codegen.ecore.Generator -projects "${basedir}${file.separator}..${file.separator}" -model "${basedir}${file.separator}models${file.separator}aeri.ide.genmodel"</appArgLine> <dependencies> @@ -28,9 +29,9 @@ </dependencies> <repositories> <repository> - <id>mars</id> + <id>2018-09</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/mars</url> + <url>http://download.eclipse.org/releases/2018-09</url> </repository> </repositories> </configuration>
diff --git a/pom.xml b/pom.xml index 8a106f8..7dd46b8 100644 --- a/pom.xml +++ b/pom.xml
@@ -51,7 +51,7 @@ <properties> <loggingVersion>2.0.7-SNAPSHOT</loggingVersion> <javaVersion>1.8</javaVersion> - <tychoVersion>1.2.0</tychoVersion> + <tychoVersion>1.4.0</tychoVersion> <!-- The default simultaneous release used to base the target platform on (override with -Dsimrel=...) --> <simrel>2018-09</simrel>
diff --git a/releng/targets/2018-09/2018-09.target b/releng/targets/2018-09/2018-09.target index f7188fa..e8d812c 100644 --- a/releng/targets/2018-09/2018-09.target +++ b/releng/targets/2018-09/2018-09.target
@@ -5,14 +5,14 @@ <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> -<!-- Stable platform build for 2018-09 RC2 --> -<repository location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC2-201809060745/"/> +<!-- Release platform build for 2018-09 --> +<repository location="http://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/> -<!-- Milestone build for 2018-09 RC2 --> -<repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201809051333"/> +<!-- Release build for 2018-09 --> +<repository location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.15"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>