Merge remote-tracking branch 'origin/ptp_8_0'
diff --git a/org.eclipse.ptp-product/pom.xml b/org.eclipse.ptp-product/pom.xml
index 53a56ca..3f7f6a1 100644
--- a/org.eclipse.ptp-product/pom.xml
+++ b/org.eclipse.ptp-product/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.ptp.master</groupId>
<artifactId>org.eclipse.ptp.master</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp-product</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<profiles>
diff --git a/org.eclipse.ptp-product/ptp.product b/org.eclipse.ptp-product/ptp.product
index d68656d..b72fea8 100644
--- a/org.eclipse.ptp-product/ptp.product
+++ b/org.eclipse.ptp-product/ptp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse for Parallel Application Developers" uid="ptp" id="org.eclipse.ptp.product" application="org.eclipse.ui.ide.workbench" version="8.0.1" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for Parallel Application Developers" uid="ptp" id="org.eclipse.ptp.product" application="org.eclipse.ui.ide.workbench" version="8.1.0" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.ptp/ptp_logo_icon32.png"/>
@@ -15,33 +15,27 @@
<launcherArgs>
<programArgs>-product org.eclipse.ptp.product
---launcher.defaultAction openFile
- </programArgs>
+--launcher.defaultAction openFile</programArgs>
<programArgsWin>--launcher.XXMaxPermSize
-256M
- </programArgsWin>
+256M</programArgsWin>
<vmArgs>-Dosgi.requiredJavaVersion=1.6
--Dhelp.lucene.tokenizer=standard
- </vmArgs>
+-Dhelp.lucene.tokenizer=standard</vmArgs>
<vmArgsLin>-Xms512m
-Xmx2048m
--XX:MaxPermSize=256m
- </vmArgsLin>
+-XX:MaxPermSize=256m</vmArgsLin>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-Xms512m
-Xmx2048m
--XX:MaxPermSize=256m
- </vmArgsMac>
+-XX:MaxPermSize=256m</vmArgsMac>
<vmArgsWin>-Xms512m
--Xmx1024m
- </vmArgsWin>
+-Xmx1024m</vmArgsWin>
</launcherArgs>
<windowImages i16="/org.eclipse.ptp/ptp_logo_icon16.png" i32="/org.eclipse.ptp/ptp_logo_icon32.png" i48="/org.eclipse.ptp/ptp_logo_icon48.png"/>
<splash
location="org.eclipse.ptp"
- startupProgressRect="0,280,448,15"
+ startupProgressRect="0,280,455,15"
startupMessageRect="7,220,441,20"
startupForegroundColor="C8D5EA" />
<launcher name="eclipse">
@@ -65,7 +59,7 @@
</plugins>
<features>
- <feature id="org.eclipse.ptp.product" version="8.0.1.qualifier"/>
+ <feature id="org.eclipse.ptp.product" version="8.1.0.qualifier"/>
</features>
<configurations>
diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index ace52ae..2baa4a7 100644
--- a/org.eclipse.ptp.product-feature/feature.xml
+++ b/org.eclipse.ptp.product-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ptp.product"
label="%featureName"
- version="8.0.1.qualifier"
+ version="8.1.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.ptp">
diff --git a/org.eclipse.ptp.product-feature/pom.xml b/org.eclipse.ptp.product-feature/pom.xml
index ac4f96d..bdc2123 100644
--- a/org.eclipse.ptp.product-feature/pom.xml
+++ b/org.eclipse.ptp.product-feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.ptp.master</groupId>
<artifactId>org.eclipse.ptp.master</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.product</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<groupId>org.eclipse.ptp.features</groupId>
</project>
diff --git a/org.eclipse.ptp.rcp.sysmon-feature/feature.xml b/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
index dd494cc..6b981a3 100644
--- a/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
+++ b/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ptp.rcp.sysmon"
label="%featureName"
- version="8.0.1.qualifier"
+ version="8.1.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.ptp.rcp.sysmon">
diff --git a/org.eclipse.ptp.rcp.sysmon-feature/pom.xml b/org.eclipse.ptp.rcp.sysmon-feature/pom.xml
index 17567c8..bb5ccbe 100644
--- a/org.eclipse.ptp.rcp.sysmon-feature/pom.xml
+++ b/org.eclipse.ptp.rcp.sysmon-feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.ptp.master</groupId>
<artifactId>org.eclipse.ptp.master</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.rcp.sysmon</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<groupId>org.eclipse.ptp.features</groupId>
</project>
diff --git a/org.eclipse.ptp.rcp.sysmon-product/pom.xml b/org.eclipse.ptp.rcp.sysmon-product/pom.xml
index 12b2e91..5d8b8c7 100644
--- a/org.eclipse.ptp.rcp.sysmon-product/pom.xml
+++ b/org.eclipse.ptp.rcp.sysmon-product/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.ptp.master</groupId>
<artifactId>org.eclipse.ptp.master</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.rcp.sysmon-product</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<profiles>
diff --git a/org.eclipse.ptp.rcp.sysmon-product/sysmon.product b/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
index 8c01e62..3df3d9b 100644
--- a/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
+++ b/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="System Monitor" uid="sysmon" id="org.eclipse.ptp.rcp.sysmon.product" application="org.eclipse.ptp.rcp.sysmon.application" version="8.0.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="System Monitor" uid="sysmon" id="org.eclipse.ptp.rcp.sysmon.product" application="org.eclipse.ptp.rcp.sysmon.application" version="8.1.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/org.eclipse.ptp.rcp.sysmon/pom.xml b/org.eclipse.ptp.rcp.sysmon/pom.xml
index 1db5c4b..dcf8196 100644
--- a/org.eclipse.ptp.rcp.sysmon/pom.xml
+++ b/org.eclipse.ptp.rcp.sysmon/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.ptp.master</groupId>
<artifactId>org.eclipse.ptp.master</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index b74e600..0eaa679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,13 @@
</prerequisites>
<groupId>org.eclipse.ptp.master</groupId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<artifactId>org.eclipse.ptp.master</artifactId>
<packaging>pom</packaging>
<name>PTP Products</name>
<properties>
- <ptp-version>8.0.1</ptp-version>
+ <ptp-version>8.1.0</ptp-version>
<tycho-version>0.18.1</tycho-version>
<eclipse-release>luna</eclipse-release>
<!-->eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site-->
