Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-01-13 18:59:08 +0000
committerThomas Watson2014-01-13 18:59:08 +0000
commita4f1b5d549eea374491fda70424bdb101e3d144f (patch)
tree7eb4e8cb4701a1e130d090b00a9496b22fd7b901
parent8b8bef8dbdc68ddf96ff2ad953d4a4e7d4658a9d (diff)
downloadrt.equinox.bundles-a4f1b5d549eea374491fda70424bdb101e3d144f.tar.gz
rt.equinox.bundles-a4f1b5d549eea374491fda70424bdb101e3d144f.tar.xz
rt.equinox.bundles-a4f1b5d549eea374491fda70424bdb101e3d144f.zip
Bug 416718 - We should update our version of Jetty for SR2
-rw-r--r--features/org.eclipse.equinox.server.jetty/feature.xml2
-rw-r--r--features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt3
-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, 10 insertions, 8 deletions
diff --git a/features/org.eclipse.equinox.server.jetty/feature.xml b/features/org.eclipse.equinox.server.jetty/feature.xml
index 88a026115..e906cd8dd 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.1.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 100d4a280..b9ca50351 100644
--- a/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
# To force a version qualifier update add the bug here
Bug 403352 - Update all parent versions to match our build stream
-Bug 406691 - should we update Jetty prereq to 8.1.10.v20130312 \ No newline at end of file
+Bug 406691 - should we update Jetty prereq to 8.1.10.v20130312
+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 2d6d1eca8..69937b0c3 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.1-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 32c07165b..2d2b291ce 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.9.0.qualifier"
+ version="3.9.1.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 56f1032a8..4eda7daaf 100644
--- a/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
# To force a version qualifier update add the bug here
Bug 403352 - Update all parent versions to match our build stream
+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 c92ccc049..bb2ee1c09 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.9.0-SNAPSHOT</version>
+ <version>3.9.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>

Back to the top