Merge pull request #5394 from stbischof/open_reporter

open bnd.reporter for external use
bndtools · Oct 14, 2022 · 1414370 · 1414370
2 parents 31f140a + fc22db5
commit 1414370
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+package biz.aQute.bnd.reporter.maven.dto;
diff --git a/...Qute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java b/...Qute.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<ComponentDescriptionDTO> extract(final Jar jar, final Locale locale) throws Exception {
 		Objects.requireNonNull(jar, "jar");
 		Objects.requireNonNull(locale, "locale");
 

diff --git a/...bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java b/...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/...aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java b/...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<ObjectClassDefinitionDTO> 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
@@ -0,0 +1,2 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+package biz.aQute.bnd.reporter.plugins.entries.bundle;