Merge branch 'ptp_9_1'
Change-Id: Ib4291ca9cd1530927a4da5c5f037319015f390b1
Signed-off-by: Watson, Gregory <g.watson@computer.org>
diff --git a/org.eclipse.ptp-product/pom.xml b/org.eclipse.ptp-product/pom.xml
index 3f27b34..4d59143 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>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp-product</artifactId>
- <version>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<profiles>
@@ -57,7 +57,9 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <createArtifactRepository>false</createArtifactRepository>
+ <createArtifactRepository>true</createArtifactRepository>
+ <!-- Workaround for Bug 512182 -->
+ <!-- createArtifactRepository>false</createArtifactRepository -->
<includeAllDependencies>true</includeAllDependencies>
</configuration>
</plugin>
diff --git a/org.eclipse.ptp-product/ptp.product b/org.eclipse.ptp-product/ptp.product
index ab6493b..d7be66a 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="9.1.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="9.1.2" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.ptp/ptp_logo_icon32.png"/>
diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index 9bd11bb..f225b24 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="9.1.1.qualifier"
+ version="9.1.2.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 28df262..dbe9eb6 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>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.product</artifactId>
- <version>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-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 27421e5..d875719 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="9.1.1.qualifier"
+ version="9.1.2.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 da1b106..7a66c55 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>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.rcp.sysmon</artifactId>
- <version>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-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 8b1f37d..b3ce7a2 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>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.ptp.rcp.sysmon-product</artifactId>
- <version>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<profiles>
@@ -57,7 +57,9 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <createArtifactRepository>false</createArtifactRepository>
+ <createArtifactRepository>true</createArtifactRepository>
+ <!-- Workaround for Bug 512182 -->
+ <!-- createArtifactRepository>false</createArtifactRepository -->
<includeAllDependencies>true</includeAllDependencies>
</configuration>
</plugin>
diff --git a/org.eclipse.ptp.rcp.sysmon-product/sysmon.product b/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
index 49ec354..2d82976 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="9.1.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="9.1.2.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 6f986d5..f79d697 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>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index bb1820a..4843e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</prerequisites>
<groupId>org.eclipse.ptp.master</groupId>
- <version>9.1.1-SNAPSHOT</version>
+ <version>9.1.2-SNAPSHOT</version>
<artifactId>org.eclipse.ptp.master</artifactId>
<packaging>pom</packaging>
<name>PTP Products</name>
@@ -16,7 +16,7 @@
<properties>
<ptp-version>nightly</ptp-version>
<remote-version>nightly</remote-version>
- <tycho-version>0.23.1</tycho-version>
+ <tycho-version>1.0.0</tycho-version>
<eclipse-release>oxygen</eclipse-release>
<!-->eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site-->
<eclipse-site>http://download.eclipse.org/staging/${eclipse-release}</eclipse-site>
diff --git a/update_versions b/update_versions
index b68ff6e..8073da1 100644
--- a/update_versions
+++ b/update_versions
@@ -1,15 +1,16 @@
#!/bin/sh
#
-# script to update PTP versions
+# Script to update PTP versions
#
# Usage: user_id update_versions ptp_version photran_version [branch]
#
# user_id - user id to use to clone repo
-# ptp_version - new version string for PTP (e.g. "5.0.1")
-# photran_version - new version string for Photran (e.g. "7.0.1")
+# ptp_version - new version string for PTP and Photran (e.g. "5.0.1")
# branch - alternate branch to use when updating versions
#
-# Note: a "qualifier" suffix will automatically be added to the version where appropriate
+# Note: as of 9.1, PTP and Photran versions will be kept in sync
+#
+# 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:
@@ -17,18 +18,16 @@
# git merge -s ours origin/branch
#
# to mark the changes as merged.
-#
BRANCH=master
if [ $# -lt 3 ]; then
- echo "usage: update_versions user_id ptp_version photran_version [branch]"
+ echo "usage: update_versions user_id ptp_version [branch]"
exit 1
fi
user_id=$1
ptp_version=$2
-photran_version=$3
if [ $# -gt 3 ]; then
BRANCH=$4
@@ -59,8 +58,8 @@
debug/org.eclipse.ptp.debug.sdm \
core/org.eclipse.ptp.utils \
core/org.eclipse.ptp.proxy \
- tools/sci/org.eclipse.ptp.sci \
- rdt/org.eclipse.ptp.rdt.core.remotejars"
+ core/org.eclipse.ptp.doc.isv \
+ tools/sci/org.eclipse.ptp.sci"
PTP_PRODUCTS="ptp sysmon"
@@ -87,7 +86,7 @@
for feature in org.eclipse.photran/*-feature; do
echo "Updating $feature..."
- update_feature $feature $photran_version
+ update_feature $feature $ptp_version
done
for feature in org.eclipse.ptp/releng/*-feature; do
@@ -106,7 +105,7 @@
done
(cd org.eclipse.photran && \
- mvn versions:set -DnewVersion="${photran_version}-SNAPSHOT" && \
+ mvn versions:set -DnewVersion="${ptp_version}-SNAPSHOT" && \
mvn org.eclipse.tycho:tycho-versions-plugin:0.14.0:update-pom)
(cd org.eclipse.ptp && \
