Add release option

Return resources based on release

biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java

@@ -200,7 +200,12 @@ public static Properties getManifest(File dirOrJar) throws Exception {
 	 */
 	public void analyze() throws Exception {
 		if (!analyzed) {
+			int release = getRelease();
 			analyzed = true;
+			dot.setRelease(release);
+			for (Jar current : getClasspath()) {
+				current.setRelease(release);
+			}
 			analyzeContent();
 
 			// Execute any plugins
@@ -423,6 +428,19 @@ public void analyze() throws Exception {
 		}
 	}
 
+	private int getRelease() {
+		String property = getProperty(JAVA_RELEASE);
+		if (property != null) {
+			try {
+				return Integer.parseInt(property.trim());
+			} catch (NumberFormatException e) {
+				throw new IllegalArgumentException(
+					JAVA_RELEASE + " must be a valid integer but was " + property + " (" + e.getMessage() + ")", e);
+			}
+		}
+		return -1;
+	}
+
 	private void reset() {
 		contained.clear();
 		classspace.clear();

biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java

@@ -293,6 +293,7 @@ public interface Constants {
 	String		WORKINGSET									= "-workingset";
 	String		WORKINGSET_MEMBER							= "member";
 	String		REQUIRE_BND									= "-require-bnd";
+	String		JAVA_RELEASE								= "-release";
 
 	// Deprecated
 	String		CLASSPATH									= "-classpath";
@@ -314,7 +315,7 @@ public interface Constants {
 		CONNECTION_SETTINGS, RUNPROVIDEDCAPABILITIES, WORKINGSET, RUNSTORAGE, REPRODUCIBLE, INCLUDEPACKAGE,
 		CDIANNOTATIONS, REMOTEWORKSPACE, MAVEN_DEPENDENCIES, BUILDERIGNORE, STALECHECK, MAVEN_SCOPE, RUNSTARTLEVEL,
 		RUNOPTIONS, NOCLASSFORNAME, EXPORT_APIGUARDIAN, RESOLVE, DEFINE_CONTRACT, GENERATE, RUNFRAMEWORKRESTART,
-		NOIMPORTJAVA, VERSIONDEFAULTS, LIBRARY);
+		NOIMPORTJAVA, VERSIONDEFAULTS, LIBRARY, JAVA_RELEASE);
 
 	// Ignore bundle specific headers. These headers do not make a lot of sense
 	// to inherit

biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java

@@ -30,6 +30,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Objects;
 import java.util.Optional;
@@ -124,6 +125,8 @@ public enum Compression {
 	private long												zipEntryConstantTime	= ZIP_ENTRY_CONSTANT_TIME;
 	public static final Pattern									METAINF_SIGNING_P		= Pattern
 		.compile("META-INF/([^/]+\\.(?:DSA|RSA|EC|SF)|SIG-[^/]+)", Pattern.CASE_INSENSITIVE);
+	static final Pattern										MULTI_RELEASE_PATH		= Pattern
+		.compile("^META-INF/versions/(\\d+)/(.*)$", Pattern.CASE_INSENSITIVE);
 
 	public Jar(String name) {
 		this.name = name;
@@ -394,6 +397,9 @@ public boolean putResource(String path, Resource resource, boolean overwrite) {
 	public Resource getResource(String path) {
 		check();
 		path = ZipUtil.cleanPath(path);
+		if (release > -1) {
+			 return getResources().get(path);
+		}
 		return resources.get(path);
 	}
 
@@ -429,6 +435,35 @@ public Map<String, Resource> getDirectory(String path) {
 
 	public Map<String, Resource> getResources() {
 		check();
+		if (release > -1) {
+			Set<String> keySet = resources.keySet();
+			TreeMap<Integer, Map<String, Resource>> releaseMap = new TreeMap<>();
+			TreeMap<String, Resource> resultMap = new TreeMap<>();
+			for (String path : keySet) {
+				Matcher matcher = MULTI_RELEASE_PATH.matcher(path);
+				if (matcher.matches()) {
+					// needs special handling
+					int version = Integer.parseInt(matcher.group(1));
+					String resourcePath = matcher.group(2);
+					releaseMap.computeIfAbsent(version, r -> new TreeMap<>())
+						.put(resourcePath, resources.get(path));
+				} else {
+					// can pass through
+					resultMap.put(path, resources.get(path));
+				}
+			}
+			if (release >= 9) {
+				NavigableMap<Integer, Map<String, Resource>> map = releaseMap.headMap(release, true);
+				for (Entry<Integer, Map<String, Resource>> versionEntry : map.entrySet()) {
+					for (Entry<String, Resource> entry : versionEntry.getValue()
+						.entrySet()) {
+						resultMap.put(entry.getKey(), entry.getValue());
+					}
+				}
+			}
+			return resultMap;
+		}
+		// no release option, do as before...
 		return resources;
 	}
 
@@ -621,7 +656,7 @@ public void write(OutputStream to) throws Exception {
 		}
 
 		// Write all remaining entries
-		for (Map.Entry<String, Resource> entry : getResources().entrySet()) {
+		for (Map.Entry<String, Resource> entry : resources.entrySet()) {
 			// Skip metainf contents
 			if (!done.contains(entry.getKey()))
 				writeResource(jout, directories, entry.getKey(), entry.getValue());
@@ -664,7 +699,7 @@ public void writeFolder(File dir) throws Exception {
 			}
 		}
 
-		for (Map.Entry<String, Resource> entry : getResources().entrySet()) {
+		for (Map.Entry<String, Resource> entry : resources.entrySet()) {
 			String path = entry.getKey();
 			if (done.contains(path))
 				continue;
@@ -1302,7 +1337,8 @@ public void removeSubDirs(String dir) {
 		subDirs.forEach(subDir -> removePrefix(subDir.concat("/")));
 	}
 
-	private static final Predicate<String> pomXmlFilter = new PathSet("META-INF/maven/*/*/pom.xml").matches();
+	private static final Predicate<String>	pomXmlFilter	= new PathSet("META-INF/maven/*/*/pom.xml").matches();
+	private int								release;
 
 	public Stream<Resource> getPomXmlResources() {
 		return getResources(pomXmlFilter);
@@ -1343,4 +1379,14 @@ public Optional<byte[]> getSHA256() {
 	public int getLength() {
 		return fileLength;
 	}
+
+	/**
+	 * Set the release flag that should be used for this jar file to read
+	 * Multi-Release-Content jars
+	 *
+	 * @param release
+	 */
+	public void setRelease(int release) {
+		this.release = release;
+	}
 }