Merge remote-tracking branch 'origin/ptp_7_0'
diff --git a/org.eclipse.ptp-product/pom.xml b/org.eclipse.ptp-product/pom.xml
index 7093359..2256ed2 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>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp-product</artifactId>
- <version>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<profiles>
@@ -78,6 +78,8 @@
<rootFolders>
<macosx>Eclipse.app</macosx>
</rootFolders>
+ <!-- Required to pick up the ptp.p2.inf file -->
+ <attachId>ptp</attachId>
</product>
</products>
</configuration>
diff --git a/org.eclipse.ptp-product/ptp.product b/org.eclipse.ptp-product/ptp.product
index caf25ed..3fdcab8 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="7.0.4" 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="7.0.3" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.ptp/ptp_logo_icon32.png"/>
@@ -59,7 +59,7 @@
</plugins>
<features>
- <feature id="org.eclipse.ptp.product" version="7.0.4.qualifier"/>
+ <feature id="org.eclipse.ptp.product" version="7.0.3.qualifier"/>
</features>
<configurations>
diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index a6fe007..4d2cd71 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="7.0.4.qualifier"
+ version="7.0.3.qualifier"
provider-name="%providerName"
plugin="org.eclipse.ptp">
@@ -31,7 +31,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.ptp.remote"
+ id="org.eclipse.remote"
version="0.0.0"/>
<includes
@@ -55,6 +55,10 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.ptp.rdt.remotetools"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.ptp.rdt.sync"
version="0.0.0"/>
@@ -67,13 +71,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.linuxtools.oprofile.feature"
- version="0.0.0"
- optional="true"
- os="linux"
- search-location="both"/>
-
- <includes
id="org.eclipse.linuxtools.cdt.libhover.feature"
version="0.0.0"
optional="true"
@@ -110,26 +107,6 @@
search-location="both"/>
<includes
- id="org.eclipse.linuxtools.systemtap"
- version="0.0.0"
- optional="true"
- os="linux"
- search-location="both"/>
-
- <includes
- id="org.eclipse.linuxtools.callgraph.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
-
- <includes
- id="org.eclipse.linuxtools.valgrind"
- version="0.0.0"
- optional="true"
- os="linux"
- search-location="both"/>
-
- <includes
id="org.eclipse.photran"
version="0.0.0"/>
@@ -246,14 +223,28 @@
unpack="false"/>
<plugin
- id="org.eclipse.ptp.remote.core"
+ id="org.eclipse.remote.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ptp.remote.ui"
+ id="org.eclipse.remote.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.remote.jsch.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.remote.jsch.ui"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.ptp.product-feature/pom.xml b/org.eclipse.ptp.product-feature/pom.xml
index 1e5afd1..4481a7c 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>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.product</artifactId>
- <version>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-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 a9aac02..8e3b9d5 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="7.0.4.qualifier"
+ version="7.0.3.qualifier"
provider-name="%providerName"
plugin="org.eclipse.ptp.rcp.sysmon">
@@ -84,70 +84,28 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.ptp.remote.core"
+ id="org.eclipse.remote.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ptp.remote.remotetools.core"
+ id="org.eclipse.remote.jsch.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ptp.remote.remotetools.ui"
+ id="org.eclipse.remote.jsch.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.ptp.remote.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.remotetools.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.remotetools.environment.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.remotetools.environment.generichost"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.remotetools.environment.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.remotetools.preferences"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.remotetools.utils"
+ id="org.eclipse.remote.ui"
download-size="0"
install-size="0"
version="0.0.0"
@@ -1272,11 +1230,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.equinox.security.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/org.eclipse.ptp.rcp.sysmon-feature/pom.xml b/org.eclipse.ptp.rcp.sysmon-feature/pom.xml
index 16c4bed..b24b5cd 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>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.rcp.sysmon</artifactId>
- <version>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-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 8f75856..daf9941 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>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.rcp.sysmon-product</artifactId>
- <version>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-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 09fe9cd..5b0efaf 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="7.0.4.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="7.0.3.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF b/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF
index 74c5396..27d25bb 100644
--- a/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF
+++ b/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
org.eclipse.debug.ui,
org.eclipse.ptp.core,
org.eclipse.ptp.launch,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui
+ org.eclipse.remote.core,
+ org.eclipse.remote.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/org.eclipse.ptp.rcp.sysmon/pom.xml b/org.eclipse.ptp.rcp.sysmon/pom.xml
index ae8ce54..3df3d9a 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>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java b/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java
index 8ab17b8..5eedbc9 100644
--- a/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java
+++ b/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java
@@ -31,10 +31,10 @@
import org.eclipse.ptp.launch.RMLaunchUtils;
import org.eclipse.ptp.launch.ui.LaunchImages;
import org.eclipse.ptp.launch.ui.tabs.LaunchConfigurationTab;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.RemoteUIServices;
+import org.eclipse.remote.core.IRemoteConnection;
+import org.eclipse.remote.ui.IRemoteUIFileManager;
+import org.eclipse.remote.ui.IRemoteUIServices;
+import org.eclipse.remote.ui.RemoteUIServices;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
diff --git a/pom.xml b/pom.xml
index ef671b4..ea4f7f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,16 +8,18 @@
</prerequisites>
<groupId>org.eclipse.ptp.master</groupId>
- <version>7.0.4-SNAPSHOT</version>
+ <version>7.0.3-SNAPSHOT</version>
<artifactId>org.eclipse.ptp.master</artifactId>
<packaging>pom</packaging>
<name>PTP Products</name>
<properties>
<tycho-version>0.18.1</tycho-version>
- <eclipse-release>kepler</eclipse-release>
+ <eclipse-release>luna</eclipse-release>
+ <!-->eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site-->
<eclipse-site>http://download.eclipse.org/releases/kepler</eclipse-site>
<ptp-site>http://download.eclipse.org/tools/ptp/builds/${eclipse-release}/nightly</ptp-site>
+ <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/${eclipse-release}/nightly</remote-site>
<ptp-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/${eclipse-release}/nightly</ptp-install-dir>
</properties>
@@ -54,15 +56,13 @@
<url>${ptp-site}</url>
<layout>p2</layout>
</repository>
+ <repository>
+ <id>remote-${eclipse-release}</id>
+ <url>${remote-site}</url>
+ <layout>p2</layout>
+ </repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>maven.eclipse.org</id>
- <url>http://maven.eclipse.org/nexus/content/repositories/milestone-indigo/</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
diff --git a/update_versions b/update_versions
index b68ff6e..51d84d2 100644
--- a/update_versions
+++ b/update_versions
@@ -11,13 +11,6 @@
#
# Note: a "qualifier" suffix will automatically be added to the version where appropriate
#
-# If version numbers are updated on a branch other than master, it is recommended to run
-# the command from the master branch:
-#
-# git merge -s ours origin/branch
-#
-# to mark the changes as merged.
-#
BRANCH=master
@@ -42,13 +35,13 @@
mkdir fix_ptp_versions
cd fix_ptp_versions
-git clone ssh://${user_id}@git.eclipse.org:29418/ptp/org.eclipse.photran.git
+git clone ssh://${user_id}@git.eclipse.org/gitroot/ptp/org.eclipse.photran.git
(cd org.eclipse.photran && git checkout $BRANCH)
-git clone ssh://${user_id}@git.eclipse.org:29418/ptp/org.eclipse.ptp.git
+git clone ssh://${user_id}@git.eclipse.org/gitroot/ptp/org.eclipse.ptp.git
(cd org.eclipse.ptp && git checkout $BRANCH)
-git clone ssh://${user_id}@git.eclipse.org:29418/ptp/org.eclipse.ptp.master.git
+git clone ssh://${user_id}@git.eclipse.org/gitroot/ptp/org.eclipse.ptp.master.git
(cd org.eclipse.ptp.master && git checkout $BRANCH)
PTP_PLUGINS="\
@@ -84,6 +77,7 @@
(cd org.eclipse.ptp.master/*.${product}-product && \
update_product $product $ptp_version)
done
+exit 0
for feature in org.eclipse.photran/*-feature; do
echo "Updating $feature..."
