From 3bc44010108a34e5fee3473412a0a28d2b19258d Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sat, 9 May 2015 00:56:43 +0200
Subject: [PATCH] Update javax.servlet to 3.1

Change-Id: Ifad154ed2f52f0102d297ac7fd4943ff1f309b9e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.jgit.http.server/META-INF/MANIFEST.MF           | 4 ++--
 org.eclipse.jgit.http.test/META-INF/MANIFEST.MF             | 4 ++--
 org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF            | 4 ++--
 .../org.eclipse.jgit.target/jgit-4.3.target                 | 6 +++---
 .../org.eclipse.jgit.target/jgit-4.4.target                 | 6 +++---
 .../org.eclipse.jgit.target/jgit-4.5.target                 | 6 +++---
 .../orbit/R20150124073747-Luna-SR2.tpd                      | 4 ++--
 .../orbit/S20150202203538-Mars-M5.tpd                       | 4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 2c76d7454..5304f83be 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Export-Package: org.eclipse.jgit.http.server;version="4.0.0",
    javax.servlet.http"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
- javax.servlet.http;version="[2.5.0,3.0.0)",
+Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
+ javax.servlet.http;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
  org.eclipse.jgit.internal.storage.dfs;version="[4.0.0,4.1.0)",
  org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index f38827a7b..184c8a440 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
- javax.servlet.http;version="[2.5.0,3.0.0)",
+Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
+ javax.servlet.http;version="[2.5.0,3.2.0)",
  org.eclipse.jetty.continuation;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.http;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.io;version="[7.6.0,8.0.0)",
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 8bd5a697e..4e421ebcd 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
- javax.servlet.http;version="[2.5.0,3.0.0)",
+Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
+ javax.servlet.http;version="[2.5.0,3.2.0)",
  org.apache.commons.logging;version="[1.1.1,2.0.0)",
  org.eclipse.jetty.http;version="[7.6.0,8.0.0)",
  org.eclipse.jetty.security;version="[7.6.0,8.0.0)",
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
index 44be1e513..525e56981 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.3" sequenceNumber="1424129720">
+<target name="jgit-4.3" sequenceNumber="1431125767">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
@@ -49,8 +49,8 @@
       <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
       <unit id="org.junit" version="4.11.0.v201303080030"/>
       <unit id="org.junit.source" version="4.11.0.v201303080030"/>
-      <unit id="javax.servlet" version="2.5.0.v201103041518"/>
-      <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+      <unit id="javax.servlet" version="3.1.0.v20140303-1611"/>
+      <unit id="javax.servlet.source" version="3.1.0.v20140303-1611"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
       <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
index 38e25a416..083ece881 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.4" sequenceNumber="1424129605">
+<target name="jgit-4.4" sequenceNumber="1431125746">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
@@ -49,8 +49,8 @@
       <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
       <unit id="org.junit" version="4.11.0.v201303080030"/>
       <unit id="org.junit.source" version="4.11.0.v201303080030"/>
-      <unit id="javax.servlet" version="2.5.0.v201103041518"/>
-      <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+      <unit id="javax.servlet" version="3.1.0.v20140303-1611"/>
+      <unit id="javax.servlet.source" version="3.1.0.v20140303-1611"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
       <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
index e5d14330e..42adbb3d9 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.5" sequenceNumber="1424129587">
+<target name="jgit-4.5" sequenceNumber="1431125729">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
@@ -49,8 +49,8 @@
       <unit id="com.jcraft.jsch.source" version="0.1.51.v201410302000"/>
       <unit id="org.junit" version="4.11.0.v201303080030"/>
       <unit id="org.junit.source" version="4.11.0.v201303080030"/>
-      <unit id="javax.servlet" version="2.5.0.v201103041518"/>
-      <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+      <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
       <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
       <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
index d79b41ade..bad350b9c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd
@@ -28,8 +28,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2015012407374
 	com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000]
 	org.junit [4.11.0.v201303080030,4.11.0.v201303080030]
 	org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030]
-	javax.servlet [2.5.0.v201103041518,2.5.0.v201103041518]
-	javax.servlet.source [2.5.0.v201103041518,2.5.0.v201103041518]
+	javax.servlet [3.1.0.v20140303-1611,3.1.0.v20140303-1611]
+	javax.servlet.source [3.1.0.v20140303-1611,3.1.0.v20140303-1611]
 	org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617]
 	org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617]
 	org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
index 3ec1001c9..94419cb97 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd
@@ -28,8 +28,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2015020220353
 	com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000]
 	org.junit [4.11.0.v201303080030,4.11.0.v201303080030]
 	org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030]
-	javax.servlet [2.5.0.v201103041518,2.5.0.v201103041518]
-	javax.servlet.source [2.5.0.v201103041518,2.5.0.v201103041518]
+	javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
+	javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
 	org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617]
 	org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617]
 	org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]