From 7202658c79cb0b363c5c6a608b2690a47ae2cfc7 Mon Sep 17 00:00:00 2001 From: Peter Kriens Date: Fri, 8 Sep 2023 15:27:03 +0200 Subject: [PATCH] Start of 7.1.0 --- Signed-off-by: Peter Kriens Signed-off-by: Peter Kriens --- biz.aQute.bndlib/src/aQute/bnd/build/7.1.0.bnd | 3 +++ biz.aQute.bndlib/src/aQute/bnd/osgi/About.java | 3 ++- biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java | 2 +- cnf/build.bnd | 2 +- gradle-plugins/README.md | 6 +++--- gradle-plugins/gradle.properties | 2 +- maven-plugins/bnd-plugin-parent/pom.xml | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 biz.aQute.bndlib/src/aQute/bnd/build/7.1.0.bnd diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/7.1.0.bnd b/biz.aQute.bndlib/src/aQute/bnd/build/7.1.0.bnd new file mode 100644 index 0000000000..2b80a4174a --- /dev/null +++ b/biz.aQute.bndlib/src/aQute/bnd/build/7.1.0.bnd @@ -0,0 +1,3 @@ +__versiondefaults__ 7.1.0 +-launcher manage = all +-jpms-multi-release true \ No newline at end of file diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java index f1f831bf32..39ff1278e7 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java @@ -72,7 +72,8 @@ public class About { public static final Version _6_3 = new Version(6, 3, 0); 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 CURRENT = _7_0; + public static final Version _7_1 = new Version(7, 1, 0); + public static final Version CURRENT = _7_1; public static final String[] CHANGES_7_0 = {}; public static final String[] CHANGES_6_4 = {}; diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java index 5832ee33f3..45e2d10f3c 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java @@ -1,4 +1,4 @@ -@Version("7.0.0") +@Version("7.1.0") package aQute.bnd.osgi; import org.osgi.annotation.versioning.Version; diff --git a/cnf/build.bnd b/cnf/build.bnd index c05a579a4f..bbccf82091 100644 --- 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: 6.4.0 # biz.aQute.bndlib:aQute.bnd.osgi.About.CURRENT needs to be kept in sync with the base.version. -base.version: 7.0.0 +base.version: 7.1.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 index a775120763..d87e4da0e3 100644 --- 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.0.0" + id "biz.aQute.bnd.builder" version "7.1.0" } } ``` @@ -652,7 +652,7 @@ The main approach is to edit `settings.gradle` as follows: ```groovy plugins { - id "biz.aQute.bnd.workspace" version "7.0.0" + id "biz.aQute.bnd.workspace" version "7.1.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.0.0" + id "biz.aQute.bnd.workspace" version "7.1.0" } ``` diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 2edbd03cb2..8f543322a6 100644 --- 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.0.0-SNAPSHOT +bnd_version: 7.1.0-SNAPSHOT bnd_distrepo: ../dist/bundles diff --git a/maven-plugins/bnd-plugin-parent/pom.xml b/maven-plugins/bnd-plugin-parent/pom.xml index 99666ef623..41b1b06483 100644 --- a/maven-plugins/bnd-plugin-parent/pom.xml +++ b/maven-plugins/bnd-plugin-parent/pom.xml @@ -12,7 +12,7 @@ ${revision} - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT 1980-02-01T00:00:00Z UTF-8 UTF-8