Skip to content

Commit 9ff5041

Browse files
committed
build: Build Release 7.2.2.RC1
Goal is to build with 7.2.1 (in order to deploy one last time with bnd's sonatype support) but only to revert the sonatype support in this release. After 7.2.2 sonatype support is removed and we need to do sonatype deployment in 7.3.0 via our new sonatype script which is already in master. Signed-off-by: Christoph Rueger <[email protected]>
1 parent 6c077e8 commit 9ff5041

7 files changed

Lines changed: 14 additions & 10 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
__versiondefaults__ 7.2.2
2+
-launcher manage = all
3+
-jpms-multi-release true

biz.aQute.bndlib/src/aQute/bnd/osgi/About.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public class About {
7575
public static final Version _7_1 = new Version(7, 1, 0);
7676
public static final Version _7_2 = new Version(7, 2, 0);
7777
public static final Version _7_2_1 = new Version(7, 2, 1);
78-
public static final Version CURRENT = _7_2_1;
78+
public static final Version _7_2_2 = new Version(7, 2, 2);
79+
public static final Version CURRENT = _7_2_2;
7980

8081
public static final String[] CHANGES_7_2_1 = {
8182
"See https://github.com/bndtools/bnd/wiki/Changes-in-7.2.1 for a list of changes."

cnf/build.bnd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Git-Descriptor: ${system-allow-fail;git describe --dirty --always --abbr
1717
Git-SHA: ${system-allow-fail;git rev-list -1 --no-abbrev-commit HEAD}
1818

1919
# This is the version to baseline this build against. See cnf/ext/baseline.mvn.
20-
baseline.version: 7.1.0
20+
baseline.version: 7.2.1
2121
# biz.aQute.bndlib:aQute.bnd.osgi.About.CURRENT needs to be kept in sync with the base.version.
22-
base.version: 7.2.1
22+
base.version: 7.2.2
2323
Bundle-Version: ${base.version}.${tstamp}-SNAPSHOT
2424
# Don't baseline Bundle-Version
2525
-diffignore: Bundle-Version
@@ -59,7 +59,7 @@ gpg: gpg --homedir ${def;USERHOME;~}/.gnupg --pinentry-mode loopback
5959
# -snapshot unset (commented out) is a snapshot build. (e.g. 6.0.0-SNAPSHOT)
6060
# -snapshot set to a value (e.g. RC1) is a release build with the value as the Maven version qualifier. (e.g. 6.0.0-RC1)
6161
# -snapshot set to the empty string is a release build with no Maven version qualifier. (e.g. 6.0.0)
62-
-snapshot:
62+
-snapshot: RC1
6363

6464
Automatic-Module-Name: ${def;bsn}
6565
Bundle-Vendor: Bndtools https://bndtools.org/

gradle-plugins/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To make the Bnd Builder Gradle Plugin available to your build, use the following
3333
```groovy
3434
pluginManagement {
3535
plugins {
36-
id "biz.aQute.bnd.builder" version "7.2.1"
36+
id "biz.aQute.bnd.builder" version "7.2.2"
3737
}
3838
}
3939
```
@@ -650,7 +650,7 @@ The main approach is to edit `settings.gradle` as follows:
650650

651651
```groovy
652652
plugins {
653-
id "biz.aQute.bnd.workspace" version "7.2.1"
653+
id "biz.aQute.bnd.workspace" version "7.2.2"
654654
}
655655
```
656656
The Gradle marker plugins for the Bnd Gradle plugins are also in Maven Central.
@@ -673,7 +673,7 @@ The second approach, for when you already have a `settings.gradle` file which in
673673

674674
```groovy
675675
plugins {
676-
id "biz.aQute.bnd.workspace" version "7.2.1"
676+
id "biz.aQute.bnd.workspace" version "7.2.2"
677677
}
678678
```
679679

gradle-plugins/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xms1024m -Xmx2048m
44
systemProp.org.gradle.internal.publish.checksums.insecure=true
55

66
bnd_group: biz.aQute.bnd
7-
bnd_version: 7.2.1
7+
bnd_version: 7.2.2-RC1
88
bnd_distrepo: ../dist/bundles

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bnd_cnf=cnf
1010
# bnd_version is the version of the Bnd Gradle plugin
1111
# We use `+` for the master branch to use the latest snapshot.
1212
# We use a range, e.g. `[6.1.0-RC,6.2)` for the next branch.
13-
bnd_version=[7.2.1-RC,7.3.0)
13+
bnd_version=[7.2.1,7.3.0)
1414

1515
# The URLs to the repos for the Bnd Gradle plugin
1616
bnd_snapshots=https://bndtools.jfrog.io/bndtools/libs-snapshot-local

maven-plugins/bnd-plugin-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<version>${revision}</version>
1313

1414
<properties>
15-
<revision>7.2.1</revision>
15+
<revision>7.2.2-RC1</revision>
1616
<project.build.outputTimestamp>1980-02-01T00:00:00Z</project.build.outputTimestamp>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

0 commit comments

Comments
 (0)