Replace content of o.e.osgi.services by osgi-bundles from Maven-Central

And update to latest version of - org.osgi.service.cm - org.osgi.service.component - org.osgi.service.device - org.osgi.service.event - org.osgi.service.metatype - org.osgi.service.provisioning - org.osgi.service.upnp - org.osgi.service.useradmin - org.osgi.service.wireadmin Discussed in issue: https://github.com/eclipse-equinox/equinox.framework/issues/40
eclipse-equinox · Jun 14, 2022 · a0b2dad · a0b2dad
1 parent 05016aa
commit a0b2dad
Show file tree

Hide file tree

Showing 99 changed files with 74 additions and 12,833 deletions.
diff --git a/bundles/org.eclipse.osgi.services/.classpath b/bundles/org.eclipse.osgi.services/.classpath
@@ -2,10 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.osgi.services/.settings/.api_filters b/bundles/org.eclipse.osgi.services/.settings/.api_filters
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.osgi.services" version="2">
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.cm.ConfigurationConstants">
+        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+            <message_arguments>
+                <message_argument value="org.osgi.service.cm.ConfigurationConstants"/>
+                <message_argument value="CONFIGURATION_ADMIN_SPECIFICATION_VERSION"/>
+                <message_argument value="1.6.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.component.ComponentConstants">
+        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+            <message_arguments>
+                <message_argument value="org.osgi.service.component.ComponentConstants"/>
+                <message_argument value="COMPONENT_SPECIFICATION_VERSION"/>
+                <message_argument value="1.4.0"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="403767336">
+            <message_arguments>
+                <message_argument value="org.osgi.service.component.ComponentConstants"/>
+                <message_argument value="REFERENCE_NAME_SATISFYING_CONDITION"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.event.EventConstants">
+        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+            <message_arguments>
+                <message_argument value="org.osgi.service.event.EventConstants"/>
+                <message_argument value="EVENT_ADMIN_SPECIFICATION_VERSION"/>
+                <message_argument value="1.4.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.metatype.MetaTypeService">
+        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+            <message_arguments>
+                <message_argument value="org.osgi.service.metatype.MetaTypeService"/>
+                <message_argument value="METATYPE_SPECIFICATION_VERSION"/>
+                <message_argument value="1.4.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -2,56 +2,40 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %osgiServices
 Bundle-SymbolicName: org.eclipse.osgi.services
-Bundle-Version: 3.10.200.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Description: %osgiServicesDes
 Bundle-Localization: plugin
 Bundle-Vendor: %eclipse.org
 Bundle-DocUrl: http://www.eclipse.org
 Bundle-ContactAddress: www.eclipse.org
-Export-Package: org.osgi.service.cm;version="1.6";uses:="org.osgi.framework",
- org.osgi.service.component;version="1.4";uses:="org.osgi.framework",
- org.osgi.service.component.annotations;version="1.3",
- org.osgi.service.component.runtime;version="1.4";uses:="org.osgi.framework,org.osgi.util.promise,org.osgi.service.component.runtime.dto",
- org.osgi.service.component.runtime.dto;version="1.4";uses:="org.osgi.dto,org.osgi.framework.dto",
- org.osgi.service.device;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.event;version="1.4";uses:="org.osgi.framework",
+Export-Package: org.osgi.service.component.annotations;version="1.3",
  org.osgi.service.http;version="1.2.1";uses:="javax.servlet,javax.servlet.http",
  org.osgi.service.http.context;version="1.1";uses:="org.osgi.framework,javax.servlet.http",
  org.osgi.service.http.runtime;version="1.1";uses:="org.osgi.service.http.runtime.dto",
  org.osgi.service.http.runtime.dto;version="1.1";uses:="org.osgi.dto,org.osgi.framework.dto",
  org.osgi.service.http.whiteboard;version="1.1",
- org.osgi.service.log;version="1.5";uses:="org.osgi.framework",
- org.osgi.service.metatype;version="1.4";uses:="org.osgi.framework",
- org.osgi.service.provisioning;version="1.2",
- org.osgi.service.upnp;version="1.2",
- org.osgi.service.useradmin;version="1.1";uses:="org.osgi.framework",
- org.osgi.service.wireadmin;version="1.0.1";uses:="org.osgi.framework"
+ org.osgi.service.log;version="1.5";uses:="org.osgi.framework";mandatory:="never.ever.use";never.ever.use="true"
 Import-Package: javax.servlet;resolution:=optional,
  javax.servlet.http;resolution:=optional,
  org.osgi.dto;version="1.0",
  org.osgi.framework;version="1.6",
  org.osgi.framework.dto;version="1.8.0",
- org.osgi.service.cm;version="[1.6,1.7)",
- org.osgi.service.component;version="[1.4,1.5)",
- org.osgi.service.component.annotations;version="[1.3,1.4)",
- org.osgi.service.component.runtime; version="[1.4,1.5)",
- org.osgi.service.component.runtime.dto; version="[1.4,1.5)",
- org.osgi.service.device;version="[1.1,1.2)",
- org.osgi.service.event;version="[1.4,1.5)",
  org.osgi.service.http;version="[1.2,1.3)",
  org.osgi.service.http.context;version="[1.1,1.2)",
  org.osgi.service.http.runtime;version="[1.1,1.2)",
  org.osgi.service.http.runtime.dto;version="[1.1,1.2)",
  org.osgi.service.http.whiteboard;version="[1.1,1.2)",
- org.osgi.service.log;version="[1.5,1.6)",
- org.osgi.service.metatype;version="[1.4,1.5)",
- org.osgi.service.provisioning;version="[1.2,1.3)",
- org.osgi.service.upnp;version="[1.2,1.3)",
- org.osgi.service.useradmin;version="[1.1,1.2)",
- org.osgi.service.wireadmin;version="[1.0,1.1)",
- org.osgi.util.function;version="[1.0,2.0)",
- org.osgi.util.promise;version="[1.0,2.0)"
+ org.osgi.service.log;version="[1.5,1.6)"
 DynamicImport-Package: javax.servlet,
  javax.servlet.http
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.osgi.services
+Require-Bundle: org.osgi.service.cm;bundle-version="[1.6.0,1.7.0)";visibility:=reexport,
+ org.osgi.service.component;bundle-version="[1.5.0,1.6.0)";visibility:=reexport,
+ org.osgi.service.device;bundle-version="[1.1.0,1.2.0)";visibility:=reexport,
+ org.osgi.service.event;bundle-version="[1.4.0,1.5.0)";visibility:=reexport,
+ org.osgi.service.metatype;bundle-version="[1.4.0,1.5.0)";visibility:=reexport,
+ org.osgi.service.provisioning;bundle-version="[1.2.0,1.3.0)";visibility:=reexport,
+ org.osgi.service.upnp;bundle-version="[1.2.0,1.3.0)";visibility:=reexport,
+ org.osgi.service.useradmin;bundle-version="[1.1.0,1.2.0)";visibility:=reexport,
+ org.osgi.service.wireadmin;bundle-version="[1.0.0,1.1.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties
@@ -21,5 +21,4 @@ src.includes = about.html,\
 
 source.. = src/
 output.. = bin/
-jars.extra.classpath = lib/osgi.annotation.jar,\
-                       lib/function.interface.jar
+jars.extra.classpath = lib/osgi.annotation.jar
diff --git a/bundles/org.eclipse.osgi.services/lib/function.interface.jar b/bundles/org.eclipse.osgi.services/lib/function.interface.jar
diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml
@@ -19,20 +19,6 @@
   </parent>
   <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.services</artifactId>
-  <version>3.10.200-SNAPSHOT</version>
+  <version>3.11.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <compilerArgs>
-            <arg>-nowarn:[${project.basedir}/src]</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>