Build using non-staging Eclipse 4.5 target Since staging will become Eclipse 4.6 (Neon) we should switch to building using the stable 4.5 target. Change-Id: I8bcfde64f769510150dc3517b9931521522efdbc Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/50984 Reviewed-by: Hudson CI Reviewed-on: https://git.eclipse.org/r/51065
diff --git a/org.eclipse.tracecompass.target/pom.xml b/org.eclipse.tracecompass.target/pom.xml index 3e8f9ae..07c0314 100644 --- a/org.eclipse.tracecompass.target/pom.xml +++ b/org.eclipse.tracecompass.target/pom.xml
@@ -31,6 +31,11 @@ <configuration> <artifacts> <artifact> + <file>tracecompass-e4.5.target</file> + <type>target</type> + <classifier>tracecompass-e4.5</classifier> + </artifact> + <artifact> <file>tracecompass-eStaging.target</file> <type>target</type> <classifier>tracecompass-eStaging</classifier>
diff --git a/org.eclipse.tracecompass.target/tracecompass-e4.5.target b/org.eclipse.tracecompass.target/tracecompass-e4.5.target new file mode 100644 index 0000000..6caf006 --- /dev/null +++ b/org.eclipse.tracecompass.target/tracecompass-e4.5.target
@@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?><target name="tracecompass-e4.5" sequenceNumber="50"> +<locations> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/tools/cdt/releases/8.7/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/mylyn/releases/3.16"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> +<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/technology/swtbot/releases/2.3.0"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.remote.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.0.0/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> +<unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/> +<unit id="org.swtchart" version="0.0.0"/> +<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="org.json" version="0.0.0"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.apache.derby.core.feature.feature.group" version="0.0.0"/> +<repository location="http://build.eclipse.org/eclipse/buildtools"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.license.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/cbi/updates/license"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.platform.ide" version="0.0.0"/> +<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/> +<unit id="org.eclipse.pde.runtime" version="0.0.0"/> +<repository location="http://download.eclipse.org/eclipse/updates/4.5/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.test.feature.group" version="0.0.0"/> +<unit id="org.eclipse.jdt.annotation" version="1.1.0.v20140129-1625"/> +<repository location="http://download.eclipse.org/eclipse/updates/4.4/"/> +</location> +</locations> +<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> +<launcherArgs> +<vmArgs>-Xms40m +-Xmx512M +-XX:MaxPermSize=256m</vmArgs> +<programArgs>-consolelog</programArgs> +</launcherArgs> +</target>
diff --git a/pom.xml b/pom.xml index 7921de9..668cbff 100644 --- a/pom.xml +++ b/pom.xml
@@ -42,7 +42,7 @@ <tycho-version>0.23.0</tycho-version> <tycho-extras-version>0.23.0</tycho-extras-version> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl> - <target-platform>tracecompass-eStaging</target-platform> + <target-platform>tracecompass-e4.5</target-platform> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>