Skip to content

Buid/dev7.2.0 #6368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkriens merged 1 commit into from
Nov 13, 2024
Merged

Buid/dev7.2.0 #6368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions biz.aQute.bndlib/src/aQute/bnd/build/7.2.0.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
__versiondefaults__ 7.2.0
-launcher manage = all
-jpms-multi-release true
8 changes: 6 additions & 2 deletions biz.aQute.bndlib/src/aQute/bnd/osgi/About.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down Expand Up @@ -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), //
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion cnf/build.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions gradle-plugins/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
```
Expand Down Expand Up @@ -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.
Expand All @@ -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"
}
```

Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion maven-plugins/bnd-plugin-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down