From fc22db54f263fc7236fd70944a68f0917a5985b9 Mon Sep 17 00:00:00 2001 From: Stefan Bischof Date: Tue, 11 Oct 2022 18:57:10 +0200 Subject: [PATCH] open bnd.reporter for external use Signed-off-by: Stefan Bischof --- biz.aQute.bnd.reporter/bnd.bnd | 12 +++++++++--- .../bnd/reporter/component/dto/package-info.java | 2 ++ .../aQute/bnd/reporter/gogo/dto/package-info.java | 2 ++ .../aQute/bnd/reporter/maven/dto/package-info.java | 2 ++ .../plugins/entries/bundle/ComponentsPlugin.java | 2 +- .../entries/bundle/MavenCoordinatePlugin.java | 2 +- .../plugins/entries/bundle/MetatypesPlugin.java | 2 +- .../plugins/entries/bundle/package-info.java | 2 ++ 8 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/component/dto/package-info.java create mode 100644 biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/gogo/dto/package-info.java create mode 100644 biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/maven/dto/package-info.java create mode 100644 biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/package-info.java diff --git a/biz.aQute.bnd.reporter/bnd.bnd b/biz.aQute.bnd.reporter/bnd.bnd index eba7dedd97..8464c846b4 100644 --- a/biz.aQute.bnd.reporter/bnd.bnd +++ b/biz.aQute.bnd.reporter/bnd.bnd @@ -28,12 +28,18 @@ jtwig.version: 5.86.1.RELEASE ${junit} Export-Package: \ - biz.aQute.bnd.reporter.service.resource.converter,\ + biz.aQute.bnd.reporter.codesnippet,\ + biz.aQute.bnd.reporter.codesnippet.dto,\ + biz.aQute.bnd.reporter.codesnippet.geneimport,\ + biz.aQute.bnd.reporter.component.dto,\ biz.aQute.bnd.reporter.exporter,\ biz.aQute.bnd.reporter.generator,\ + biz.aQute.bnd.reporter.gogo.dto,\ biz.aQute.bnd.reporter.manifest.dto,\ - biz.aQute.bnd.reporter.codesnippet,\ - biz.aQute.bnd.reporter.codesnippet.dto + biz.aQute.bnd.reporter.maven.dto,\ + biz.aQute.bnd.reporter.plugins.entries.bundle,\ + biz.aQute.bnd.reporter.plugins.entries.bundle,\ + biz.aQute.bnd.reporter.service.resource.converter -conditionalpackage: \ aQute.lib.*,\ diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/component/dto/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/component/dto/package-info.java new file mode 100644 index 0000000000..3f8245820b --- /dev/null +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/component/dto/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version("1.0.0") +package biz.aQute.bnd.reporter.component.dto; diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/gogo/dto/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/gogo/dto/package-info.java new file mode 100644 index 0000000000..d8cb767539 --- /dev/null +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/gogo/dto/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version("1.0.0") +package biz.aQute.bnd.reporter.gogo.dto; diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/maven/dto/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/maven/dto/package-info.java new file mode 100644 index 0000000000..a5b2b58dbd --- /dev/null +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/maven/dto/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version("1.0.0") +package biz.aQute.bnd.reporter.maven.dto; diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java index 536046937a..d51a1a2acf 100644 --- a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java @@ -81,7 +81,7 @@ public ComponentsPlugin() { } @Override - public Object extract(final Jar jar, final Locale locale) throws Exception { + public List extract(final Jar jar, final Locale locale) throws Exception { Objects.requireNonNull(jar, "jar"); Objects.requireNonNull(locale, "locale"); diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java index 4538dd46ff..57d7e9fbee 100644 --- a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java @@ -31,7 +31,7 @@ public MavenCoordinatePlugin() { } @Override - public Object extract(final Jar jar, final Locale locale) { + public MavenCoordinatesDTO extract(final Jar jar, final Locale locale) { Objects.requireNonNull(jar, "jar"); Objects.requireNonNull(locale, "locale"); diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java index a4a9b2be62..9e378bb34d 100644 --- a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java @@ -74,7 +74,7 @@ public MetatypesPlugin() { } @Override - public Object extract(final Jar jar, final Locale locale) throws Exception { + public List extract(final Jar jar, final Locale locale) throws Exception { Objects.requireNonNull(jar, "jar"); Objects.requireNonNull(locale, "locale"); diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/package-info.java new file mode 100644 index 0000000000..1e568e4fd6 --- /dev/null +++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version("1.0.0") +package biz.aQute.bnd.reporter.plugins.entries.bundle;