Fix equinox ip imports

This commit is contained in:
Krzysztof Daniel 2012-07-27 12:35:02 +02:00
parent 286a69f291
commit 1a00b07b2f
2 changed files with 19 additions and 0 deletions

View File

@ -0,0 +1,17 @@
--- rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF.bak 2012-07-25 17:41:27.000000000 +0200
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF 2012-07-27 12:30:04.415050626 +0200
@@ -9,8 +9,6 @@
Bundle-Activator: org.eclipse.equinox.internal.ip.impl.ProvisioningAgent
DynamicImport-Package: org.osgi.service.permissionadmin; version="1.0"
Import-Package:
- javax.servlet;version="2.1",
- javax.servlet.http;version="2.1",
org.eclipse.equinox.internal.util.ref;version="1.0",
org.eclipse.equinox.internal.util.timer;version="1.0",
org.osgi.framework;version="1.0",
@@ -39,4 +37,5 @@
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.3
Bundle-Localization: plugin
+Require-Bundle: javax.servlet;bundle-version="3.0.0"

View File

@ -65,6 +65,7 @@ Patch3: %{name}-fix-icu-import.patch
Patch4: %{name}-no-source-for-dependencies.patch
Patch5: %{name}-osgi-serverside-patch-additional-imports.patch
Patch6: %{name}-fix-sshd-id.patch
Patch7: %{name}-fix-equinox-ip-imports.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@ -246,6 +247,7 @@ developing Eclipse plugins.
%patch4
%patch5
%patch6
%patch7
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .