Merge branch 'master' into fea_snapshot_deploy_fix

Author: peterkir

.github/scripts/docs.sh

@@ -8,4 +8,8 @@ bundle exec jekyll build
 
 # create search index under _site/pagefind
 pwd
+# ensure the archived _site/releases docs from former release do not get indexed by pagefind
+# by removing the 'data-pagefind-body' from those pages
+# see https://pagefind.app/docs/indexing/#removing-pages-from-pagefinds-index
+find _site/releases -type f -name "*.html" -exec sed -i 's/data-pagefind-body//g' {} +
 ./pagefind --verbose --site _site --output-subdir pagefindindex

biz.aQute.bnd.annotation/bnd.bnd

@@ -1,5 +1,13 @@
 # Set javac settings from JDT prefs
--include: ${workspace}/cnf/includes/jdt.bnd
+-include: ~${workspace}/cnf/includes/jdt.bnd
+
+# #7005: Keep this bundle compatible with Java 8 as long as possible. All other code is min. Java 17
+# It is because some libraries reference bnd annotations
+# like aQute.bnd.annotation.Cardinality, aQute.bnd.annotation.Resolution, aQute.bnd.annotation.spi.ServiceConsumer
+# directly in source code (e.g. https://github.com/apache/logging-log4j2/blob/752d023795fc518a38ecae73bb6455e2723cecea/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java)
+# but they need to stay compatible with java 8.
+javac.source = 8
+javac.target = 8
 
 Bundle-Description:     bnd Annotations Library
 

biz.aQute.bnd.annotation/src/aQute/bnd/annotation/ConsumerType.java

@@ -18,8 +18,10 @@
  * For an elaborate and simple explanation, see {@link ProviderType}.
  * </p>
  * Deprecated because being replaced by OSGi annotations
+ *
+ * @deprecated forRemoval since = "7.0.0"
  */
-@Deprecated(forRemoval = true, since = "7.0.0")
+@Deprecated
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)

biz.aQute.bnd.annotation/src/aQute/bnd/annotation/ProviderType.java

@@ -60,8 +60,10 @@
  * this interface" for @noimplement marked interfaces.
  * </p>
  * Deprecated because replaced by OSGi annotations
+ *
+ * @deprecated forRemoval since = "7.0.0"
  */
-@Deprecated(forRemoval = true, since = "7.0.0")
+@Deprecated
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)

biz.aQute.bnd.annotation/src/aQute/bnd/annotation/Version.java

@@ -8,8 +8,10 @@
 
 /**
  * Deprecated because made superfluous by OSGi annotations
+ *
+ * @deprecated forRemoval since = "7.0.0"
  */
-@Deprecated(forRemoval = true, since = "7.0.0")
+@Deprecated
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target({

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

@@ -645,6 +645,91 @@ public void testWriteManifestNonOSGiHeadersNotReordered() throws Exception {
 		assertEquals(customHeader, writtenCustomHeader);
 	}
 
+	/**
+	 * Test Bundle-NativeCode is untouched from Jar.reorderClause() for now,
+	 * because this header is special and needs to be parsed differently than
+	 * normal OSGi headers. In the future we could evaluate how to build a
+	 * special reordering for this header.
+	 */
+	@Test
+	public void testWriteManifestBundleNativeCodeNoReordering() throws Exception {
+		Manifest manifest = new Manifest();
+
+		String customHeader = """
+			   natives/linux-amd64/libgluegen_rt.so;
+			   natives/linux-amd64/libjocl.so;
+			   natives/linux-amd64/libnativewindow_awt.so;
+			   natives/linux-amd64/libnewt_drm.so;
+			   natives/linux-amd64/libnativewindow_x11.so;
+			   natives/linux-amd64/libnativewindow_drm.so;
+			   natives/linux-amd64/libnewt_head.so;
+			   natives/linux-amd64/libjogl_mobile.so;
+			   natives/linux-amd64/libjogl_desktop.so;
+			   processor=x86-64; osname=Linux
+			""";
+		manifest.getMainAttributes()
+			.putValue(Constants.BUNDLE_NATIVECODE, customHeader);
+
+		try (ByteArrayOutputStream bout = new ByteArrayOutputStream()) {
+			Jar.writeManifest(manifest, bout);
+
+			Manifest writtenManifest = new Manifest(new ByteArrayInputStream(bout.toByteArray()));
+			String writtenCustomHeader = writtenManifest.getMainAttributes()
+				.getValue(Constants.BUNDLE_NATIVECODE);
+
+			assertEquals(customHeader.replaceAll("\n", "")
+				.replace(" ", ""),
+				writtenCustomHeader.replaceAll("\n", "")
+					.replace(" ", ""));
+		}
+	}
+
+	/**
+	 * Test Bundle-NativeCode is untouched from Jar.reorderClause() for now,
+	 * because this header is special and needs to be parsed differently than
+	 * normal OSGi headers. In the future we could evaluate how to build a
+	 * special reordering for this header.
+	 */
+	@Test
+	public void testWriteManifestBundleNativeCodeNoReordering2() throws Exception {
+		Manifest manifest = new Manifest();
+
+		String customHeader = """
+			f1;\
+			  osname=Windows95;
+			  processor=x86;
+			  selection-filter='(com.acme.windowing=win32)';
+			  language=en;
+			  osname=Windows98;
+			  language=se,
+			lib/solaris/libhttp.so;
+			  osname=Solaris;
+			  osname = SunOS ;
+			  processor = sparc,
+			lib/linux/libhttp.so;
+			  osname = Linux ;
+			  osversion = 3.1.4;
+			  processor = mips;
+			  selection-filter = '(com.acme.windowing=gtk)',
+			*""";
+		manifest.getMainAttributes()
+			.putValue(Constants.BUNDLE_NATIVECODE, customHeader);
+
+		try (ByteArrayOutputStream bout = new ByteArrayOutputStream()) {
+			Jar.writeManifest(manifest, bout);
+
+			Manifest writtenManifest = new Manifest(new ByteArrayInputStream(bout.toByteArray()));
+			String writtenCustomHeader = writtenManifest.getMainAttributes()
+				.getValue(Constants.BUNDLE_NATIVECODE);
+
+			assertEquals(customHeader.replaceAll("\n", "")
+				.replace(" ", ""),
+				writtenCustomHeader.replaceAll("\n", "")
+					.replace(" ", ""));
+		}
+	}
+
+
 	@Test
 	public void testWriteManifestComprehensiveAttributeDirectiveOrdering() throws Exception {
 		Manifest manifest = new Manifest();

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

@@ -786,7 +786,8 @@ private static Manifest clean(Manifest org) {
 			.entrySet()) {
 			String nice = clean((String) entry.getValue());
 			Object key = entry.getKey();
-			if (Constants.OSGI_SYNTAX_HEADERS.contains(key.toString())) {
+			if (Constants.OSGI_SYNTAX_HEADERS.contains(key.toString())
+				&& !Constants.BUNDLE_NATIVECODE.equals(key.toString())) {
 				nice = reorderClause(nice, collator);
 			}
 			mainAttributes.put(key, nice);

biz.aQute.junit/README

@@ -1,3 +1,6 @@
+Deprecated: This bundle is marked as deprecated in bnd 7.2.0 for remove in 8.0.0
+Please migrate to biz.aQute.tester.junit-platform
+
 The junit project is a plugin that extends the ProjectTester.java class to run OSGi tests
 inside a framework.
 

biz.aQute.junit/bnd.bnd

@@ -1,6 +1,11 @@
 # Set javac settings from JDT prefs
 -include: ${workspace}/cnf/includes/jdt.bnd
 
+# Deprecated for removal in 8.0.0
+Bundle-Description: Deprecated for removal in 8.0.0: \
+	The junit project is a plugin that extends the ProjectTester.java class \
+	to run OSGi tests inside a framework.
+
 -maven-scope: provided
 
 -buildpath: \

biz.aQute.tester/bnd.bnd

@@ -1,8 +1,10 @@
 # Set javac settings from JDT prefs
 -include: ${workspace}/cnf/includes/jdt.bnd
 
+# Deprecated for removal in 8.0.0
+
 Bundle-Description: \
-	A bnd tester. If this bundle is used as the tester (previously aQute.junit) then \
+	Deprecated for removal in 8.0.0: A bnd tester. If this bundle is used as the tester (previously aQute.junit) then \
 	it will add itself to the -runbundles at the end. At startup, this bundle will then \
 	run the tests. This bundle does NOT contain JUnit itself. It will import JUnit just \
 	like any other bundle.