From f7fedbc02d0c73c84600913de5290b991464e9ed Mon Sep 17 00:00:00 2001 From: Peter Kriens Date: Tue, 12 Nov 2024 17:53:41 +0100 Subject: [PATCH] build: Start 7.2.0 stream --- Signed-off-by: Peter Kriens Signed-off-by: Peter Kriens --- biz.aQute.bndlib.tests/test/test/AnalyzerTest.java | 6 ++++++ biz.aQute.bndlib/src/aQute/bnd/osgi/About.java | 5 ++++- gradle-plugins/gradle.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/biz.aQute.bndlib.tests/test/test/AnalyzerTest.java b/biz.aQute.bndlib.tests/test/test/AnalyzerTest.java index 7ee688ce78..caec7a3755 100644 --- a/biz.aQute.bndlib.tests/test/test/AnalyzerTest.java +++ b/biz.aQute.bndlib.tests/test/test/AnalyzerTest.java @@ -49,6 +49,12 @@ public class AnalyzerTest { static File cwd = new File(System.getProperty("user.dir")); + @Test + public void testAbout() { + System.out.println(About.versionDefaults); + + } + /** * Verify that the manifest overrides a version in a package info */ diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java index de151697e1..fd69f7fa53 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/About.java @@ -250,6 +250,7 @@ public class About { public static final Map 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), // @@ -313,7 +314,9 @@ public static String getBndVersion() { private static final long serialVersionUID = 1L; { try { - super.load(Workspace.class.getResourceAsStream(CURRENT + ".bnd")); + String file = CURRENT + ".bnd"; + System.out.println("******************" + file); + super.load(Workspace.class.getResourceAsStream(file)); } catch (IOException e) { logger.error("could not load version defaults for version {}", CURRENT, e); } diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 8f543322a6..cecd4cd330 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -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