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

And update to latest version of - org.osgi.util.function - org.osgi.util.promise Signed-off-by: Hannes Wellmann <[email protected]>
eclipse-equinox · Apr 18, 2022 · 9b0b4c9 · 9b0b4c9
1 parent f341dd9
commit 9b0b4c9
Show file tree

Hide file tree

Showing 30 changed files with 6 additions and 5,063 deletions.
diff --git a/bundles/org.eclipse.osgi.util/.classpath b/bundles/org.eclipse.osgi.util/.classpath
@@ -2,10 +2,4 @@
 <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="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
@@ -2,23 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %osgiUtil
 Bundle-SymbolicName: org.eclipse.osgi.util
-Bundle-Version: 3.6.100.qualifier
+Bundle-Version: 3.7.000.qualifier
 Bundle-Description: %osgiUtilDes
 Bundle-Vendor: %eclipse.org
 Bundle-Localization: plugin
 Bundle-DocUrl: http://www.eclipse.org
 Bundle-ContactAddress: www.eclipse.org
-Export-Package: org.osgi.util.function;version="1.1",
- org.osgi.util.measurement;version="1.0.2",
- org.osgi.util.position;version="1.0.1";uses:="org.osgi.util.measurement",
- org.osgi.util.promise;version="1.1.1";uses:="org.osgi.util.function",
- org.osgi.util.xml;version="1.0.1";uses:="org.osgi.framework,javax.xml.parsers"
-Import-Package: org.osgi.framework; version=1.1,
- javax.xml.parsers,
- org.osgi.util.function; version="[1.1, 1.2)",
- org.osgi.util.measurement; version="[1.0.2, 1.1)",
- org.osgi.util.position; version="[1.0.1, 1.1)",
- org.osgi.util.promise; version="[1.1.1, 1.2)",
- org.osgi.util.xml; version="[1.0.1, 1.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.osgi.util
+Require-Bundle: org.osgi.util.function;bundle-version="[1.2.0,1.3.0)";visibility:=reexport,
+ org.osgi.util.promise;bundle-version="[1.2.0,1.3.0)";visibility:=reexport,
+ org.osgi.util.measurement;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.osgi.util.position;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.osgi.util.xml;bundle-version="[1.0.0,1.1.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.osgi.util/build.properties b/bundles/org.eclipse.osgi.util/build.properties
@@ -14,11 +14,6 @@
 bin.includes = plugin.properties,\
                about.html,\
                META-INF/,\
-               .,\
                about_files/
 src.includes = about.html,\
                about_files/
-source.. = src/
-output.. = bin/
-jars.extra.classpath = lib/osgi.annotation.jar,\
-                       lib/function.interface.jar
diff --git a/bundles/org.eclipse.osgi.util/lib/function.interface.jar b/bundles/org.eclipse.osgi.util/lib/function.interface.jar
diff --git a/bundles/org.eclipse.osgi.util/lib/osgi.annotation.jar b/bundles/org.eclipse.osgi.util/lib/osgi.annotation.jar
diff --git a/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/Consumer.java b/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/Consumer.java
diff --git a/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/Function.java b/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/Function.java
diff --git a/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/Predicate.java b/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/Predicate.java
diff --git a/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/package-info.java b/bundles/org.eclipse.osgi.util/src/org/osgi/util/function/package-info.java