Attachment 277730 Details for Bug 544038 – workaround fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] workaround fix

workaround.patch (text/plain), 2.63 KB, created by Vikas Chandra

on 2019-03-01 06:11:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Vikas Chandra

Created: 2019-03-01 06:11:06 EST

Size: 2.63 KB

patch

obsolete

>diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
>index dfb3f43..847136c 100644
>--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
>+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
>@@ -407,6 +407,7 @@
> 
> 		Properties profileProps = null;
> 		boolean added = false;
>+		String lastPackage = null;
> 		//javaProfiles are sorted, go in reverse order, and if when we hit 0 we haven't added any yet, 
> 		//then add that last profile so we have something.
> 		for (int j = javaProfiles.length - 1; j >= 0; j--) {
>@@ -420,11 +421,31 @@
> 
> 					prop = new Hashtable<>();
> 					prop.put(ProfileManager.SYSTEM_PACKAGES, systemPackages);
>+					lastPackage = systemPackages;
> 					prop.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, ee);
> 					properties.add(prop);
> 					added = true;
> 				}
> 			}
>+		}
>+
>+		// from java 10 and beyond
>+		String[] java10AndBeyond = {"JavaSE-10", "JavaSE-11"}; //$NON-NLS-1$//$NON-NLS-2$
>+		String eej10 = "OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6,JavaSE-1.7,JavaSE-1.8,JavaSE-9,JavaSE-10"; //$NON-NLS-1$
>+		String eej11 = "OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6,JavaSE-1.7,JavaSE-1.8,JavaSE-9,JavaSE-10,JavaSE-11"; //$NON-NLS-1$
>+
>+		prop = new Hashtable<>();
>+		for (String string : java10AndBeyond) {
>+			prop = new Hashtable<>();
>+			if (string.equals("JavaSE-10")) { //$NON-NLS-1$
>+				prop.put(ProfileManager.SYSTEM_PACKAGES, lastPackage);
>+				prop.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, eej10);
>+			}
>+			if (string.equals("JavaSE-11")) { //$NON-NLS-1$
>+				prop.put(ProfileManager.SYSTEM_PACKAGES, lastPackage);
>+				prop.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, eej11);
>+			}
>+			properties.add(prop);
> 		}
> 
> 		Dictionary<String, Object>[] stateProperties = properties.toArray(new Dictionary[properties.size()]);
>@@ -487,6 +508,16 @@
> 		}
> 		Version parsedVersion = Version.parseVersion(version);
> 		BundleDescription description = getState().getBundle(bundleId, parsedVersion);
>+
>+		//		ResolverError[] resolutionErrors = state.getResolverErrors(description);
>+		//		if (resolutionErrors.length == 1) {
>+		//			ResolverError resolverError = resolutionErrors[0];
>+		//			String data = resolverError.getData();
>+		//			if (data.startsWith("Bundle-RequiredExecutionEnvironment: JavaSE")) { //$NON-NLS-1$
>+		//				resolved = false;
>+		//			}
>+		//		}
>+
> 		if (description != null && (!resolved || description.isResolved()))
> 			return description;
>

Actions: View | Diff

Attachments on bug 544038: 277406 | 277559 | 277730