Merge pull request #6368 from pkriens/buid/dev7.2.0

Buid/dev7.2.0
bndtools · Nov 13, 2024 · b2deb7f · b2deb7f
2 parents d9d006d + e2f8684
commit b2deb7f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/7.2.0.bnd b/biz.aQute.bndlib/src/aQute/bnd/build/7.2.0.bnd
@@ -0,0 +1,3 @@
+__versiondefaults__                 7.2.0
+-launcher                           manage = all
+-jpms-multi-release                 true
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java
@@ -73,8 +73,10 @@ public class About {
 	public static final Version					_6_4		= new Version(6, 4, 0);
 	public static final Version					_7_0		= new Version(7, 0, 0);
 	public static final Version					_7_1		= new Version(7, 1, 0);
-	public static final Version					CURRENT		= _7_1;
+	public static final Version					_7_2		= new Version(7, 2, 0);
+	public static final Version					CURRENT		= _7_2;
 
+	public static final String[]				CHANGES_7_1	= {};
 	public static final String[]				CHANGES_7_0	= {};
 	public static final String[]				CHANGES_6_4	= {};
 	public static final String[]				CHANGES_6_3	= {};
@@ -248,6 +250,7 @@ public class About {
 
 	public static final Map<Version, String[]>	CHANGES		= Maps.ofEntries(
 		// In decreasing order
+		Maps.entry(_7_1, CHANGES_7_1),																																							//
 		Maps.entry(_7_0, CHANGES_7_0),																																							//
 		Maps.entry(_6_4, CHANGES_6_4),																																							//
 		Maps.entry(_6_3, CHANGES_6_3),																																							//
@@ -311,7 +314,8 @@ public static String getBndVersion() {
 		private static final long serialVersionUID = 1L;
 		{
 			try {
-				super.load(Workspace.class.getResourceAsStream(CURRENT + ".bnd"));
+				String file = CURRENT + ".bnd";
+				super.load(Workspace.class.getResourceAsStream(file));
 			} catch (IOException e) {
 				logger.error("could not load version defaults for version {}", CURRENT, e);
 			}

diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -19,7 +19,7 @@ Git-SHA:                ${system-allow-fail;git rev-list -1 --no-abbrev-commit H
 # This is the version to baseline this build against. See cnf/ext/baseline.mvn.
 baseline.version:       7.0.0
 # biz.aQute.bndlib:aQute.bnd.osgi.About.CURRENT needs to be kept in sync with the base.version.
-base.version:           7.1.0
+base.version:           7.2.0
 Bundle-Version:         ${base.version}.${tstamp}-SNAPSHOT
 # Don't baseline Bundle-Version
 -diffignore:            Bundle-Version

diff --git a/gradle-plugins/README.md b/gradle-plugins/README.md
@@ -35,7 +35,7 @@ To make the Bnd Builder Gradle Plugin available to your build, use the following
 ```groovy
 pluginManagement {
   plugins {
-    id "biz.aQute.bnd.builder" version "7.1.0"
+    id "biz.aQute.bnd.builder" version "7.2.0"
   }
 }
 ```
@@ -652,7 +652,7 @@ The main approach is to edit `settings.gradle` as follows:
 
 ```groovy
 plugins {
-  id "biz.aQute.bnd.workspace" version "7.1.0"
+  id "biz.aQute.bnd.workspace" version "7.2.0"
 }
 ```
 The Gradle marker plugins for the Bnd Gradle plugins are also in Maven Central.
@@ -675,7 +675,7 @@ The second approach, for when you already have a `settings.gradle` file which in
 
 ```groovy
 plugins {
-  id "biz.aQute.bnd.workspace" version "7.1.0"
+  id "biz.aQute.bnd.workspace" version "7.2.0"
 }
 ```
 

diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xms1024m -Xmx2048m
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 bnd_group: biz.aQute.bnd
-bnd_version: 7.1.0-SNAPSHOT
+bnd_version: 7.2.0-SNAPSHOT
 bnd_distrepo: ../dist/bundles
diff --git a/maven-plugins/bnd-plugin-parent/pom.xml b/maven-plugins/bnd-plugin-parent/pom.xml
@@ -12,7 +12,7 @@
 	<version>${revision}</version>
 
 	<properties>
-		<revision>7.1.0-SNAPSHOT</revision>
+		<revision>7.2.0-SNAPSHOT</revision>
 		<project.build.outputTimestamp>1980-02-01T00:00:00Z</project.build.outputTimestamp>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>