.github/scripts/ci-build.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 set -ev
 ./gradlew --no-daemon --version
-./mvnw --version
 ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :build "$@"
-./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :gradle-plugins:build
-./mvnw -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress --file=maven install

.github/scripts/ci-publish.sh

@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 set -ev
-./gradlew --no-daemon -Dmaven.repo.local=dist/m2 :publish :gradle-plugins:publish "$@"
-./mvnw -Dmaven.repo.local=dist/m2 --batch-mode -Pdist -Dreleaserepo=file:dist/bundles --file=maven deploy
+./gradlew --no-daemon -Dmaven.repo.local=dist/m2 :publish "$@"

.github/scripts/codeql-build.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 set -ev
 ./gradlew --no-daemon --version
-./mvnw --version
 ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue testClasses :dist:jarDependencies "$@"
-./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :gradle-plugins:testClasses
-./mvnw -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress --file=maven test-compile

.github/scripts/docs.sh

@@ -1,7 +1,3 @@
 #!/usr/bin/env bash
 set -ev
 cd docs
-ruby --version
-gem --version
-bundle --version
-bundle exec jekyll build

.github/scripts/rebuild-build.sh

@@ -2,5 +2,3 @@
 set -ev
 ./gradlew --no-daemon --version
 ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 :buildscriptDependencies :publish
-./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --warning-mode=fail :gradle-plugins:build
-./gradlew --no-daemon -Dmaven.repo.local=dist/m2 :gradle-plugins:publish

.github/workflows/cibuild.yml

@@ -1,106 +1,106 @@
-name: 'CI Build'
+name: "CI Build"
 
 on:
-  push:
-    branches-ignore:
-    - 'dependabot/**'
-    paths:
-    - '**'
-    - '!docs/**'
-    - '!.github/**'
-    - '.github/**/*ci*'
-  pull_request:
-    paths:
-    - '**'
-    - '!docs/**'
-    - '!.github/**'
-    - '.github/**/*ci*'
+    push:
+        branches-ignore:
+            - "dependabot/**"
+        paths:
+            - "**"
+            - "!docs/**"
+            - "!.github/**"
+            - ".github/**/*ci*"
+    pull_request:
+        paths:
+            - "**"
+            - "!docs/**"
+            - "!.github/**"
+            - ".github/**/*ci*"
 
 env:
-  LC_ALL: en_US.UTF-8
-  GRADLE_OPTS: >-
-    -Dorg.gradle.parallel=true
-  MAVEN_OPTS: >-
-    -Dhttp.keepAlive=false
-    -Dmaven.wagon.http.pool=false
-    -Dmaven.wagon.http.retryHandler.count=3
+    LC_ALL: en_US.UTF-8
+    GRADLE_OPTS: >-
+        -Dorg.gradle.parallel=true
+    MAVEN_OPTS: >-
+        -Dhttp.keepAlive=false
+        -Dmaven.wagon.http.pool=false
+        -Dmaven.wagon.http.retryHandler.count=3
 
 defaults:
-  run:
-    shell: bash
+    run:
+        shell: bash
 
 permissions:
-  contents: read
+    contents: read
 
 jobs:
-  build:
-    strategy:
-      fail-fast: ${{ (github.repository != 'bndtools/bnd') || ((github.ref != 'refs/heads/master') && (github.ref != 'refs/heads/next')) || (github.event_name == 'pull_request') }}
-      matrix:
-        os:
-        - 'ubuntu-latest'
-        java:
-        - '8'
-        - '11'
-        - '18'
-        runner:
-        - 'xvfb-run --auto-servernum {0}'
-        include:
-        - os: 'ubuntu-latest'
-          java: '17'
-          runner: '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'
-          runner: '{0}'
-    name: Build JDK${{ matrix.java }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Harden Runner
-      uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
-      with:
-        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+    build:
+        strategy:
+            fail-fast: ${{ (github.repository != 'bndtools/bnd') || ((github.ref != 'refs/heads/master') && (github.ref != 'refs/heads/next')) || (github.event_name == 'pull_request') }}
+            matrix:
+                os:
+                    - "ubuntu-latest"
+                java:
+                    - "8"
+                    - "11"
+                    - "18"
+                runner:
+                    - "xvfb-run --auto-servernum {0}"
+                include:
+                    - os: "ubuntu-latest"
+                      java: "17"
+                      runner: "xvfb-run --auto-servernum {0}"
+                      canonical: ${{ (github.repository == 'bndtools/bnd') && ((github.ref == 'refs/heads/classic') || (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/next')) && (github.event_name != 'pull_request') }}
+                      fetch-depth: "0"
+                    - os: "windows-latest"
+                      java: "17"
+                      runner: "{0}"
+        name: Build JDK${{ matrix.java }} ${{ matrix.os }}
+        runs-on: ${{ matrix.os }}
+        steps:
+            - name: Harden Runner
+              uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
+              with:
+                  egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - name: Git Checkout
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      with:
-        fetch-depth: ${{ matrix.fetch-depth }}
-    - name: Set up Java ${{ matrix.java }}
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java }}
-    - name: Set up Gradle
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
-    - 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@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java }}
-        server-id: bndtools.jfrog.io
-        server-username: JFROG_USERNAME
-        server-password: JFROG_PASSWORD
-    - name: Publish
-      id: publish
-      if: ${{ matrix.canonical }}
-      run: |
-        ./.github/scripts/ci-publish.sh
-      env:
-        CANONICAL: ${{ matrix.canonical }}
-        JFROG_USERNAME: ${{ secrets.JFROG_USERNAME }}
-        JFROG_PASSWORD: ${{ secrets.JFROG_PASSWORD }}
-    - name: Upload Test Reports
-      if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
-      uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
-      with:
-        name: Build_JDK${{ matrix.java }}_${{ matrix.os }}-test-reports
-        path: |
-          */generated/test-reports/*/TEST-*.xml
-          maven/*/target/surefire-reports/TEST-*.xml
-          gradle-plugins/*/build/test-results/*/TEST-*.xml
+            - name: Git Checkout
+              uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+              with:
+                  fetch-depth: ${{ matrix.fetch-depth }}
+            - name: Set up Java ${{ matrix.java }}
+              uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc
+              with:
+                  distribution: "temurin"
+                  java-version: ${{ matrix.java }}
+            - name: Set up Gradle
+              uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
+            - 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@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc
+              with:
+                  distribution: "temurin"
+                  java-version: ${{ matrix.java }}
+                  server-id: bndtools.jfrog.io
+                  server-username: JFROG_USERNAME
+                  server-password: JFROG_PASSWORD
+            - name: Publish
+              id: publish
+              if: ${{ matrix.canonical }}
+              run: |
+                  ./.github/scripts/ci-publish.sh
+              env:
+                  CANONICAL: ${{ matrix.canonical }}
+                  JFROG_USERNAME: ${{ secrets.JFROG_USERNAME }}
+                  JFROG_PASSWORD: ${{ secrets.JFROG_PASSWORD }}
+            - name: Upload Test Reports
+              if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
+              uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
+              with:
+                  name: Build_JDK${{ matrix.java }}_${{ matrix.os }}-test-reports
+                  path: |
+                      */generated/test-reports/*/TEST-*.xml
+                      maven/*/target/surefire-reports/TEST-*.xml
+                      gradle-plugins/*/build/test-results/*/TEST-*.xml

aQute.libg/src/aQute/lib/startlevel/StartLevelRuntimeHandler.java

@@ -158,15 +158,33 @@ static public StartLevelRuntimeHandler create(Trace logger, Map<String, String>
 
 		String defaultStartlevelString = outerConfiguration.get(LAUNCH_STARTLEVEL_DEFAULT);
 		if (defaultStartlevelString == null) {
-			logger.trace("startlevel: not handled");
+			logger.trace("startlevel: not handled because %s not set", LAUNCH_STARTLEVEL_DEFAULT);
 			return absent();
 		}
 
-		int defaultStartlevel = toInt(defaultStartlevelString, 1);
+		int tmp = toInt(defaultStartlevelString, 1);
+		if (tmp == 0) {
+			logger.trace("startlevel: disabled because property %s==%s", LAUNCH_STARTLEVEL_DEFAULT,
+				defaultStartlevelString);
+			return absent();
+		}
+
+
+		int defaultStartlevel;
+		boolean manageAll;
+		if (tmp > 0) {
+			manageAll = !Boolean.getBoolean("biz.aQute.launcher.scoped");
+			defaultStartlevel = tmp;
+		} else {
+			manageAll = false;
+			defaultStartlevel = -tmp;
+		}
+
 		int beginningStartlevel = toInt(outerConfiguration.get(Constants.FRAMEWORK_BEGINNING_STARTLEVEL), 1);
 		outerConfiguration.put(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, "1");
 
-		logger.trace("startlevel: handled begin=%s default=%s", beginningStartlevel, defaultStartlevel);
+		logger.trace("startlevel: handled begin=%s default=%s managed=%s", beginningStartlevel, defaultStartlevel,
+			manageAll ? "all" : "narrow");
 
 		//
 		// We need to remove it otherwise the framework reacts to it
@@ -185,15 +203,8 @@ assert getFrameworkStartLevel(
 
 				this.systemBundle = systemBundle;
 
-				for (Bundle bundle : systemBundle.getBundleContext()
-					.getBundles()) {
-					if (bundle.getBundleId() == 0) {
-						continue;
-					}
-					if (bundle.getSymbolicName() == null) {
-						continue;
-					}
-					installed.put(bundle, new BundleIdentity(bundle));
+				if (manageAll) {
+					manageAll(systemBundle);
 				}
 
 				updateConfiguration(outerConfiguration);
@@ -222,6 +233,15 @@ assert getFrameworkStartLevel(
 
 			}
 
+			private void manageAll(Framework systemBundle) {
+				for (Bundle bundle : systemBundle.getBundleContext()
+					.getBundles()) {
+					if (bundle.getBundleId() != 0 && bundle.getSymbolicName() != null) {
+						installed.put(bundle, new BundleIdentity(bundle));
+					}
+				}
+			}
+
 			@Override
 			public void afterStart() {
 				setFrameworkStartLevel(systemBundle, beginningStartlevel, event -> {

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

@@ -3,35 +3,22 @@
 /**
  * For use in the creation of custom bundle annotations wishing to control the
  * cardinality of generated requirements.
- * <p>
- * The {@link #name} will automatically be converted to lower case during macro
- * processing.
  */
-public enum Cardinality {
+public interface Cardinality {
 	/**
 	 * Indicates if the requirement can only be wired a single time.
 	 */
-	SINGLE("single"), // Namespace.CARDINALITY_SINGLE
+	String	SINGLE		= "single";		// Namespace.CARDINALITY_SINGLE
 
 	/**
 	 * Indicates if the requirement can be wired multiple times.
 	 */
-	MULTIPLE("multiple"), // Namespace.CARDINALITY_MULTIPLE
+	String	MULTIPLE	= "multiple";	// Namespace.CARDINALITY_MULTIPLE
 
 	/**
 	 * Default element value for annotation. This is used to distinguish the
 	 * default value for an element and should not otherwise be used.
 	 */
-	DEFAULT("<<default>>");
+	String	DEFAULT		= "default";
 
-	private final String value;
-
-	Cardinality(String value) {
-		this.value = value;
-	}
-
-	@Override
-	public String toString() {
-		return value;
-	}
 }

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

@@ -17,7 +17,9 @@
  * <p>
  * For an elaborate and simple explanation, see {@link ProviderType}.
  * </p>
+ * Deprecated because being replaced by OSGi annotations
  */
+@Deprecated
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)

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

@@ -6,6 +6,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * Not deprecated because it includes functionality the OSGi Version annotation
+ * lacks, like the INCLUDE/EXCLUDE.
+ */
+
+
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.PACKAGE)

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

@@ -59,7 +59,9 @@
  * In the html javadoc, you will see "Consumers of this API must not implement
  * this interface" for @noimplement marked interfaces.
  * </p>
+ * Deprecated because replaced by OSGi annotations
  */
+@Deprecated
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)