Skip to content

Commit

Permalink
build: Start 6.4.0 stream
Browse files Browse the repository at this point in the history
Signed-off-by: BJ Hargrave <bj@hargrave.dev>
  • Loading branch information
bjhargrave committed May 2, 2022
1 parent 1cf283b commit d18830a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions biz.aQute.bndlib/src/aQute/bnd/build/6.4.0.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__versiondefaults__ 6.4.0
5 changes: 4 additions & 1 deletion biz.aQute.bndlib/src/aQute/bnd/osgi/About.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ public class About {
public static final Version _6_1 = new Version(6, 1, 0);
public static final Version _6_2 = new Version(6, 2, 0);
public static final Version _6_3 = new Version(6, 3, 0);
public static final Version CURRENT = _6_3;
public static final Version _6_4 = new Version(6, 4, 0);
public static final Version CURRENT = _6_4;

public static final String[] CHANGES_6_4 = {};
public static final String[] CHANGES_6_3 = {};
public static final String[] CHANGES_6_2 = {};
public static final String[] CHANGES_6_1 = {};
Expand Down Expand Up @@ -242,6 +244,7 @@ public class About {

public static final Map<Version, String[]> CHANGES = Maps.ofEntries(
// In decreasing order
Maps.entry(_6_4, CHANGES_6_4), //
Maps.entry(_6_3, CHANGES_6_3), //
Maps.entry(_6_2, CHANGES_6_2), //
Maps.entry(_6_1, CHANGES_6_1), //
Expand Down
2 changes: 1 addition & 1 deletion biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Version("5.5.0")
@Version("5.6.0")
package aQute.bnd.osgi;

import org.osgi.annotation.versioning.Version;
2 changes: 1 addition & 1 deletion cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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.2.0
# biz.aQute.bndlib:aQute.bnd.osgi.About.CURRENT needs to be kept in sync with the base.version.
base.version: 6.3.0
base.version: 6.4.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
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To make the Bnd Builder Gradle Plugin available to your build, use the following
```groovy
pluginManagement {
plugins {
id "biz.aQute.bnd.builder" version "6.3.0"
id "biz.aQute.bnd.builder" version "6.4.0"
}
}
```
Expand Down Expand Up @@ -651,7 +651,7 @@ The main approach is to edit `settings.gradle` as follows:

```groovy
plugins {
id "biz.aQute.bnd.workspace" version "6.3.0"
id "biz.aQute.bnd.workspace" version "6.4.0"
}
```
The Gradle marker plugins for the Bnd Gradle plugins are also in Maven Central.
Expand All @@ -674,7 +674,7 @@ The second approach, for when you already have a `settings.gradle` file which in

```groovy
plugins {
id "biz.aQute.bnd.workspace" version "6.3.0"
id "biz.aQute.bnd.workspace" version "6.4.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/gradle.properties
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: 6.3.0-SNAPSHOT
bnd_version: 6.4.0-SNAPSHOT
bnd_distrepo: ../dist/bundles
2 changes: 1 addition & 1 deletion maven/bnd-plugin-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<version>${revision}</version>

<properties>
<revision>6.3.0-SNAPSHOT</revision>
<revision>6.4.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

0 comments on commit d18830a

Please sign in to comment.