Java Imports & Empty header

- The java imports are now always done except when the used framework
  is < 1.9 (before R7). The EE version is now ignored.
- The version used to come from the _imports_. However, that does not make sense, so
  I've changed it to the classpathExports version of the framework package. This is in
  almost all cases the floor of the import range. By using the export, we can make the
  decision that we use an old framework in any bundle that has the framework package
  on the class path and not only in bundles that import the framework. (Surprised this
  was not a problem?)
- The MRJ will now set the Input-Package to Require-Capability to an empty string
  since the spec is rather strange imho. The RFC is a tiny bit clearer but this
  case should be made more explicit.

---
 Signed-off-by: Peter Kriens <[email protected]>

Signed-off-by: Peter Kriens <[email protected]>

Author: pkriens

biz.aQute.bndlib.tests/test/test/AnalyzerTest.java

@@ -828,6 +828,7 @@ public void testBundleActivatorNotImported() throws Exception {
 		Builder a = new Builder();
 		try {
 			Properties p = new Properties();
+			p.put("-noimportjava", "true");
 			p.put("Import-Package", "!org.osgi.framework,*");
 			p.put("Private-Package", "org.objectweb.*");
 			p.put("Bundle-Activator", "org.osgi.framework.BundleActivator");

biz.aQute.bndlib.tests/test/test/ImportJavaTest.java

@@ -15,6 +15,7 @@
 import aQute.bnd.osgi.Builder;
 import aQute.bnd.osgi.Domain;
 import aQute.bnd.osgi.Jar;
+import aQute.lib.io.IO;
 
 public class ImportJavaTest {
 	private Builder builder;
@@ -95,6 +96,7 @@ public void import_java_old_framework() throws Exception {
 		builder.setProperty("-classpath", "compilerversions/compilerversions.jar");
 		builder.setProperty("-includepackage", "sun_1_8");
 		builder.setProperty("-noimportjava", "false");
+		builder.addClasspath(IO.getFile("jar/osgi.core-4.3.0.jar"));
 		Jar jar = builder.build();
 		assertTrue(builder.check());
 		Manifest manifest = jar.getManifest();

biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java

@@ -38,10 +38,13 @@ public void testBuild() throws Exception {
 
 		Project main = ws.getProject("multirelease.main");
 		Project v9 = ws.getProject("multirelease.v9");
+		Project v12 = ws.getProject("multirelease.v12");
 		Project v17 = ws.getProject("multirelease.v17");
 
 		v17.compile(false);
 		v17.build();
+		v12.compile(false);
+		v12.build();
 		v9.compile(false);
 		v9.build();
 		main.setProperty(Constants.JPMS_MODULE_INFO, "");
@@ -73,15 +76,23 @@ public void testBuild() throws Exception {
 		assertThat(manifest9.getMainAttributes()
 			.getValue(Constants.IMPORT_PACKAGE))
 				.isEqualTo(
-					"org.osgi.service.condpermadmin;version=\"[1.1,2)\",org.osgi.service.url;version=\"[1.0,2)\"");
+					"");
 		assertThat(manifest9.getMainAttributes()
 			.getValue(Constants.REQUIRE_CAPABILITY)).isEqualTo("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=9))\"");
 
+		Manifest manifest12 = jpms.getManifest(12);
+		assertThat(manifest12).isNotNull();
+		assertThat(manifest12.getMainAttributes()
+			.getValue(Constants.IMPORT_PACKAGE)).isEqualTo(
+				"org.osgi.service.url;version=\"[1.0,2)\"");
+		assertThat(manifest12.getMainAttributes()
+			.getValue(Constants.REQUIRE_CAPABILITY)).isEqualTo("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=12))\"");
+
 		Manifest manifest17 = jpms.getManifest(17);
 		assertThat(manifest17).isNotNull();
 		assertThat(manifest17.getMainAttributes()
 			.getValue(Constants.IMPORT_PACKAGE)).isEqualTo(
-				"java.io,java.lang,org.osgi.service.startlevel;version=\"[1.1,2)\",org.osgi.service.url;version=\"[1.0,2)\"");
+				"org.osgi.service.startlevel;version=\"[1.1,2)\",org.osgi.service.url;version=\"[1.0,2)\"");
 		assertThat(manifest17.getMainAttributes()
 			.getValue(Constants.REQUIRE_CAPABILITY)).isEqualTo(
 				"fake;filter:=\"(&(fake=fake)(version>=1.2.3)(!(version>=2.0.0)))\",osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=17))\"");
@@ -100,11 +111,16 @@ public void testBuild() throws Exception {
 		assertThat(IO.collect(somefile.get()
 			.openInputStream())).isEqualTo("17");
 
-		somefile = jpms.findResource("somefile", 15);
+		somefile = jpms.findResource("somefile", 11);
 		assertThat(somefile).isPresent();
 		assertThat(IO.collect(somefile.get()
 			.openInputStream())).isEqualTo("9");
 
+		somefile = jpms.findResource("somefile", 13);
+		assertThat(somefile).isPresent();
+		assertThat(IO.collect(somefile.get()
+			.openInputStream())).isEqualTo("12");
+
 		assertThat(jpms.getModuleName()).isPresent()
 			.get()
 			.isEqualTo("foo.bar");

biz.aQute.bndlib.tests/test/test/ProjectTest.java

@@ -599,7 +599,7 @@ public void testSubBuilders() throws Exception {
 
 				assertEquals(12, project.getExports()
 					.size());
-				assertEquals(18, project.getImports()
+				assertEquals(33, project.getImports()
 					.size());
 				assertEquals(12, project.getContained()
 					.size());

biz.aQute.bndlib.tests/testresources/ws-multirelease/multirelease.main/bnd.bnd

@@ -9,6 +9,7 @@ Main-Class hello.App
 
 -includeresource \
     META-INF/versions/9=@${repo;multirelease.v9}, \
+    META-INF/versions/12=@${repo;multirelease.v12}, \
     META-INF/versions/17=@${repo;multirelease.v17}
 
 

biz.aQute.bndlib.tests/testresources/ws-multirelease/multirelease.v12/bnd.bnd

@@ -0,0 +1,9 @@
+javac.source=12
+javac.target=12
+
+src=src
+target=generated
+bin=generated/bin
+
+-buildpath osgi.core, org.osgi.annotation.bundle
+-includeresource somefile

biz.aQute.bndlib.tests/testresources/ws-multirelease/multirelease.v12/somefile

@@ -0,0 +1 @@
+12

biz.aQute.bndlib.tests/testresources/ws-multirelease/multirelease.v12/src/hello/Hello.java

@@ -0,0 +1,11 @@
+package hello;
+
+
+public class Hello {
+
+	Private local = new Private();
+
+	public static void main(String args[]) {
+		System.out.println("Hello from java 12");
+	}
+}

biz.aQute.bndlib.tests/testresources/ws-multirelease/multirelease.v9/src/hello/Private.java renamed to biz.aQute.bndlib.tests/testresources/ws-multirelease/multirelease.v12/src/hello/Private.java

@@ -3,8 +3,6 @@
 import org.osgi.service.condpermadmin.ConditionalPermissionAdmin;
 
 public class Hello {
-	ConditionalPermissionAdmin cpa;
-	Private local = new Private();
 	public static void main(String args[]) {
 		System.out.println("Hello from java 9");
 	}