WIP Upgrade bndtools to Eclipse 4.34 2024-12

.github/workflows/cibuild.yml

@@ -51,12 +51,12 @@ jobs:
         - '{0}' # 'xvfb-run --auto-servernum {0}'
         include:
         - os: 'ubuntu-latest'
-          java: '17'
+          java: '21'
           runner: '{0}' # 'xvfb-run --auto-servernum {0}'
           canonical: ${{ (github.repository == 'bndtools/bnd') && ((github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/next')) && (github.event_name != 'pull_request') }}
           fetch-depth: '0'
         - os: 'windows-latest'
-          java: '17'
+          java: '21'
           runner: '{0}'
     name: Build JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -79,10 +79,23 @@ jobs:
           ${{ matrix.java }}
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
+
+    - name: Cache cnf cache and ~/.bnd/urlcache/
+      id: cache-cnf-cache
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
+      env:
+          cache-name: cache-cnf-cache
+      with:
+        path: |
+          "${{ github.workspace }}/cnf/cache"
+          ~/.bnd/urlcache/
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/cnf/**/*.bnd', '**/cnf/**/*.mvn', '**/cnf/**/*.maven') }}
+
     - name: Build
       id: build
       run: |
         ${{ format(matrix.runner, './.github/scripts/ci-build.sh') }}
+
     - name: Configure settings.xml for Publish
       if: ${{ matrix.canonical }}
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12

.github/workflows/codeql.yml

@@ -38,7 +38,7 @@ jobs:
         os:
         - 'ubuntu-latest'
         java:
-        - '17'
+        - '21'
     name: CodeQL JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/rebuild.yml

@@ -46,7 +46,7 @@ jobs:
         os:
         - 'ubuntu-latest'
         java:
-        - '17'
+        - '21'
     name: Build JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     outputs:
@@ -87,7 +87,6 @@ jobs:
         os:
         - 'ubuntu-latest'
         java:
-        - '17'
         - '21'
         - '23'
         runner:

biz.aQute.bnd.maven/bnd.bnd

@@ -46,6 +46,6 @@ Import-Package: \
 	${junit},\
 	${mockito},\
 	org.codehaus.plexus.classworlds,\
-	slf4j.simple;version=latest
+	slf4j.simple;version='[1.7.25,2)'
 
 -baseline: *

biz.aQute.bnd/bnd.bnd

@@ -30,18 +30,18 @@
 	@${repo;biz.aQute.bnd.exporters;latest}!/!META-INF/*, \
 	@${repo;biz.aQute.bnd.reporter;latest}!/!META-INF/*, \
  	@${repo;biz.aQute.launchpad;latest}!/!META-INF/*, \
-	@${repo;slf4j.api;latest}!/!META-INF/*, \
-	@${repo;slf4j.simple;latest}!/!META-INF/*, \
+	@${repo;slf4j.api;1.7.25}!/!META-INF/*, \
+	@${repo;slf4j.simple;1.7.25}!/!META-INF/*, \
 	@${repo;jline}!/!META-INF/*, \
     @${repo;jline}!/META-INF/native/*, \
 
 
 Import-Package: \
- org.slf4j,\
- !com.google.appengine.*,\
- !com.google.apphosting.*,\
- !com.cloudius.util.*,\
- *
+	org.slf4j;version='[1.0.0,2)',\
+	!com.google.appengine.*,\
+	!com.google.apphosting.*,\
+	!com.cloudius.util.*,\
+	*
 # About the aQute.library.bndrepo dep. Needed to add them here
 # by hand even though they are in bndlib. However, they are added
 # and we can unfortunately not see those packages ...
@@ -90,8 +90,8 @@ Bundle-Description: This command line utility is the Swiss army knife of OSGi. I
 	biz.aQute.bnd.annotation;version=project,\
 	biz.aQute.remote.api;version=latest,\
 	org.yaml.snakeyaml;version=latest,\
-	slf4j.api;version=latest,\
-	slf4j.simple;version=latest,\
+	slf4j.api;version='1.7.25',\
+	slf4j.simple;version='1.7.25',\
     jline
 
 -testpath: \

biz.aQute.bndlib.comm.tests/bnd.bnd

@@ -21,4 +21,5 @@
 	org.apache.commons.codec;version=latest,\
 	com.google.guava;version='[19.0,20)',\
 	bcpkix;version=latest,\
-	bcprov;version=latest
+	bcprov;version=latest,\
+	bcutil;version=latest

biz.aQute.bndlib/bnd.bnd

@@ -69,7 +69,7 @@ Import-Package: \
 	aQute.libg,\
 	biz.aQute.bnd.annotation;version=project,\
 	biz.aQute.bnd.util;version=latest,\
-	slf4j.api;version=latest,\
+	slf4j.api;version='[1.7.25,2)',\
 	org.osgi.service.serviceloader,\
 	org.eclipse.jdt.annotation
 

biz.aQute.http.testservers/bnd.bnd

@@ -22,6 +22,7 @@ Bundle-Description: \
 	org.nanohttpd:nanohttpd;version=latest,\
 	bcpkix;version=latest,\
 	bcprov;version=latest, \
+	bcutil;version=latest, \
 	org.littleshoot:littleproxy;version=latest
 
 -testpath: \

biz.aQute.launchpad.tests/workspace.bndrun

@@ -10,12 +10,11 @@
 	org.osgi.service.coordinator;version='[1.0.2,1.0.3)',\
 	org.osgi.service.repository;version='[1.1.0,1.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
-	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	biz.aQute.bnd.transform;version=snapshot,\
 	biz.aQute.bnd.util;version=snapshot,\
 	biz.aQute.bndlib;version=snapshot,\
 	biz.aQute.repository;version=snapshot,\
-	biz.aQute.resolve;version=snapshot
+	biz.aQute.resolve;version=snapshot,\
+	org.osgi.util.promise;version='[1.3.0,1.3.1)'
 -resolve: cache
 -runtrace true
 -runrepos: \

biz.aQute.launchpad/src/aQute/launchpad/Launchpad.java

@@ -137,7 +137,7 @@ public class Launchpad implements AutoCloseable {
 			this.injector = new Injector<>(makeConverter(), this::getService, Service.class);
 			this.frameworkExports = getExports(framework).keySet();
 
-			report("Initialized framework %s", this.framework);
+			report("Initialized framework %s v%s", this.framework, this.framework.getVersion());
 			report("Classpath %s", System.getProperty("java.class.path")
 				.replace(File.pathSeparatorChar, '\n'));
 

biz.aQute.repository/bnd.bnd

@@ -16,7 +16,7 @@
 	biz.aQute.bnd.annotation;version=project,\
 	biz.aQute.bnd.util;version=latest,\
 	biz.aQute.bndlib;version=latest,\
-	slf4j.api;version=latest,\
+	slf4j.api;version='[1.7.25,2)',\
 	org.tukaani.xz;version=latest;maven-scope=provided,\
 	junit-jupiter-api
 

biz.aQute.resolve/bnd.bnd

@@ -18,7 +18,7 @@
 	biz.aQute.bndlib;version=latest,\
 	biz.aQute.repository;version=latest,\
 	org.apache.felix.resolver;version=latest;packages=org.apache.felix.resolver.*;maven-scope=provided,\
-	slf4j.api;version=latest
+	slf4j.api;version='[1.7.25,2)'
 
 -testpath: \
 	biz.aQute.bnd.test;version=project,\

biz.aQute.resolve/test/biz/aQute/resolve/RunResolutionTest.java

@@ -439,8 +439,8 @@ public void testPrintHumanReadableDifference() throws Exception {
 		Set<String> set1 = Set.of("com.fasterxml.jackson.core.jackson-annotations;version='[2.16.1,2.16.2)'",
 			"com.fasterxml.jackson.core.jackson-core;version='[2.16.1,2.16.2)'",
 			"com.fasterxml.jackson.core.jackson-databind;version='[2.16.1,2.16.2)'",
-			"io.dropwizard.metrics.core;version='[4.2.19,4.2.20)'", "junit-jupiter-api;version='[5.9.0,5.9.1)'",
-			"junit-jupiter-engine;version='[5.9.0,5.9.1)'", "junit-jupiter-params;version='[5.9.0,5.9.1)'",
+			"io.dropwizard.metrics.core;version='[4.2.19,4.2.20)'", "junit-jupiter-api;version='[5.9.2,5.9.3)'",
+			"junit-jupiter-engine;version='[5.9.2,5.9.3)'", "junit-jupiter-params;version='[5.9.2,5.9.3)'",
 			"junit-platform-commons;version='[1.9.0,1.9.1)'", "junit-platform-engine;version='[1.9.0,1.9.1)'",
 			"junit-platform-launcher;version='[1.9.0,1.9.1)'",
 			"org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)'",
@@ -477,8 +477,8 @@ public void testPrintHumanReadableDifference() throws Exception {
 		Set<String> set2 = Set.of("com.fasterxml.jackson.core.jackson-annotations;version='[2.16.1,2.16.2)'",
 			"com.fasterxml.jackson.core.jackson-core;version='[2.16.1,2.16.2)'",
 			"com.fasterxml.jackson.core.jackson-databind;version='[2.16.1,2.16.2)'",
-			"io.dropwizard.metrics.core;version='[4.2.19,4.2.20)'", "junit-jupiter-api;version='[5.9.0,5.9.1)'",
-			"junit-jupiter-engine;version='[5.9.0,5.9.1)'", "junit-jupiter-params;version='[5.9.0,5.9.1)'",
+			"io.dropwizard.metrics.core;version='[4.2.19,4.2.20)'", "junit-jupiter-api;version='[5.9.2,5.9.3)'",
+			"junit-jupiter-engine;version='[5.9.2,5.9.3)'", "junit-jupiter-params;version='[5.9.2,5.9.3)'",
 			"junit-platform-commons;version='[1.9.0,1.9.1)'", "junit-platform-engine;version='[1.9.0,1.9.1)'",
 			"junit-platform-launcher;version='[1.9.0,1.9.1)'",
 			"org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)'",

biz.aQute.tester.test/base.bndrun

@@ -1,14 +1,16 @@
 
 -runbundles: \
-	junit-platform-launcher;version='[1.9.0,1.9.1)',\
-	junit-platform-commons;version='[1.9.0,1.9.1)',\
-	junit-platform-engine;version='[1.9.0,1.9.1)',\
-	junit-jupiter-api;version='[5.9.0,5.9.1)',\
-	junit-jupiter-params;version='[5.9.0,5.9.1)',\
+	junit-platform-launcher;version='[1.11.3,1.11.4)',\
+	junit-platform-commons;version='[1.11.3,1.11.4)',\
+	junit-platform-engine;version='[1.11.3,1.11.4)',\
+	junit-jupiter-api;version='[5.11.3,5.11.4)',\
+	junit-jupiter-params;version='[5.11.3,5.11.4)',\
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
-	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.junit;version='[4.13.2,4.13.3)',\
-	org.hamcrest.core;version='[1.3.0,1.3.1)'
+	org.hamcrest.core;version='[2.2.0,2.2.1)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.hamcrest;version='[3.0.0,3.0.1)'
 
 -runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
 -runee: JavaSE-1.8

biz.aQute.tester.test/biz.aQute.tester.bndrun

@@ -1,6 +1,9 @@
 -runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
 -runrequires: \
 	bnd.identity;id='biz.aQute.tester'
--runee: JavaSE-1.8
+-runee: JavaSE-17
 -runsystempackages: aQute.tester.test
--runbundles: org.apache.servicemix.bundles.junit
+-runbundles: \
+	biz.aQute.tester;version=snapshot,\
+	org.hamcrest;version='[3.0.0,3.0.1)',\
+	org.junit;version='[4.13.2,4.13.3)'

biz.aQute.tester.test/biz.aQute.tester.junit-platform.bndrun

@@ -1,5 +1,5 @@
 -include: base.bndrun
 
 -runbundles.engines: \
-	junit-jupiter-engine;version='[5.9.0,5.9.1)',\
-	junit-vintage-engine;version='[5.9.0,5.9.1)'
+	junit-jupiter-engine;version='[5.11.3,5.11.4)',\
+	junit-vintage-engine;version='[5.11.3,5.11.4)'

biz.aQute.tester.test/bundleenginetest-noengines.bndrun

@@ -1,27 +1,28 @@
 -runbundles: \
-	junit-jupiter-api;version='[5.9.0,5.9.1)',\
-	junit-jupiter-params;version='[5.9.0,5.9.1)',\
+	junit-jupiter-api;version='[5.11.3,5.11.4)',\
+	junit-jupiter-params;version='[5.11.3,5.11.4)',\
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
-	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.junit;version='[4.13.2,4.13.3)',\
-	org.hamcrest.core;version='[1.3.0,1.3.1)'
+	org.hamcrest.core;version='[2.2.0,2.2.3)',\
+	org.hamcrest;version='[2.2.0,2.2.3)'
 
 -runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
 -runee: JavaSE-1.8
 
 -runsystempackages: \
-	org.junit.platform.commons;version=1.9.0,\
-	org.junit.platform.commons.annotation;version=1.9.0,\
-	org.junit.platform.commons.function;version=1.9.0,\
-	org.junit.platform.commons.logging;version=1.9.0,\
-	org.junit.platform.commons.support;version=1.9.0,\
-	org.junit.platform.commons.util;version=1.9.0,\
-	org.junit.platform.engine;version=1.9.0,\
-	org.junit.platform.engine.discovery;version=1.9.0,\
-	org.junit.platform.engine.reporting;version=1.9.0,\
-	org.junit.platform.engine.support.config;version=1.9.0,\
-	org.junit.platform.engine.support.descriptor;version=1.9.0,\
-	org.junit.platform.engine.support.discovery;version=1.9.0,\
-	org.junit.platform.engine.support.filter;version=1.9.0,\
-	org.junit.platform.engine.support.hierarchical;version=1.9.0,\
+	org.junit.platform.commons;version=1.11.13,\
+	org.junit.platform.commons.annotation;version=1.11.13,\
+	org.junit.platform.commons.function;version=1.11.13,\
+	org.junit.platform.commons.logging;version=1.11.13,\
+	org.junit.platform.commons.support;version=1.11.13,\
+	org.junit.platform.commons.util;version=1.11.13,\
+	org.junit.platform.engine;version=1.11.13,\
+	org.junit.platform.engine.discovery;version=1.11.13,\
+	org.junit.platform.engine.reporting;version=1.11.13,\
+	org.junit.platform.engine.support.config;version=1.11.13,\
+	org.junit.platform.engine.support.descriptor;version=1.11.13,\
+	org.junit.platform.engine.support.discovery;version=1.11.13,\
+	org.junit.platform.engine.support.filter;version=1.11.13,\
+	org.junit.platform.engine.support.hierarchical;version=1.11.13,\
 	aQute.tester.testbase

biz.aQute.tester.test/bundleenginetest.bndrun

@@ -1,5 +1,8 @@
 -include: bundleenginetest-noengines.bndrun
 
 -runbundles.engines: \
-	junit-jupiter-engine;version='[5.9.0,5.9.1)',\
-	junit-vintage-engine;version='[5.9.0,5.9.1)'
+	junit-jupiter-engine;version='[5.11.3,5.11.4)',\
+	junit-vintage-engine;version='[5.11.3,5.11.4)',\
+	junit-platform-launcher;version='[1.11.3,1.11.4)',\
+	junit-platform-commons;version='[1.11.3,1.11.4)',\
+	junit-platform-engine;version='[1.11.3,1.11.4)'

bndtools.builder/bnd.bnd

@@ -36,7 +36,8 @@
 	org.eclipse.equinox.common,\
 	org.eclipse.equinox.registry,\
 	org.eclipse.equinox.preferences,\
-	slf4j.api
+	slf4j.api,\
+	org.eclipse.jdt.core.compiler.batch
 
 -testpath: \
     ${junit},\

bndtools.core.services/bnd.bnd

@@ -35,12 +35,13 @@ Import-Package: \
 	org.eclipse.text,\
 	org.eclipse.swt,\
 	org.eclipse.swt.cocoa.macosx.x86_64,\
-	org.eclipse.jface.text,\
 	org.osgi.service.component.annotations;version='1.3.0',\
 	slf4j.api,\
 	org.eclipse.jface,\
 	org.eclipse.core.commands,\
 	org.eclipse.ui.ide,\
 	org.eclipse.ui.workbench,\
 	biz.aQute.bnd.pde,\
-	osgi.annotation
+	osgi.annotation,\
+	org.eclipse.jdt.core.manipulation,\
+	org.eclipse.jdt.core.compiler.batch

bndtools.core.test/bnd.bnd

@@ -50,7 +50,7 @@
 	bndtools.core.services;version=snapshot,\
 	assertj-core,\
 	net.bytebuddy.byte-buddy,\
-	javax.inject,\
+	jakarta.inject.jakarta.inject-api;version=latest,\
 	org.apiguardian:apiguardian-api,\
 	org.opentest4j,\
 	org.apache.servicemix.bundles.junit,\
@@ -85,7 +85,8 @@
 	org.osgi.service.event,\
 	org.osgi.service.repository;version=latest,\
 	osgi.annotation,\
-	org.eclipse.jdt.core.manipulation
+	org.eclipse.jdt.core.manipulation,\
+	org.eclipse.jdt.core.compiler.batch
 
 # Don't run testOSGi in parallel with other tasks claiming launchpad
 -noparallel: launchpad;task="testOSGi"

bndtools.core.test/src/bndtools/core/test/launch/NullContextPresentationEngine.java

@@ -1,7 +1,5 @@
 package bndtools.core.test.launch;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.internal.workbench.swt.IEventLoopAdvisor;
@@ -14,6 +12,8 @@
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.swt.widgets.Display;
 
+import jakarta.inject.Inject;
+
 /**
  * IPresentationEngine implementation that doesn't render anything or store any
  * state. All it does is spin the event loop. This engine is useful for testing