Merge remote-tracking branch 'origin/ptp_5_0'
diff --git a/category.xml b/category.xml
index 5f03040..5d4df17 100644
--- a/category.xml
+++ b/category.xml
@@ -75,6 +75,9 @@
<feature url="features/org.eclipse.ptp.pldt.upc_0.0.0.jar" id="org.eclipse.ptp.pldt.upc" version="0.0.0">
<category name="Parallel Tools Platform"/>
</feature>
+ <feature url="features/org.eclipse.ptp.pldt.fortran_0.0.0.jar" id="org.eclipse.ptp.pldt.fortran" version="0.0.0">
+ <category name="Parallel Tools Platform"/>
+ </feature>
<feature url="features/org.eclipse.ptp.etfw.tau_0.0.0.jar" id="org.eclipse.ptp.etfw.tau" version="0.0.0">
<category name="Parallel Tools Platform"/>
</feature>
@@ -117,6 +120,9 @@
<feature url="features/org.eclipse.rephraserengine_0.0.0.jar" id="org.eclipse.rephraserengine" version="0.0.0">
<category name="Fortran Development Tools (Photran)"/>
</feature>
+ <feature url="features/org.eclipse.ptp.rm.jaxb.openmpi_0.0.0.jar" id="org.eclipse.ptp.rm.jaxb.openmpi" version="0.0.0">
+ <category name="Parallel Tools Platform"/>
+ </feature>
<category-def name="Parallel Tools Platform" label="Parallel Tools Platform"/>
<category-def name="Remote Development Tools" label="Remote Development Tools"/>
<category-def name="Fortran Development Tools (Photran)" label="Fortran Development Tools (Photran)"/>
diff --git a/pom.xml b/pom.xml
index a75f15e..3b467d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
</prerequisites>
<groupId>org.eclipse.ptp.master</groupId>
+ <version>6.0.0-SNAPSHOT</version>
<artifactId>org.eclipse.ptp.master</artifactId>
- <version>5.0.5-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<name>PTP Master</name>
<properties>
<tycho-version>0.13.0</tycho-version>
- <eclipse-release>indigo</eclipse-release>
+ <eclipse-release>juno</eclipse-release>
<eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site>
- <photran-site>file://home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-photran-release</photran-site>
- <ptp-build>/home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-release</ptp-build>
+ <photran-site>file://home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-photran-nightly</photran-site>
+ <ptp-build>/home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-nightly</ptp-build>
<ptp-site>file:/${ptp-build}</ptp-site>
<ptp-install>/home/data/httpd/download.eclipse.org/tools/ptp/builds/${unqualifiedVersion}/${buildQualifier}</ptp-install>
</properties>
