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]>

bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Require-Bundle:
  org.eclipse.core.runtime,
  org.eclipse.core.tests.harness,
  org.eclipse.test.performance,
- org.junit
+ org.junit,
+ org.eclipse.osgi.util;bundle-version="3.7.0";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Import-Package: org.osgi.service.event; resolution:="optional"
 Export-Package: org.eclipse.osgi.tests.bundles,

bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java

@@ -13,16 +13,28 @@
  *******************************************************************************/
 package org.eclipse.osgi.tests.appadmin;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.core.tests.session.ConfigurationSessionTestSuite;
 import org.eclipse.core.tests.session.SetupManager.SetupException;
 import org.eclipse.osgi.tests.OSGiTest;
 import org.eclipse.osgi.tests.OSGiTestsActivator;
 import org.eclipse.osgi.tests.bundles.BundleInstaller;
-import org.osgi.framework.*;
-import org.osgi.service.application.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.application.ApplicationDescriptor;
+import org.osgi.service.application.ApplicationException;
+import org.osgi.service.application.ApplicationHandle;
+import org.osgi.service.application.ScheduledApplication;
 import org.osgi.util.tracker.ServiceTracker;
 import org.osgi.util.tracker.ServiceTrackerCustomizer;
 
@@ -51,6 +63,12 @@ public static Test suite() {
 		appAdminSessionTest.addBundle(PI_OSGI_SERVICES);
 		appAdminSessionTest.addBundle(PI_OSGI_TESTS);
 		appAdminSessionTest.setApplicationId(testRunnerApp);
+		appAdminSessionTest.addBundle("org.osgi.util.function");
+		appAdminSessionTest.addBundle("org.osgi.util.measurement");
+		appAdminSessionTest.addBundle("org.osgi.util.position");
+		appAdminSessionTest.addBundle("org.osgi.util.promise");
+		appAdminSessionTest.addBundle("org.osgi.util.xml");
+
 		try {
 			appAdminSessionTest.getSetup().setSystemProperty("eclipse.application.registerDescriptors", "true"); //$NON-NLS-1$//$NON-NLS-2$
 		} catch (SetupException e) {

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>

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.0.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

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

bundles/org.eclipse.osgi.util/pom.xml

@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.util</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>