From 9d58a7d9412e10ac7b0440c69e6fe8dff51dc0c3 Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 18 Oct 2019 11:45:19 -0400 Subject: [PATCH] maint: Start 4.3.1 stream Signed-off-by: BJ Hargrave --- aQute.libg/bnd.bnd | 2 +- biz.aQute.bndlib/bnd.bnd | 2 +- biz.aQute.bndlib/src/aQute/bnd/osgi/About.java | 2 +- cnf/build.bnd | 4 ++-- maven/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aQute.libg/bnd.bnd b/aQute.libg/bnd.bnd index 5c6bec2b06..a4a83ab66f 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.3.1\\) is too low, must be at least 5.0.0";is:=ignore diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd index 15b688eac6..eeab5b8678 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.3.1\\) 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..259b85496a 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java @@ -49,7 +49,7 @@ public class About { public static final Version _4_0 = new Version(4, 0, 0); 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 _4_3 = new Version(4, 3, 1); public static final Version CURRENT = _4_3; public static final String[] CHANGES_4_3 = {}; diff --git a/cnf/build.bnd b/cnf/build.bnd index 0e4fc6f1cd..76e26e6707 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -21,9 +21,9 @@ 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.3.1 # Uncomment the following line to build the non-snapshot version. --snapshot: +#-snapshot: Bundle-Version: ${base.version}.${tstamp}-SNAPSHOT # Maven info. The maven artifactId defaults to Bundle-SymbolicName diff --git a/maven/pom.xml b/maven/pom.xml index 6e75b33a98..cb7684e006 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -12,7 +12,7 @@ ${revision} - 4.3.0 + 4.3.1-SNAPSHOT UTF-8 3.1.1 0.9.0.M2