Skip to content

Commit 1fd30f6

Browse files
committed
build: Build Release 7.2.3.RC1
Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
1 parent 8e6da4c commit 1fd30f6

11 files changed

Lines changed: 25 additions & 19 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.3
2+
-launcher manage = all
3+
-jpms-multi-release true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*/
3-
@Version("4.7.1")
3+
@Version("4.7.3")
44
package aQute.bnd.build;
55

66
import org.osgi.annotation.versioning.Version;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public class About {
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);
7878
public static final Version _7_2_2 = new Version(7, 2, 2);
79-
public static final Version CURRENT = _7_2_2;
79+
public static final Version _7_2_3 = new Version(7, 2, 3);
80+
public static final Version CURRENT = _7_2_3;
8081

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

biz.aQute.repository/src/aQute/bnd/repository/maven/provider/MavenBndRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,7 @@ synchronized boolean init() {
668668
String sonatypeSnapshotUrl = null;
669669
switch (sonatypeMode) {
670670
case MANUAL, AUTOPUBLISH -> {
671+
reporter.error("Deprecated Sonatype Publishing. This feature will be removed.");
671672
logger.info("deployment via Sonatype Central Portal configured in {} mode", sonatypeMode);
672673
File releaseDir = registry.getPlugin(Workspace.class)
673674
.getFile(SONATYPE_RELEASE_DIR);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Version("2.3.0")
1+
@Version("2.3.2")
22
package aQute.bnd.repository.maven.provider;
33

44
import org.osgi.annotation.versioning.Version;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version 2.8
1+
version 2.8.2

cnf/build.bnd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Git-SHA: ${system-allow-fail;git rev-list -1 --no-abbrev-commit H
1919
# This is the version to baseline this build against. See cnf/ext/baseline.mvn.
2020
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.2
22+
base.version: 7.2.3
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/
@@ -124,4 +124,4 @@ Bundle-Developers: \
124124
-runproperties.testlauncher2: in.bndrun=workspace
125125

126126
-plugin \
127-
aQute.p2.export.P2Exporter
127+
aQute.p2.export.P2Exporter

cnf/ext/repositories.bnd

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ossrh: https://oss.sonatype.org/content/repositories/snapshots
55
sonatype_release: https://central.sonatype.com/api/v1/publisher/upload/
66
sonatype_snapshots: https://central.sonatype.com/repository/maven-snapshots/
77
sonatype_bearer: '${env;SONATYPE_BEARER}'
8+
-fixupmessages.sonatype: "*Deprecated Sonatype Publishing*"
89

910
-connection-settings:\
1011
server; id = ${sonatype_release};\
@@ -55,24 +56,24 @@ sonatype_bearer: '${env;SONATYPE_BEARER}'
5556
#-plugin.1.Eclipse:\
5657
# aQute.bnd.repository.p2.provider.P2Repository; \
5758
# url = https://download.eclipse.org/releases/2023-12/; \
58-
# name = "Eclipse-4_30-2023-12"
59+
# name = "Eclipse-4_30-2023-12"
5960

6061
# How to update to a different Eclipse Version?
6162
# ---------------------------------------------
62-
# 1. Uncomment '-plugin.1.Eclipse' above and refresh the Workspace
63-
# to build the index.xml.gz of the P2 repo. This will download the P2 Repo and build the index.
63+
# 1. Uncomment '-plugin.1.Eclipse' above and refresh the Workspace
64+
# to build the index.xml.gz of the P2 repo. This will download the P2 Repo and build the index.
6465
# Wait (some minutes) until a file cnf/cache/Eclipse-4_30-2023-12/index.xml.gz appears
6566
# 2. then unzip the index.xml.gz into /cnf/ext
6667
# 3. rename index.xml to eclipse.p2.xml.pobr
67-
# 4. open eclipse.p2.xml.pobr and change the 'name' attribute inside <repository name='XZY'>
68+
# 4. open eclipse.p2.xml.pobr and change the 'name' attribute inside <repository name='XZY'>
6869
# into something readable like above 'Eclipse-4_30-2023-12' which becomes the repo name
6970
# 5. Refresh the workspace -> a new Repo will appear in the Repository browser
70-
# 6. comment the repo '-plugin.1.Eclipse' above again, so that only
71+
# 6. comment the repo '-plugin.1.Eclipse' above again, so that only
7172
# the new Repo eclipse.p2.xml.pobr is used.
7273
# 7. check the file eclipse.p2-helper.xml.pobr which contains a few manually added dependencies
7374
# from previous / older Eclipse version which are still needed, but dropped in more recent
7475
# Eclipse versions. Those are mostly non-OSGi libs for which no OSGi-bundle exists on Maven Central
75-
# but were OSGified by Eclipse team.
76+
# but were OSGified by Eclipse team.
7677
# TODO we hope to simplify this process in the future
7778

7879

@@ -95,4 +96,4 @@ sonatype_bearer: '${env;SONATYPE_BEARER}'
9596
-releaserepo.jfrog: ${if;${env;CANONICAL};JFrog}
9697
-releaserepo.sonatype: ${if;${env;CANONICAL};${if;${env;SONATYPE};Sonatype}}
9798

98-
-baselinerepo: Baseline
99+
#-baselinerepo: Baseline

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.2"
36+
id "biz.aQute.bnd.builder" version "7.2.3"
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.2"
653+
id "biz.aQute.bnd.workspace" version "7.2.3"
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.2"
676+
id "biz.aQute.bnd.workspace" version "7.2.3"
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.2
7+
bnd_version: 7.2.3-RC1
88
bnd_distrepo: ../dist/bundles

0 commit comments

Comments
 (0)