Switch to using standard scripts to update pom.xml files.
diff --git a/fixModules.xml b/fixModules.xml
deleted file mode 100644
index 08ad331..0000000
--- a/fixModules.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project name="fixModules" default="fix">
- <property name="newVersion" value="a.b.c"/>
- <property name="repo" value="org.eclipse.ptp"/>
-
- <target name="fix">
- <xslt style="generateModules.xsl" in="${repo}/pom.xml" out="modules.xml">
- <param name="newVersion" expression="${newVersion}"/>
- <param name="repo" expression="${repo}"/>
- </xslt>
- <ant antfile="modules.xml">
- <property name="newVersion" value="${newVersion}"/>
- </ant>
- <delete file="modules.xml"/>
- </target>
-</project>
diff --git a/fixPom.xsl b/fixPom.xsl
deleted file mode 100644
index 7058061..0000000
--- a/fixPom.xsl
+++ /dev/null
@@ -1,87 +0,0 @@
-<xsl:stylesheet version="2.0" xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://maven.apache.org/POM/4.0.0"
- exclude-result-prefixes="p xsi #default">
-
- <xsl:param name="newVersion"/>
-
- <xsl:output encoding="UTF-8" method="xml" indent="yes" />
-
- <xsl:template match="p:project">
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <xsl:copy-of select="namespace::*" />
- <xsl:apply-templates />
- </project>
- </xsl:template>
-
- <xsl:template match="p:version[preceding-sibling::p:groupId='org.eclipse.ptp']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
-
- <xsl:template match="p:version[preceding-sibling::p:groupId='org.eclipse.ptp.features']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
-
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.aix.ppc']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.linux.ppc']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.linux.x86']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.linux.x86_64']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.macosx.ppc']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.macosx.x86']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.debug.sdm']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.proxy']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.rm.ibm.ll.proxy']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.rm.ibm.pe.proxy']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.rm.slurm.proxy']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.sci']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.utils']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.repo']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.rdt.remotejars']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
- <xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.master']">
- <version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
- </xsl:template>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="comment()">
- <xsl:copy/>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/generateModules.xsl b/generateModules.xsl
deleted file mode 100644
index 623b39e..0000000
--- a/generateModules.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<xsl:stylesheet version="2.0" xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://maven.apache.org/POM/4.0.0"
- exclude-result-prefixes="p xsi #default">
-
- <xsl:param name="newVersion"/>
- <xsl:param name="repo"/>
-
- <xsl:output encoding="UTF-8" method="xml" indent="yes" />
-
- <xsl:template match="/p:*">
- <project name="fixModules" default="fix">
- <target name="fix">
- <xsl:template match="p:project">
- <xsl:for-each select="p:modules/p:module">
- <xslt style="fixPom.xsl" in="{$repo}/{text()}/pom.xml" out="pom.xml.tmp">
- <param name="newVersion" expression="{$newVersion}"/>
- </xslt>
- <move file="pom.xml.tmp" tofile="{$repo}/{text()}/pom.xml"/>
- </xsl:for-each>
- </xsl:template>
- <xslt style="fixPom.xsl" in="{$repo}/pom.xml" out="pom.xml.tmp">
- <param name="newVersion" expression="{$newVersion}"/>
- </xslt>
- <move file="pom.xml.tmp" tofile="{$repo}/pom.xml"/>
- </target>
- </project>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/update_versions b/update_versions
index 80f64a5..6bd2c9f 100644
--- a/update_versions
+++ b/update_versions
@@ -79,11 +79,19 @@
update_manifest org.eclipse.ptp/$plugin $ptp_version
done
+(cd org.eclipse.photran && \
+ mvn versions:set -DnewVersion="${photran_version}-SNAPSHOT" && \
+ mvn org.eclipse.tycho:tycho-versions-plugin:0.14.0:update-pom)
+
+(cd org.eclipse.ptp && \
+ mvn versions:set -DnewVersion="${ptp_version}-SNAPSHOT" && \
+ mvn org.eclipse.tycho:tycho-versions-plugin:0.14.0:update-pom)
+
(cd org.eclipse.ptp.master && \
- ant -DnewVersion="$photran_version" -Drepo="../org.eclipse.photran" -f fixModules.xml && \
- ant -DnewVersion="$ptp_version" -Drepo="../org.eclipse.ptp" -f fixModules.xml && \
- ant -DnewVersion="$ptp_version" -Drepo="../org.eclipse.ptp.master" -f fixModules.xml)
-
+ mvn versions:set -DnewVersion="${ptp_version}-SNAPSHOT")
+
+find . -name pom.xml.versionsBackup -exec rm -f {} \;
+
#(cd org.eclipse.photran && git commit -m "Update PTP & Photran versions" && git push)
#(cd org.eclipse.ptp && git commit -m "Update PTP & Photran versions" && git push)
#(cd org.eclipse.ptp.master && git commit -m "Update PTP & Photran versions" && git push)
