1st draft bndtools on Eclipse-2024-12 4.34

Still some startup issues m2e, but bndtools starts
Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>

Author: chrisrueger

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: \

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

bndtools.core/bnd.bnd

@@ -118,7 +118,8 @@ Export-Package: org.osgi.service.metatype.annotations
 	org.eclipse.jdt.annotation,\
 	org.apache.felix.gogo.runtime;version='1.1.6',\
 	org.eclipse.jgit,\
-	org.eclipse.egit.core
+	org.eclipse.egit.core,\
+	org.eclipse.jdt.core.compiler.batch;version='3.40'
 
 -testpath: \
 	slf4j.api,\

bndtools.core/bndtools.shared.bndrun

@@ -38,7 +38,6 @@
 	bnd.identity;id='bndtools.pde',\
 	bnd.identity;id='bndtools.release',\
 	bnd.identity;id='com.google.guava',\
-	bnd.identity;id='javax.annotation',\
 	bnd.identity;id='org.apache.ant',\
 	bnd.identity;id='org.apache.felix.gogo.command',\
 	bnd.identity;id='org.apache.felix.gogo.runtime',\
@@ -78,6 +77,7 @@
 	bnd.identity;id='org.eclipse.m2e.discovery',\
 	bnd.identity;id='org.eclipse.m2e.editor',\
 	bnd.identity;id='org.eclipse.m2e.jdt.ui',\
+	bnd.identity;id='org.eclipse.m2e.maven.runtime',\
 	bnd.identity;id='org.eclipse.m2e.profiles.core',\
 	bnd.identity;id='org.eclipse.m2e.profiles.ui',\
 	bnd.identity;id='org.eclipse.m2e.refactoring',\
@@ -97,23 +97,25 @@
 	bnd.identity;id='org.eclipse.ui.console',\
 	bnd.identity;id='org.eclipse.ui.ide',\
 	bnd.identity;id='org.eclipse.ui.ide.application',\
-	bnd.identity;id='junit-platform-commons';version='${range;[===,==+);${junit.platform.eclipse.version}}',\
-	bnd.identity;id='junit-platform-engine';version='${range;[===,==+);${junit.platform.eclipse.version}}',\
-	bnd.identity;id='junit-platform-launcher';version='${range;[===,==+);${junit.platform.eclipse.version}}',\
+	bnd.identity;id=junit-platform-commons;version='${range;[===,==+);${junit.platform.eclipse.version}}',\
+	bnd.identity;id=junit-platform-engine;version='${range;[===,==+);${junit.platform.eclipse.version}}',\
+	bnd.identity;id=junit-platform-launcher;version='${range;[===,==+);${junit.platform.eclipse.version}}',\
 	bnd.identity;id='org.eclipse.ui.intro',\
 	bnd.identity;id='org.eclipse.ui.intro.quicklinks',\
 	bnd.identity;id='org.eclipse.ui.intro.quicklinks.source',\
 	bnd.identity;id='org.eclipse.ui.intro.source',\
 	bnd.identity;id='org.eclipse.ui.intro.universal',\
-	bnd.identity;id='org.eclipse.ui.intro.universal.source'
-
+	bnd.identity;id='org.eclipse.ui.intro.universal.source',\
+	bnd.identity;id='jakarta.inject.jakarta.inject-api'
+	
 -runblacklist: \
 	bnd.identity;id='biz.aQute.bnd.annotation',\
 	bnd.identity;id='biz.aQute.bnd.transform',\
 	bnd.identity;id='biz.aQute.junit',\
 	bnd.identity;id='org.apache.felix.scr';version='[0,2.1.16)',\
 	bnd.identity;id='osgi.*',\
-	bnd.identity;id='org.osgi.*.annotations'
+	bnd.identity;id='org.osgi.*.annotations',\
+	bnd.identity;id='biz.aQute.bndlib';version='[7.0.0,7.0.1)'
 
 
 -runee: JavaSE-17

cnf/ext/junit.bnd

@@ -8,7 +8,7 @@ junit3.version=3.8.3
 junit4.version=4.13.2
 junit4.eclipse.version=4.13.2
 junit.jupiter.eclipse.version=5.9.0
-junit.platform.eclipse.version=1.9.0
+junit.platform.eclipse.version=1.9.2
 junit.jupiter.version=5.9.2
 junit.platform.version=1.9.2
 assertj.version=3.24.2

cnf/ext/repositories.bnd

@@ -27,53 +27,10 @@ ossrh:                  https://oss.sonatype.org/content/repositories/snapshots
         snapshotUrl="https://bndtools.jfrog.io/bndtools/libs-snapshot-local/";\
         noupdateOnRelease=true
 
-# Eclipse Platform 4.35 / 2025-03 Release repository
-#eclipse.platform.version = 4.35
-#eclipse.platform.reltag  = R-4.35-202502280140
-
-# Eclipse Platform 4.25 / 2022-09 Release repository
-eclipse.platform.version = 4.25
-eclipse.platform.reltag  = R-4.25-202208311800/
-
-eclipse.platform.baseurl = http://download.eclipse.org/eclipse/updates
-eclipse.platform.name    = "Eclipse-${eclipse.platform.version}"
-eclipse.platform.url     = "${eclipse.platform.baseurl}/${eclipse.platform.version}/${eclipse.platform.reltag}"
-
--plugin.1.Eclipse: \
-    aQute.bnd.repository.p2.provider.P2Repository; \
-       tags  = 'resolve'; \
-       name  = ${eclipse.platform.name}; \
-       url   = ${eclipse.platform.url}
-       
-#-plugin.1.EclipseFullRelease:\
-#	aQute.bnd.repository.p2.provider.P2Repository; \
-#	 	url = https://download.eclipse.org/releases/2022-09/; \
-#	 	name = "Eclipse-4_25-2022-09 FullRelease"       
-
--plugin.1.Eclipse_m2e: \
-    aQute.bnd.repository.p2.provider.P2Repository; \
-       tags  = 'resolve'; \
-       name  = Eclipse_m2e; \
-       url   = https://archive.eclipse.org/technology/m2e/releases/2.0.2/
-
--plugin.1.Eclipse_jgit: \
-    aQute.bnd.repository.p2.provider.P2Repository; \
-       tags  = 'resolve'; \
-       name  = Eclipse_jgit; \
-       url   = https://archive.eclipse.org/egit/updates-6.3/
-
--plugin.1.Eclipse_emf: \
-    aQute.bnd.repository.p2.provider.P2Repository; \
-       tags  = 'resolve'; \
-       name  = Eclipse_emf; \
-       url   = https://download.eclipse.org/modeling/emf/emf/builds/release/2.26
-
--plugin.1.Eclipse_wst: \
-    aQute.bnd.repository.p2.provider.P2Repository; \
-       tags  = 'resolve'; \
-       name  = Eclipse_wst; \
-       url   = https://download.eclipse.org/webtools/repository/2022-09/
-       
+-plugin.1.Eclipse:\
+	aQute.bnd.repository.p2.provider.P2Repository; \
+	 	url = https://download.eclipse.org/releases/2024-12/; \
+	 	name = "Eclipse 4.34 (2024-12)"
 
 -plugin.9.Baseline:\
     aQute.bnd.repository.maven.provider.MavenBndRepository;\

org.bndtools.templating.gitrepo/src/org/bndtools/templating/jgit/EclipseGitProgressTransformer.java

@@ -103,4 +103,10 @@ public boolean isCancelled() {
 			return task.isCanceled();
 		return root.isCanceled();
 	}
+
+	@Override
+	public void showDuration(boolean enabled) {
+		// not implemented
+
+	}
 }