Bug 550434 - Removing derelict p2.inf capabilitiesI20191002-0100I20191001-1800

Change-Id: Ie967da021741f086b51ed3a16908f30d2f2a5c6d
Signed-off-by: Todor Boev <rinsvind@gmail.com>

13 files changed, 9 insertions, 33 deletions

diff --git a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
index 8a1b9175e..aedc145fb 100644
--- a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.cm
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.4.200.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.cm.Activator
 Import-Package: org.osgi.framework;version="1.7.0",
  org.osgi.service.cm;version="[1.6,1.7)",
diff --git a/bundles/org.eclipse.equinox.cm/META-INF/p2.inf b/bundles/org.eclipse.equinox.cm/META-INF/p2.inf
deleted file mode 100644
index d761e175d..000000000
--- a/bundles/org.eclipse.equinox.cm/META-INF/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-provides.0.namespace = osgi.service
-provides.0.name = org.osgi.service.cm.ConfigurationAdmin
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.cm/pom.xml b/bundles/org.eclipse.equinox.cm/pom.xml
index 4f085ce75..d0124def0 100644
--- a/bundles/org.eclipse.equinox.cm/pom.xml
+++ b/bundles/org.eclipse.equinox.cm/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm</artifactId>
-  <version>1.4.100-SNAPSHOT</version>
+  <version>1.4.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
index ea932a53f..1b8463f78 100644
--- a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.equinox.ds;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.6.100.qualifier
 Bundle-Vendor: %bundleVendor
 Bundle-Activator: org.eclipse.equinox.internal.ds.Activator
 Bundle-Description: This bundle provides support for OSGi 
diff --git a/bundles/org.eclipse.equinox.ds/META-INF/p2.inf b/bundles/org.eclipse.equinox.ds/META-INF/p2.inf
index d42498bbe..004029595 100644
--- a/bundles/org.eclipse.equinox.ds/META-INF/p2.inf
+++ b/bundles/org.eclipse.equinox.ds/META-INF/p2.inf
@@ -4,6 +4,3 @@ instructions.configure=\
 instructions.unconfigure=\
   setProgramProperty(propName:equinox.use.ds, propValue:);\
   setProgramProperty(propName:ds.delayed.keepInstances, propValue:);
-provides.0.namespace = osgi.extender
-provides.0.name = osgi.component
-provides.0.version = 1.3
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml
index a4d154478..7674be4e7 100644
--- a/bundles/org.eclipse.equinox.ds/pom.xml
+++ b/bundles/org.eclipse.equinox.ds/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.ds</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.6.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
index fcd77b98c..e700a8637 100644
--- a/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
-Bundle-Version: 1.5.200.qualifier
+Bundle-Version: 1.5.300.qualifier
 Bundle-SymbolicName: org.eclipse.equinox.event
 Bundle-Activator: org.eclipse.equinox.internal.event.Activator
 Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.1.0",
diff --git a/bundles/org.eclipse.equinox.event/META-INF/p2.inf b/bundles/org.eclipse.equinox.event/META-INF/p2.inf
deleted file mode 100644
index 021c9f02d..000000000
--- a/bundles/org.eclipse.equinox.event/META-INF/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-provides.0.namespace = osgi.service
-provides.0.name = org.osgi.service.event.EventAdmin
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.event/pom.xml b/bundles/org.eclipse.equinox.event/pom.xml
index 2d2001753..7a85110ca 100644
--- a/bundles/org.eclipse.equinox.event/pom.xml
+++ b/bundles/org.eclipse.equinox.event/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.event</artifactId>
-  <version>1.5.200-SNAPSHOT</version>
+  <version>1.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/p2.inf b/bundles/org.eclipse.equinox.http.servlet/META-INF/p2.inf
deleted file mode 100644
index 40ed0edf8..000000000
--- a/bundles/org.eclipse.equinox.http.servlet/META-INF/p2.inf
+++ /dev/null
@@ -1,4 +0,0 @@
-provides.1.namespace = osgi.service
-provides.1.name = org.osgi.service.http.HttpService
-provides.2.namespace = osgi.service
-provides.2.name = org.osgi.service.http.runtime.HttpServiceRuntime
diff --git a/bundles/org.eclipse.equinox.metatype/META-INF/p2.inf b/bundles/org.eclipse.equinox.metatype/META-INF/p2.inf
deleted file mode 100644
index 3ce53d568..000000000
--- a/bundles/org.eclipse.equinox.metatype/META-INF/p2.inf
+++ /dev/null
@@ -1,6 +0,0 @@
-provides.0.namespace = osgi.implementation
-provides.0.name = osgi.metatype
-provides.1.namespace = osgi.extender
-provides.1.name = osgi.metatype
-provides.2.namespace = osgi.service
-provides.2.name = org.osgi.service.metatype.MetaTypeService
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF
index 8c15ab475..96ffe27b6 100755
--- a/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.slf4j.stub/META-INF/MANIFEST.MF
@@ -4,5 +4,7 @@ Bundle-Name: slf4j Stub
 Bundle-SymbolicName: org.eclipse.equinox.slf4j.stub
 Bundle-Version: 1.0.200.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Provide-Capability: generic; generic="org.slf4j.impl.StaticLoggerBinder"; version:Version="1.6.1"
+Provide-Capability: 
+ generic; generic="org.slf4j.impl.StaticLoggerBinder"; version:Version="1.6.1",
+ org.slf4j.api; org.slf4j.api="org.slf4j.impl.StaticLoggerBinder"; version:Version="1.6.1"
 Automatic-Module-Name: org.eclipse.equinox.slf4j.stub
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/META-INF/p2.inf b/bundles/org.eclipse.equinox.slf4j.stub/META-INF/p2.inf
deleted file mode 100755
index b0b7a6cb9..000000000
--- a/bundles/org.eclipse.equinox.slf4j.stub/META-INF/p2.inf
+++ /dev/null
@@ -1,9 +0,0 @@
-# this file is a workaround for bug 313553
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=313553
-#
-# see also
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=177851#c9
-
-provides.0.namespace = org.slf4j.api
-provides.0.name = org.slf4j.impl.StaticLoggerBinder
-provides.0.version = 1.6.1