Merge branch 'jetty-8' into release-8
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
index 4b6f382..08335e1 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
+++ b/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: Jetty-OSGi-Jasper integration
Fragment-Host: org.eclipse.jetty.osgi.boot
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp
-Bundle-Version: 8.1.0.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.sun.el;version="2.2.0";resolution:=optional,
@@ -17,15 +17,15 @@
javax.servlet.jsp.resources;version="2.1.0",
javax.servlet.jsp.tagext;version="2.1.0",
javax.servlet.resources;version="2.5.0",
- org.apache.jasper;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler.tagplugin;version="6.0.0";resolution:=optional,
- org.apache.jasper.runtime;version="6.0.0";resolution:=optional,
- org.apache.jasper.security;version="6.0.0";resolution:=optional,
- org.apache.jasper.servlet;version="6.0.0";resolution:=optional,
- org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional,
- org.apache.jasper.util;version="6.0.0";resolution:=optional,
- org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional,
+ org.apache.jasper;version="2.2.2";resolution:=optional,
+ org.apache.jasper.compiler;version="2.2.2";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="2.2.2";resolution:=optional,
+ org.apache.jasper.runtime;version="2.2.2";resolution:=optional,
+ org.apache.jasper.security;version="2.2.2";resolution:=optional,
+ org.apache.jasper.servlet;version="2.2.2";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="2.2.2";resolution:=optional,
+ org.apache.jasper.util;version="2.2.2";resolution:=optional,
+ org.apache.jasper.xmlparser;version="2.2.2";resolution:=optional,
org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,
@@ -50,5 +50,5 @@
org.apache.taglibs.standard.tei;version="1.2.0";resolution:=optional,
org.apache.taglibs.standard.tlv;version="1.2.0";resolution:=optional,
org.glassfish.jsp.api;version="2.2.2";resolution:=optional
-DynamicImport-Package: org.apache.jasper.*;version="2.1.0"
+DynamicImport-Package: org.apache.jasper.*;version="2.2.2"
diff --git a/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
index 523e719..0400545 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
+++ b/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: Jetty-OSGi-Logback integration
Fragment-Host: org.eclipse.jetty.osgi.boot
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.logback;singleton:=true
-Bundle-Version: 7.6.2.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: ch.qos.logback.classic,
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
index e0bba3b..c8f2dcf 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
+++ b/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Support for rfc66 war url scheme
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.warurl;singleton:=true
-Bundle-Version: 8.1.0.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
index 987156a..b539084 100644
--- a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
+++ b/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: Jetty OSGi bootstrap
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot
Bundle-Vendor: Mort Bay Consulting
-Bundle-Version: 8.1.0.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
Import-Package: javax.mail;version="1.4.0";resolution:=optional,
javax.mail.event;version="1.4.0";resolution:=optional,
@@ -14,20 +14,20 @@
javax.servlet.http;version="2.6",
javax.transaction;version="1.1.0";resolution:=optional,
javax.transaction.xa;version="1.1.0";resolution:=optional,
- org.eclipse.jetty.annotations;version="8.1.0";resolution:=optional,
- org.eclipse.jetty.deploy;version="8.1.0",
- org.eclipse.jetty.deploy.providers;version="8.1.0",
- org.eclipse.jetty.http;version="8.1.0",
- org.eclipse.jetty.nested;version="8.1.0";resolution:=optional,
- org.eclipse.jetty.server;version="8.1.0",
- org.eclipse.jetty.server.handler;version="8.1.0",
- org.eclipse.jetty.servlet;version="8.1.0",
- org.eclipse.jetty.util;version="8.1.0",
- org.eclipse.jetty.util.component;version="8.1.0",
- org.eclipse.jetty.util.log;version="8.1.0",
- org.eclipse.jetty.util.resource;version="8.1.0",
- org.eclipse.jetty.webapp;version="8.1.0",
- org.eclipse.jetty.xml;version="8.1.0",
+ org.eclipse.jetty.annotations;version="8.1.2";resolution:=optional,
+ org.eclipse.jetty.deploy;version="8.1.2",
+ org.eclipse.jetty.deploy.providers;version="8.1.2",
+ org.eclipse.jetty.http;version="8.1.2",
+ org.eclipse.jetty.nested;version="8.1.2";resolution:=optional,
+ org.eclipse.jetty.server;version="8.1.2",
+ org.eclipse.jetty.server.handler;version="8.1.2",
+ org.eclipse.jetty.servlet;version="8.1.2",
+ org.eclipse.jetty.util;version="8.1.2",
+ org.eclipse.jetty.util.component;version="8.1.2",
+ org.eclipse.jetty.util.log;version="8.1.2",
+ org.eclipse.jetty.util.resource;version="8.1.2",
+ org.eclipse.jetty.webapp;version="8.1.2",
+ org.eclipse.jetty.xml;version="8.1.2",
org.osgi.framework,
org.osgi.service.cm;version="1.2.0",
org.osgi.service.packageadmin,
@@ -41,8 +41,8 @@
org.xml.sax.helpers
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Classpath: .
-Export-Package: org.eclipse.jetty.osgi.boot;version="8.1.0",
- org.eclipse.jetty.osgi.nested;version="8.1.0",
- org.eclipse.jetty.osgi.boot.utils;version="8.1.0",
- org.eclipse.jetty.osgi.annotations;version="8.1.0"
+Export-Package: org.eclipse.jetty.osgi.boot;version="8.1.2",
+ org.eclipse.jetty.osgi.nested;version="8.1.2",
+ org.eclipse.jetty.osgi.boot.utils;version="8.1.2",
+ org.eclipse.jetty.osgi.annotations;version="8.1.2"
DynamicImport-Package: org.eclipse.jetty.*;version="[8.1,9)"
diff --git a/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
index a992452..d3f9bfb 100644
--- a/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
+++ b/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
@@ -3,20 +3,20 @@
Bundle-Name: Console
Bundle-SymbolicName: org.eclipse.jetty.osgi.equinoxtools
Bundle-Description: Example application: equinox console accesssible on the web
-Bundle-Version: 7.6.2.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.equinoxtools.WebEquinoxToolsActivator
Import-Package: javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
- org.eclipse.jetty.continuation;version="7.6.2",
- org.eclipse.jetty.io;version="7.6.2",
- org.eclipse.jetty.util;version="7.6.2",
- org.eclipse.jetty.util.log;version="7.6.2",
- org.eclipse.jetty.websocket;version="7.6.2",
+ org.eclipse.jetty.continuation;version="8.1.2",
+ org.eclipse.jetty.io;version="8.1.2",
+ org.eclipse.jetty.util;version="8.1.2",
+ org.eclipse.jetty.util.log;version="8.1.2",
+ org.eclipse.jetty.websocket;version="8.1.2",
org.eclipse.osgi.framework.console;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.http;version="1.2.0",
org.osgi.util.tracker;version="1.3.0"
-Export-Package: org.eclipse.jetty.osgi.equinoxtools;x-internal:=true;version="7.6.2",
- org.eclipse.jetty.osgi.equinoxtools.console;x-internal:=true;version="7.6.2"
+Export-Package: org.eclipse.jetty.osgi.equinoxtools;x-internal:=true;version="8.1.2",
+ org.eclipse.jetty.osgi.equinoxtools.console;x-internal:=true;version="8.1.2"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
index 425430e..a1efdb9 100644
--- a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
+++ b/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: OSGi HttpService provided by equinox HttpServiceServlet deployed on jetty
Bundle-SymbolicName: org.eclipse.jetty.osgi.httpservice
-Bundle-Version: 8.1.0.qualifier
+Bundle-Version: 8.1.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Jetty-ContextFilePath: contexts/httpservice.xml
Import-Package: javax.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0",
org.eclipse.equinox.http.servlet,
- org.eclipse.jetty.server;version="8.1.0",
- org.eclipse.jetty.server.handler;version="8.1.0",
- org.eclipse.jetty.servlet;version="8.1.0",
- org.eclipse.jetty.util.component;version="8.1.0"
-Export-Package: org.eclipse.jetty.osgi.httpservice;version="8.1.0"
+ org.eclipse.jetty.server;version="8.1.2",
+ org.eclipse.jetty.server.handler;version="8.1.2",
+ org.eclipse.jetty.servlet;version="8.1.2",
+ org.eclipse.jetty.util.component;version="8.1.2"
+Export-Package: org.eclipse.jetty.osgi.httpservice;version="8.1.2"
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 9493c03..d660a32 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -145,6 +145,7 @@
<artifactId>jsp-impl</artifactId>
<version>${jsp-impl-2.2-glassfish-version}</version>
</dependency-->
+<!--
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
@@ -155,6 +156,7 @@
<artifactId>jsp-api-2.1-glassfish</artifactId>
<version>${jsp-2.1-glassfish-version}</version>
</dependency>
+-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
