Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-01-13 18:49:13 +0000
committerThomas Watson2014-01-13 18:49:13 +0000
commit92b1d1648ac781a0075f00a14872065578a82f9c (patch)
tree5a6dda734387fe1c9f411cdb3af07b939eb518af /features
parentf7449a401403570b71364746b733ea9e663bd773 (diff)
downloadrt.equinox.bundles-92b1d1648ac781a0075f00a14872065578a82f9c.tar.gz
rt.equinox.bundles-92b1d1648ac781a0075f00a14872065578a82f9c.tar.xz
rt.equinox.bundles-92b1d1648ac781a0075f00a14872065578a82f9c.zip
Bug 416718 - We should update our version of Jetty for SR2
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.equinox.server.jetty/feature.xml2
-rw-r--r--features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.server.jetty/pom.xml2
-rw-r--r--features/org.eclipse.equinox.serverside.sdk/feature.xml8
-rw-r--r--features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.serverside.sdk/pom.xml2
6 files changed, 9 insertions, 7 deletions
diff --git a/features/org.eclipse.equinox.server.jetty/feature.xml b/features/org.eclipse.equinox.server.jetty/feature.xml
index 88a026115..ea8de1946 100644
--- a/features/org.eclipse.equinox.server.jetty/feature.xml
+++ b/features/org.eclipse.equinox.server.jetty/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.server.jetty"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
diff --git a/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
index f1ae74c92..e2fbd0929 100644
--- a/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
@@ -2,3 +2,4 @@
Bug 403352 - Update all parent versions to match our build stream
Bug 406691 - should we update Jetty prereq to 8.1.10.v20130312
Bug 417264 - We should update our version of Jetty
+Bug 416718 - We should update our version of Jetty for SR2
diff --git a/features/org.eclipse.equinox.server.jetty/pom.xml b/features/org.eclipse.equinox.server.jetty/pom.xml
index 481bc17ee..61aa7d443 100644
--- a/features/org.eclipse.equinox.server.jetty/pom.xml
+++ b/features/org.eclipse.equinox.server.jetty/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
<artifactId>org.eclipse.equinox.server.jetty</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.serverside.sdk/feature.xml b/features/org.eclipse.equinox.serverside.sdk/feature.xml
index 0f3e756da..6dc9457f3 100644
--- a/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.serverside.sdk"
label="%featureName"
- version="3.10.0.qualifier"
+ version="3.10.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -71,14 +71,14 @@
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
+ unpack="false"/>
+
<plugin
id="org.eclipse.equinox.http.jetty"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.equinox.http.jetty.source"
diff --git a/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
index 26a9e0971..38b502e55 100644
--- a/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
@@ -2,3 +2,4 @@
Bug 403352 - Update all parent versions to match our build stream
-- Force update for luna
Bug 417264 - We should update our version of Jetty
+Bug 416718 - We should update our version of Jetty for SR2
diff --git a/features/org.eclipse.equinox.serverside.sdk/pom.xml b/features/org.eclipse.equinox.serverside.sdk/pom.xml
index 6fd032734..958c96560 100644
--- a/features/org.eclipse.equinox.serverside.sdk/pom.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
<artifactId>org.eclipse.equinox.serverside.sdk</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>3.10.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>

Back to the top