Skip to content

Commit

Permalink
build: Start 4.4.0 stream
Browse files Browse the repository at this point in the history
Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
  • Loading branch information
bjhargrave committed Sep 10, 2019
1 parent f68970e commit 2e33419
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion aQute.libg/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Bundle-Description: A library to be statically linked. Contains many small utili

-builderignore: testresources

-fixupmessages.bundleversion: "The bundle version \\(4.2.0/4.3.0\\) is too low, must be at least 5.0.0";is:=ignore
-fixupmessages.bundleversion: "The bundle version \\(4.2.0/4.4.0\\) is too low, must be at least 5.0.0";is:=ignore
6 changes: 3 additions & 3 deletions biz.aQute.bnd.gradle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.0'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.4.0'
}
}
```
Expand Down Expand Up @@ -575,7 +575,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.0'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.4.0'
}
}
apply plugin: 'biz.aQute.bnd.workspace'
Expand Down Expand Up @@ -609,7 +609,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.0'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.4.0'
}
}
apply plugin: 'biz.aQute.bnd.workspace'
Expand Down
2 changes: 1 addition & 1 deletion biz.aQute.bndlib/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ Bundle-Contributors: per.kristian.soreide@comactivity.net, ferry.huberts@pelagic
-baseline: *

-fixupmessages.converter: "Export aQute.bnd.http,* private references \\[aQute.lib.converter\\]"
-fixupmessages.bundleversion: "The bundle version \\(4.2.0/4.3.0\\) is too low, must be at least 5.0.0";is:=ignore
-fixupmessages.bundleversion: "The bundle version \\(4.2.0/4.4.0\\) is too low, must be at least 5.0.0";is:=ignore
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 @@ -50,8 +50,10 @@ public class About {
public static final Version _4_1 = new Version(4, 1, 0);
public static final Version _4_2 = new Version(4, 2, 0);
public static final Version _4_3 = new Version(4, 3, 0);
public static final Version CURRENT = _4_3;
public static final Version _4_4 = new Version(4, 4, 0);
public static final Version CURRENT = _4_4;

public static final String[] CHANGES_4_4 = {};
public static final String[] CHANGES_4_3 = {};
public static final String[] CHANGES_4_2 = {};
public static final String[] CHANGES_4_1 = {};
Expand Down Expand Up @@ -216,6 +218,7 @@ public class About {
public static final Map<Version, String[]> CHANGES = new TreeMap<>(Collections.reverseOrder());

static {
CHANGES.put(_4_4, CHANGES_4_4);
CHANGES.put(_4_3, CHANGES_4_3);
CHANGES.put(_4_2, CHANGES_4_2);
CHANGES.put(_4_1, CHANGES_4_1);
Expand Down
4 changes: 4 additions & 0 deletions biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@Version("4.4.0")
package aQute.bnd.osgi;

import org.osgi.annotation.versioning.Version;
1 change: 0 additions & 1 deletion biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo

This file was deleted.

2 changes: 1 addition & 1 deletion cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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: 4.2.0
# biz.aQute.bndlib:aQute.bnd.osgi.About.CURRENT needs to be kept in sync with the base.version.
base.version: 4.3.0
base.version: 4.4.0
# Uncomment the following line to build the non-snapshot version.
#-snapshot:
Bundle-Version: ${base.version}.${tstamp}-SNAPSHOT
Expand Down
2 changes: 1 addition & 1 deletion maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<version>${revision}</version>

<properties>
<revision>4.3.0-SNAPSHOT</revision>
<revision>4.4.0-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.target.version>3.1.1</maven.target.version>
<aether.version>0.9.0.M2</aether.version>
Expand Down

0 comments on commit 2e33419

Please sign in to comment.