Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-01-25 12:13:54 +0000
committerAlexander Kurtakov2018-01-30 12:43:27 +0000
commit1cc475023445ffa6ec2a5dcc6708543a5384b8ec (patch)
treec2894a31b4d2e8f2a1d70581260993b39a65b429
parentf3abf050d88876f89beb47d240b126cae27acf33 (diff)
downloadorg.eclipse.linuxtools-1cc475023445ffa6ec2a5dcc6708543a5384b8ec.tar.gz
org.eclipse.linuxtools-1cc475023445ffa6ec2a5dcc6708543a5384b8ec.tar.xz
org.eclipse.linuxtools-1cc475023445ffa6ec2a5dcc6708543a5384b8ec.zip
Start building against Photon.
Tycho 1.1.0-SNAPSHOT is needed. Adjust perf tests for the "New configuration" menu. Change-Id: I7178c1cf205264f693bb8c8eccfee1cebc4dce46 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/116030 Tested-by: Hudson CI
-rw-r--r--perf/org.eclipse.linuxtools.perf.swtbot.tests/src/org/eclipse/linuxtools/internal/perf/swtbot/tests/AbstractSWTBotTest.java2
-rw-r--r--pom.xml17
-rw-r--r--releng/org.eclipse.linuxtools.target/linuxtools-e4.8.target116
-rw-r--r--releng/org.eclipse.linuxtools.target/pom.xml4
4 files changed, 133 insertions, 6 deletions
diff --git a/perf/org.eclipse.linuxtools.perf.swtbot.tests/src/org/eclipse/linuxtools/internal/perf/swtbot/tests/AbstractSWTBotTest.java b/perf/org.eclipse.linuxtools.perf.swtbot.tests/src/org/eclipse/linuxtools/internal/perf/swtbot/tests/AbstractSWTBotTest.java
index 5637ca0e14..4686b743a7 100644
--- a/perf/org.eclipse.linuxtools.perf.swtbot.tests/src/org/eclipse/linuxtools/internal/perf/swtbot/tests/AbstractSWTBotTest.java
+++ b/perf/org.eclipse.linuxtools.perf.swtbot.tests/src/org/eclipse/linuxtools/internal/perf/swtbot/tests/AbstractSWTBotTest.java
@@ -128,7 +128,7 @@ public abstract class AbstractSWTBotTest extends AbstractTest {
// Create new Perf configuration
SWTBotTree profilingConfigs = bot.tree();
SWTBotTree perfNode = profilingConfigs.select("Profile with Perf");
- perfNode.contextMenu("New").click();
+ perfNode.contextMenu("New configuration").click();
// Activate options tab
bot.cTabItem("Perf Options").activate();
diff --git a/pom.xml b/pom.xml
index e4edb31c7a..78a0c06011 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,9 +52,9 @@
<mirror-repo-name>updates-nightly</mirror-repo-name>
<mirror-docker-repo-name>updates-docker-nightly</mirror-docker-repo-name>
<mirror-mylyn-repo-name>updates-mylyn-nightly</mirror-mylyn-repo-name>
- <tycho-version>1.0.0</tycho-version>
- <tycho-extras-version>1.0.0</tycho-extras-version>
- <target-platform>linuxtools-e4.7</target-platform>
+ <tycho-version>1.1.0-SNAPSHOT</tycho-version>
+ <tycho-extras-version>1.1.0-SNAPSHOT</tycho-extras-version>
+ <target-platform>linuxtools-e4.8</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>
@@ -70,6 +70,17 @@
<id>Maven Central Proxy</id>
<url>https://repo.eclipse.org/content/repositories/maven_central/</url>
</pluginRepository>
+ <pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+
</pluginRepositories>
<profiles>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.8.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.8.target
new file mode 100644
index 0000000000..ca6763b797
--- /dev/null
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.8.target
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="linuxtools-e4.8" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.6.2.v20161117-2150"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.6.2.v20161117-2150"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.6.2.v20161117-2150"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.6.2.v20161117-2150"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.6.2.v20161117-2150"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.6.2.v20161117-2150"/>
+<unit id="com.github.jnr.constants" version="0.9.1.v20161107-2054"/>
+<unit id="com.github.jnr.enxio" version="0.12.0.v20161107-2054"/>
+<unit id="com.github.jnr.ffi" version="2.0.9.v20161107-2054"/>
+<unit id="com.github.jnr.jffi" version="1.2.11.v20170413-2020"/>
+<unit id="com.github.jnr.jffi.native" version="1.2.11.v20170413-2020"/>
+<unit id="com.github.jnr.posix" version="3.0.29.v20161107-2054"/>
+<unit id="com.github.jnr.unixsocket" version="0.12.0.v20161107-2054"/>
+<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="javassist" version="3.13.0.GA_v201209210905"/>
+<unit id="javax.ws.rs" version="2.0.1.v201504171603"/>
+<unit id="jnr.x86asm" version="1.0.2.v201505052040"/>
+<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
+<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
+<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="org.assertj" version="1.7.1.v20170413-2026"/>
+<unit id="org.assertj" version="1.7.1.v20170413-2026"/>
+<unit id="org.bouncycastle.bcpkix" version="1.52.0.v20161004-1854"/>
+<unit id="org.bouncycastle.bcprov" version="1.52.0.v20161004-1854"/>
+<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
+<unit id="org.glassfish.hk2.api" version="2.5.0.v20161103-0227"/>
+<unit id="org.glassfish.hk2.locator" version="2.5.0.v20161103-0227"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
+<unit id="org.glassfish.hk2.utils" version="2.5.0.v20160210-1508"/>
+<unit id="org.glassfish.jersey.apache.connector" version="2.22.1.v20161103-1916"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.22.1.v20161103-1916"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.22.1.v20161103-1916"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.22.1.v20161103-1916"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20161103-1916"/>
+<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20161103-0227"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.22.1.v20161117-2005"/>
+<unit id="org.mockito" version="1.9.5.v201605172210"/>
+<unit id="org.mockito" version="1.9.5.v201605172210"/>
+<unit id="org.objectweb.asm" version="5.2.0.v20170126-0011"/>
+<unit id="org.objectweb.asm.analysis" version="5.2.0.v20170126-0011"/>
+<unit id="org.objectweb.asm.tree" version="5.2.0.v20170126-0011"/>
+<unit id="org.objectweb.asm.util" version="5.2.0.v20170126-0011"/>
+<unit id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
+<unit id="org.swtchart" version="0.10.0.v201605200358"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.spotify.docker.client" version="6.1.1.v20171124-1825"/>
+<unit id="com.spotify.docker.client.source" version="6.1.1.v20171124-1825"/>
+<repository location="http://download.eclipse.org/linuxtools/docker-client-6.1.1a"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.4"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.core" version="0.0.0"/>
+<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
+<unit id="org.eclipse.jdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.8-I-builds/"/>
+</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/latest"/>
+</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.dstore.core" version="0.0.0"/>
+<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.commons.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.tasks.ide.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/photon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/reddeer/snapshots/"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
diff --git a/releng/org.eclipse.linuxtools.target/pom.xml b/releng/org.eclipse.linuxtools.target/pom.xml
index 8bf632e813..dafcae8d69 100644
--- a/releng/org.eclipse.linuxtools.target/pom.xml
+++ b/releng/org.eclipse.linuxtools.target/pom.xml
@@ -31,9 +31,9 @@
<configuration>
<artifacts>
<artifact>
- <file>linuxtools-e4.7.target</file>
+ <file>linuxtools-e4.8.target</file>
<type>target</type>
- <classifier>linuxtools-e4.7</classifier>
+ <classifier>linuxtools-e4.8</classifier>
</artifact>
<!-- More targets could be added here -->
</artifacts>

Back to the top