Make the features very specifically pick the version of jetty we are building to avoid picking jetty bundles from the equinox repo
diff --git a/jetty.bundles.f.source/feature.xml b/jetty.bundles.f.source/feature.xml
index 55a8021..3b26765 100644
--- a/jetty.bundles.f.source/feature.xml
+++ b/jetty.bundles.f.source/feature.xml
@@ -21,209 +21,209 @@
id="org.eclipse.jetty.ajp.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.annotations.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.client.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.continuation.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.deploy.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.http.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jaspi.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jmx.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jndi.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<!--
<plugin
id="org.eclipse.jetty.jsp-2.1.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
-->
<plugin
id="org.eclipse.jetty.monitor.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.nosql.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.nested.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="true"/>
<plugin
id="org.eclipse.jetty.osgi.boot.jsp.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.equinoxtools.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.warurl.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.httpservice.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.plus.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.policy.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.rewrite.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlets.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.webapp.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.xml.source"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
</feature>
diff --git a/jetty.bundles.f/feature.xml b/jetty.bundles.f/feature.xml
index 8e3d594..52b4fa5 100644
--- a/jetty.bundles.f/feature.xml
+++ b/jetty.bundles.f/feature.xml
@@ -21,112 +21,112 @@
id="org.eclipse.jetty.ajp"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.annotations"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.client"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.continuation"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.deploy"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jaspi"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jmx"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jndi"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<!--
<plugin
id="org.eclipse.jetty.jsp-2.1"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
-->
<plugin
id="org.eclipse.jetty.monitor"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.nested"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.nosql"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.jsp"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
fragment="true"
unpack="false"/>
@@ -134,7 +134,7 @@
id="org.eclipse.jetty.osgi.equinoxtools"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
fragment="true"
unpack="false"/>
@@ -142,91 +142,91 @@
id="org.eclipse.jetty.osgi.boot.warurl"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.httpservice"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.plus"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.policy"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.rewrite"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlets"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.webapp"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.xml"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="7.6.0"
unpack="false"/>
</feature>
diff --git a/set-version.sh b/set-version.sh
index 6c56f74..f1711f3 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -64,6 +64,7 @@
NEW_VERSION_QUALIFIER="$NEW_VERSION.qualifier"
echo "$OLD_VERSION_QUALIFIER -> $NEW_VERSION_QUALIFIER"
find . -type f -name feature.xml -exec sed -i "s/$OLD_VERSION_QUALIFIER/$NEW_VERSION_QUALIFIER/g" {} \;
+find . -type f -name feature.xml -exec sed -i "s/version=\"$OLD_VERSION\"/version=\"$NEW_VERSION\"/g" {} \;
find . -type f -name categories.xml -exec sed -i "s/$OLD_VERSION_QUALIFIER/$NEW_VERSION_QUALIFIER/g" {} \;
find . -type f -name category.xml -exec sed -i "s/$OLD_VERSION_QUALIFIER/$NEW_VERSION_QUALIFIER/g" {} \;
find . -type f -name site.xml -exec sed -i "s/$OLD_VERSION_QUALIFIER/$NEW_VERSION_QUALIFIER/g" {} \;
