Commit 6bd8daaa authored by Kristof Szabados's avatar Kristof Szabados
Browse files

lets try not changing the plugin version numbers for external features


Signed-off-by: Kristof Szabados's avatarkristof <Kristof.Szabados@ericsson.com>
parent e784808f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
id="org.antlr.runtime" id="org.antlr.runtime"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="4.3.0.v201502022030"
unpack="false"/> unpack="false"/>
</feature> </feature>
...@@ -24,19 +24,19 @@ All rights regarding jung and org.apache.commons.collection15 belong to their re ...@@ -24,19 +24,19 @@ All rights regarding jung and org.apache.commons.collection15 belong to their re
id="edu.uci.ics.jung" id="edu.uci.ics.jung"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0"/> version="1.0.0.20160527-1200"/>
<plugin <plugin
id="org.apache.commons.collections15" id="org.apache.commons.collections15"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0"/> version="1.0.0.20160527-1200"/>
<plugin <plugin
id="org.apache.poi" id="org.apache.poi"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="3.9.0.v201405241750"
unpack="false"/> unpack="false"/>
</feature> </feature>
...@@ -98,9 +98,7 @@ ...@@ -98,9 +98,7 @@
verbose="true" error="${log.dir}/error/error_@{dir}.log" logError="true" failonerror="true" verbose="true" error="${log.dir}/error/error_@{dir}.log" logError="true" failonerror="true"
timeout="60000"> timeout="60000">
<arg value="--stringparam"/> <arg value="--stringparam"/>
<arg value="feature_version"/> <arg value="${version.qualifier}"/> <arg value="version"/> <arg value="${version.qualifier}"/>
<arg value="--stringparam"/>
<arg value="plugin_version"/> <arg value="${version.qualifier}"/>
<arg value="--stringparam"/> <arg value="--stringparam"/>
<arg value="update_site_name"/> <arg value="@{updatesite.name}"/> <arg value="update_site_name"/> <arg value="@{updatesite.name}"/>
<arg value="--stringparam"/> <arg value="--stringparam"/>
...@@ -158,14 +156,12 @@ ...@@ -158,14 +156,12 @@
verbose="true" error="${log.dir}/error/error_@{dir}.log" logError="true" failonerror="true" verbose="true" error="${log.dir}/error/error_@{dir}.log" logError="true" failonerror="true"
timeout="60000"> timeout="60000">
<arg value="--stringparam"/> <arg value="--stringparam"/>
<arg value="feature_version"/> <arg value="${version.qualifier}"/> <arg value="version"/> <arg value="${version.qualifier}"/>
<arg value="--stringparam"/>
<arg value="plugin_version"/> <arg value="0.0.0"/>
<arg value="--stringparam"/> <arg value="--stringparam"/>
<arg value="update_site_name"/> <arg value="@{updatesite.name}"/> <arg value="update_site_name"/> <arg value="@{updatesite.name}"/>
<arg value="--stringparam"/> <arg value="--stringparam"/>
<arg value="update_site_url"/> <arg value="@{updatesite.url}"/> <arg value="update_site_url"/> <arg value="@{updatesite.url}"/>
<arg value="${base.dir}/feature_xml_transformer.xsl"/> <arg value="${base.dir}/external_feature_xml_transformer.xsl"/>
<fileset dir="${build.dir}/@{dir}"> <fileset dir="${build.dir}/@{dir}">
<include name="feature.xml"/> <include name="feature.xml"/>
</fileset> </fileset>
......
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output indent="yes"/>
<!-- parameters:
version
update_site_name
update_site_url
-->
<!-- -->
<!-- <xsl:input type=name="version_param" select="'UNDEFINED'"/> -->
<!-- -->
<xsl:template match="node()|@*">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
</xsl:copy>
</xsl:template>
<!-- -->
<xsl:template match="feature/@version">
<xsl:attribute name="version">
<xsl:value-of select="$version"/>
</xsl:attribute>
</xsl:template>
<xsl:template match="feature/url/update/@label">
<xsl:attribute name="label">
<xsl:value-of select="$update_site_name"/>
</xsl:attribute>
</xsl:template>
<xsl:template match="feature/url/update/@url">
<xsl:attribute name="url">
<xsl:value-of select="$update_site_url"/>
</xsl:attribute>
</xsl:template>
</xsl:stylesheet>
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<!-- parameters: <!-- parameters:
feature_version version
plugin_version
update_site_name update_site_name
update_site_url update_site_url
--> -->
...@@ -23,7 +22,7 @@ ...@@ -23,7 +22,7 @@
<!-- --> <!-- -->
<xsl:template match="feature/@version"> <xsl:template match="feature/@version">
<xsl:attribute name="version"> <xsl:attribute name="version">
<xsl:value-of select="$feature_version"/> <xsl:value-of select="$version"/>
</xsl:attribute> </xsl:attribute>
</xsl:template> </xsl:template>
...@@ -41,7 +40,7 @@ ...@@ -41,7 +40,7 @@
<xsl:template match="feature/plugin/@version"> <xsl:template match="feature/plugin/@version">
<xsl:attribute name="version"> <xsl:attribute name="version">
<xsl:value-of select="$plugin_version"/> <xsl:value-of select="$version"/>
</xsl:attribute> </xsl:attribute>
</xsl:template> </xsl:template>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment