From 2e33419a937f82be7b4be670ba0e5b701c5d75e2 Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Tue, 10 Sep 2019 09:18:16 -0400 Subject: [PATCH] build: Start 4.4.0 stream Signed-off-by: BJ Hargrave --- aQute.libg/bnd.bnd | 2 +- biz.aQute.bnd.gradle/README.md | 6 +++--- biz.aQute.bndlib/bnd.bnd | 2 +- biz.aQute.bndlib/src/aQute/bnd/osgi/About.java | 5 ++++- biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java | 4 ++++ biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo | 1 - cnf/build.bnd | 2 +- maven/pom.xml | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java delete mode 100644 biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo diff --git a/aQute.libg/bnd.bnd b/aQute.libg/bnd.bnd index 5c6bec2b06..9644ed058e 100644 --- a/aQute.libg/bnd.bnd +++ b/aQute.libg/bnd.bnd @@ -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 diff --git a/biz.aQute.bnd.gradle/README.md b/biz.aQute.bnd.gradle/README.md index d57dae68b5..9bfcd1a91b 100644 --- a/biz.aQute.bnd.gradle/README.md +++ b/biz.aQute.bnd.gradle/README.md @@ -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' } } ``` @@ -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' @@ -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' diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd index 15b688eac6..beaf5da7e7 100644 --- a/biz.aQute.bndlib/bnd.bnd +++ b/biz.aQute.bndlib/bnd.bnd @@ -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 diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java index 80ff384f0e..3d2b918ad1 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java @@ -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 = {}; @@ -216,6 +218,7 @@ public class About { public static final Map 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); diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java new file mode 100644 index 0000000000..83189760b9 --- /dev/null +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java @@ -0,0 +1,4 @@ +@Version("4.4.0") +package aQute.bnd.osgi; + +import org.osgi.annotation.versioning.Version; diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo b/biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo deleted file mode 100644 index 5c3d1c0f2f..0000000000 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo +++ /dev/null @@ -1 +0,0 @@ -version 4.3 diff --git a/cnf/build.bnd b/cnf/build.bnd index 8e8e2e9fb0..b2814c82bd 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -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 diff --git a/maven/pom.xml b/maven/pom.xml index 7a18ec0af5..40c2cc6c67 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -12,7 +12,7 @@ ${revision} - 4.3.0-SNAPSHOT + 4.4.0-SNAPSHOT UTF-8 3.1.1 0.9.0.M2