From f5a5207bf61e23de4980ecf1459ddac66f7ff06e Mon Sep 17 00:00:00 2001
From: Stefan Bischof <stbischof@bipolis.org>
Date: Mon, 17 Jun 2024 19:21:07 +0200
Subject: [PATCH] [OSGi] add @Export and use bnd-maven-plugin

bnd-maven-plugin calculates the Manifest (also used for all OSGi.
Specifications and Implementations)

@Export Annotation in package-info.java define the packages that should
be exported.

All Import-Packages also are calculated by bnd.

Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
---
 .../jasperreports/compilers/package-info.java |  1 +
 .../headertoolbar/package-info.java           | 25 ++++++++++
 .../components/iconlabel/package-info.java    |  1 +
 .../components/items/fill/package-info.java   |  1 +
 .../components/items/package-info.java        |  1 +
 .../components/list/package-info.java         |  1 +
 .../components/package-info.java              |  1 +
 .../components/sort/package-info.java         | 25 ++++++++++
 .../subreport/fill/package-info.java          |  1 +
 .../components/subreport/package-info.java    |  1 +
 .../components/table/fill/package-info.java   |  1 +
 .../components/table/package-info.java        |  1 +
 .../components/table/util/package-info.java   |  1 +
 .../crosstabs/base/package-info.java          |  1 +
 .../crosstabs/design/package-info.java        |  1 +
 .../fill/calculation/package-info.java        |  1 +
 .../crosstabs/fill/package-info.java          |  1 +
 .../crosstabs/interactive/package-info.java   |  1 +
 .../jasperreports/crosstabs/package-info.java |  1 +
 .../crosstabs/type/package-info.java          |  1 +
 .../data/cache/package-info.java              |  1 +
 .../sf/jasperreports/data/package-info.java   | 25 ++++++++++
 .../engine/analytics/data/package-info.java   | 25 ++++++++++
 .../analytics/dataset/package-info.java       | 25 ++++++++++
 .../engine/base/package-info.java             |  1 +
 .../engine/component/package-info.java        |  1 +
 .../engine/convert/package-info.java          | 25 ++++++++++
 .../engine/data/package-info.java             |  1 +
 .../engine/design/events/package-info.java    | 25 ++++++++++
 .../engine/design/package-info.java           |  1 +
 .../engine/export/data/package-info.java      |  1 +
 .../engine/export/draw/package-info.java      |  1 +
 .../engine/export/oasis/package-info.java     |  1 +
 .../engine/export/ooxml/package-info.java     |  1 +
 .../export/ooxml/type/package-info.java       |  1 +
 .../engine/export/package-info.java           |  1 +
 .../engine/export/tabulator/package-info.java | 25 ++++++++++
 .../engine/export/type/package-info.java      |  1 +
 .../engine/export/zip/package-info.java       |  1 +
 .../engine/fill/events/package-info.java      | 25 ++++++++++
 .../engine/fill/package-info.java             |  1 +
 .../engine/fonts/package-info.java            |  1 +
 .../sf/jasperreports/engine/package-info.java |  1 +
 .../engine/part/package-info.java             | 25 ++++++++++
 .../engine/print/package-info.java            |  1 +
 .../engine/query/package-info.java            |  1 +
 .../engine/scriptlets/package-info.java       |  1 +
 .../engine/style/package-info.java            |  1 +
 .../engine/type/package-info.java             |  1 +
 .../engine/util/package-info.java             |  1 +
 .../engine/util/text/package-info.java        | 25 ++++++++++
 .../engine/util/xml/package-info.java         |  1 +
 .../engine/virtualization/package-info.java   |  1 +
 .../engine/xml/package-info.java              |  1 +
 .../engine/xml/print/package-info.java        | 25 ++++++++++
 .../export/annotations/package-info.java      |  1 +
 .../sf/jasperreports/export/package-info.java |  1 +
 .../export/type/package-info.java             |  1 +
 .../extensions/package-info.java              |  1 +
 .../functions/annotations/package-info.java   |  1 +
 .../jasperreports/functions/package-info.java |  1 +
 .../jasperreports/governors/package-info.java |  1 +
 .../jackson/repo/package-info.java            | 25 ++++++++++
 .../jackson/type/package-info.java            | 25 ++++++++++
 .../jackson/util/package-info.java            | 25 ++++++++++
 .../sf/jasperreports/parts/package-info.java  | 25 ++++++++++
 .../parts/subreport/package-info.java         | 25 ++++++++++
 .../properties/package-info.java              | 25 ++++++++++
 .../jasperreports/renderers/package-info.java |  1 +
 .../renderers/util/package-info.java          |  1 +
 .../sf/jasperreports/repo/package-info.java   |  1 +
 .../sf/jasperreports/search/package-info.java |  1 +
 .../sf/jasperreports/swing/package-info.java  |  1 +
 .../types/date/package-info.java              |  1 +
 .../sf/jasperreports/util/package-info.java   |  1 +
 .../sf/jasperreports/view/package-info.java   |  1 +
 .../jasperreports/view/save/package-info.java |  1 +
 .../web/actions/package-info.java             |  1 +
 .../sf/jasperreports/web/package-info.java    |  1 +
 .../web/servlets/package-info.java            |  1 +
 .../jasperreports/web/util/package-info.java  |  1 +
 core/src/main/resources/META-INF/MANIFEST.MF  |  1 -
 .../sf/jasperreports/ant/package-info.java    |  1 +
 .../jasperreports/barbecue/package-info.java  |  1 +
 .../jasperreports/barcode4j/package-info.java |  1 +
 .../data/excel/package-info.java              | 25 ++++++++++
 .../jasperreports/data/http/package-info.java | 25 ++++++++++
 .../jasperreports/data/jdbc/package-info.java | 25 ++++++++++
 .../jasperreports/data/json/package-info.java | 25 ++++++++++
 .../sf/jasperreports/data/package-info.java   | 25 ++++++++++
 .../sf/jasperreports/repo/package-info.java   | 25 ++++++++++
 .../sf/jasperreports/util/package-info.java   | 25 ++++++++++
 .../customizers/axis/package-info.java        | 25 ++++++++++
 .../customizers/marker/package-info.java      | 25 ++++++++++
 .../customizers/package-info.java             | 25 ++++++++++
 .../customizers/shape/package-info.java       | 25 ++++++++++
 .../customizers/type/package-info.java        | 25 ++++++++++
 .../customizers/util/package-info.java        | 25 ++++++++++
 .../chartthemes/package-info.java             | 25 ++++++++++
 .../simple/handlers/package-info.java         | 25 ++++++++++
 .../chartthemes/simple/package-info.java      | 25 ++++++++++
 .../chartthemes/spring/package-info.java      | 25 ++++++++++
 .../charts/base/package-info.java             |  1 +
 .../charts/convert/package-info.java          | 25 ++++++++++
 .../charts/design/package-info.java           |  1 +
 .../charts/fill/package-info.java             |  1 +
 .../sf/jasperreports/charts/package-info.java |  1 +
 .../charts/renderers/package-info.java        | 25 ++++++++++
 .../charts/type/package-info.java             |  1 +
 .../charts/util/package-info.java             |  1 +
 .../components/charts/package-info.java       |  1 +
 .../components/spiderchart/package-info.java  |  1 +
 .../spiderchart/type/package-info.java        |  1 +
 .../sf/jasperreports/chrome/package-info.java | 25 ++++++++++
 .../dataadapters/http/package-info.java       | 25 ++++++++++
 .../jasperreports/data/bean/package-info.java |  1 +
 .../jasperreports/data/csv/package-info.java  |  1 +
 .../jasperreports/data/ds/package-info.java   |  1 +
 .../data/ejbql/package-info.java              |  1 +
 .../data/empty/package-info.java              |  1 +
 .../data/excel/package-info.java              |  1 +
 .../data/hibernate/package-info.java          |  1 +
 .../data/hibernate/spring/package-info.java   |  1 +
 .../jasperreports/data/jdbc/package-info.java |  1 +
 .../jasperreports/data/jndi/package-info.java |  1 +
 .../jasperreports/data/json/package-info.java |  1 +
 .../data/mondrian/package-info.java           |  1 +
 .../data/provider/package-info.java           |  1 +
 .../jasperreports/data/qe/package-info.java   |  1 +
 .../data/random/package-info.java             |  1 +
 .../jasperreports/data/xls/package-info.java  |  1 +
 .../jasperreports/data/xlsx/package-info.java |  1 +
 .../jasperreports/data/xml/package-info.java  |  1 +
 .../jasperreports/data/xmla/package-info.java |  1 +
 .../dataadapters/package-info.java            |  1 +
 .../dataadapters/properties/package-info.java | 25 ++++++++++
 .../dataadapters/repo/package-info.java       | 25 ++++++++++
 .../j2ee/ejbql/package-info.java              | 25 ++++++++++
 .../jakarta/ejbql/package-info.java           | 25 ++++++++++
 .../components/iconlabel/package-info.java    | 25 ++++++++++
 .../jasperreports/poi/data/package-info.java  | 25 ++++++++++
 .../poi/export/package-info.java              | 25 ++++++++++
 .../sf/jasperreports/poi/package-info.java    | 25 ++++++++++
 .../jasperreports/poi/query/package-info.java | 25 ++++++++++
 .../poi/view/save/package-info.java           | 25 ++++++++++
 .../jasperreports/fastexcel/package-info.java | 25 ++++++++++
 .../functions/standard/package-info.java      | 25 ++++++++++
 .../components/map/fill/package-info.java     |  1 +
 .../map/imageprovider/package-info.java       | 25 ++++++++++
 .../components/map/package-info.java          |  1 +
 .../components/map/type/package-info.java     |  1 +
 .../sf/jasperreports/groovy/package-info.java | 25 ++++++++++
 .../j2ee/hibernate/package-info.java          | 25 ++++++++++
 .../jasperreports/hibernate/package-info.java | 25 ++++++++++
 .../interactivity/actions/package-info.java   | 25 ++++++++++
 .../interactivity/commands/package-info.java  |  1 +
 .../interactivity/crosstabs/package-info.java | 25 ++++++++++
 .../headertoolbar/actions/package-info.java   |  1 +
 .../headertoolbar/json/package-info.java      |  1 +
 .../headertoolbar/package-info.java           |  1 +
 .../interactivity/search/package-info.java    | 25 ++++++++++
 .../sort/actions/package-info.java            |  1 +
 .../interactivity/sort/package-info.java      |  1 +
 .../interactivity/util/package-info.java      | 25 ++++++++++
 .../javascript/package-info.java              | 25 ++++++++++
 .../jaxen/data/package-info.java              | 25 ++++++++++
 .../jaxen/query/package-info.java             | 25 ++++++++++
 .../jaxen/util/xml/package-info.java          | 25 ++++++++++
 .../sf/jasperreports/jdt/package-info.java    | 25 ++++++++++
 .../jasperreports/json/data/package-info.java | 25 ++++++++++
 .../json/export/package-info.java             | 25 ++++++++++
 .../filter/evaluation/package-info.java       | 25 ++++++++++
 .../json/expression/filter/package-info.java  | 25 ++++++++++
 .../member/evaluation/package-info.java       | 25 ++++++++++
 .../json/expression/member/package-info.java  | 25 ++++++++++
 .../json/expression/package-info.java         | 25 ++++++++++
 .../sf/jasperreports/json/package-info.java   | 25 ++++++++++
 .../json/parser/package-info.java             | 25 ++++++++++
 .../json/query/package-info.java              | 25 ++++++++++
 .../jasperreports/json/util/package-info.java | 25 ++++++++++
 .../olap/mapping/package-info.java            |  1 +
 .../olap/mondrian/package-info.java           |  1 +
 .../olap/olap4j/package-info.java             |  1 +
 .../sf/jasperreports/olap/package-info.java   |  1 +
 .../olap/result/package-info.java             |  1 +
 .../jasperreports/olap/xmla/package-info.java |  1 +
 .../pdf/classic/package-info.java             | 25 ++++++++++
 .../pdf/common/package-info.java              | 25 ++++++++++
 .../components/iconlabel/package-info.java    | 25 ++++++++++
 .../sf/jasperreports/pdf/package-info.java    | 25 ++++++++++
 .../jasperreports/pdf/type/package-info.java  | 25 ++++++++++
 .../jasperreports/pdf/util/package-info.java  | 25 ++++++++++
 .../pdf/view/save/package-info.java           | 25 ++++++++++
 ext/pom-parent.xml                            | 10 ----
 .../j2ee/servlets/package-info.java           |  1 +
 .../jakarta/servlets/package-info.java        |  1 +
 .../jakarta/web/package-info.java             | 25 ++++++++++
 .../components/sort/package-info.java         | 25 ++++++++++
 .../sf/jasperreports/spring/package-info.java | 25 ++++++++++
 .../velocity/util/package-info.java           | 25 ++++++++++
 .../xalan/data/package-info.java              | 25 ++++++++++
 .../xalan/query/package-info.java             | 25 ++++++++++
 .../xalan/util/package-info.java              | 25 ++++++++++
 pom-parent.xml                                | 47 +++++++++++++++++++
 .../documentation/package-info.java           | 25 ++++++++++
 .../processors/properties/package-info.java   | 25 ++++++++++
 tools/metadata/pom.xml                        | 10 ----
 .../annotations/properties/package-info.java  | 25 ++++++++++
 .../metadata/properties/package-info.java     | 25 ++++++++++
 209 files changed, 2484 insertions(+), 21 deletions(-)
 create mode 100644 core/src/main/java/net/sf/jasperreports/components/headertoolbar/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/components/sort/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/data/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/analytics/data/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/analytics/dataset/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/convert/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/design/events/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/export/tabulator/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/fill/events/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/part/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/util/text/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/engine/xml/print/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/jackson/repo/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/jackson/type/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/jackson/util/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/parts/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/parts/subreport/package-info.java
 create mode 100644 core/src/main/java/net/sf/jasperreports/properties/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/data/excel/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/data/http/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/data/json/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/data/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/repo/package-info.java
 create mode 100644 ext/castor/src/main/java/net/sf/jasperreports/util/package-info.java
 create mode 100644 ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/axis/package-info.java
 create mode 100644 ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/marker/package-info.java
 create mode 100644 ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/package-info.java
 create mode 100644 ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/shape/package-info.java
 create mode 100644 ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/type/package-info.java
 create mode 100644 ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/util/package-info.java
 create mode 100644 ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/package-info.java
 create mode 100644 ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/handlers/package-info.java
 create mode 100644 ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/package-info.java
 create mode 100644 ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/package-info.java
 create mode 100644 ext/charts/src/main/java/net/sf/jasperreports/charts/convert/package-info.java
 create mode 100644 ext/charts/src/main/java/net/sf/jasperreports/charts/renderers/package-info.java
 create mode 100644 ext/chrome/src/main/java/net/sf/jasperreports/chrome/package-info.java
 create mode 100644 ext/data-adapters-http/src/main/java/net/sf/jasperreports/dataadapters/http/package-info.java
 create mode 100644 ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/properties/package-info.java
 create mode 100644 ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/repo/package-info.java
 create mode 100644 ext/ejbql-j2ee/src/main/java/net/sf/jasperreports/j2ee/ejbql/package-info.java
 create mode 100644 ext/ejbql/src/main/java/net/sf/jasperreports/jakarta/ejbql/package-info.java
 create mode 100644 ext/excel-poi/src/main/java/net/sf/jasperreports/poi/components/iconlabel/package-info.java
 create mode 100644 ext/excel-poi/src/main/java/net/sf/jasperreports/poi/data/package-info.java
 create mode 100644 ext/excel-poi/src/main/java/net/sf/jasperreports/poi/export/package-info.java
 create mode 100644 ext/excel-poi/src/main/java/net/sf/jasperreports/poi/package-info.java
 create mode 100644 ext/excel-poi/src/main/java/net/sf/jasperreports/poi/query/package-info.java
 create mode 100644 ext/excel-poi/src/main/java/net/sf/jasperreports/poi/view/save/package-info.java
 create mode 100644 ext/fastexcel/src/main/java/net/sf/jasperreports/fastexcel/package-info.java
 create mode 100644 ext/functions/src/main/java/net/sf/jasperreports/functions/standard/package-info.java
 create mode 100644 ext/google-maps/src/main/java/net/sf/jasperreports/components/map/imageprovider/package-info.java
 create mode 100644 ext/groovy/src/main/java/net/sf/jasperreports/groovy/package-info.java
 create mode 100644 ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/package-info.java
 create mode 100644 ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/package-info.java
 create mode 100644 ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/actions/package-info.java
 create mode 100644 ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/crosstabs/package-info.java
 create mode 100644 ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/search/package-info.java
 create mode 100644 ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/util/package-info.java
 create mode 100644 ext/javascript/src/main/java/net/sf/jasperreports/javascript/package-info.java
 create mode 100644 ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/data/package-info.java
 create mode 100644 ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/query/package-info.java
 create mode 100644 ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/util/xml/package-info.java
 create mode 100644 ext/jdt/src/main/java/net/sf/jasperreports/jdt/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/data/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/export/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/evaluation/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/expression/member/evaluation/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/expression/member/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/expression/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/parser/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/query/package-info.java
 create mode 100644 ext/json/src/main/java/net/sf/jasperreports/json/util/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/classic/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/common/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/components/iconlabel/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/type/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/util/package-info.java
 create mode 100644 ext/pdf/src/main/java/net/sf/jasperreports/pdf/view/save/package-info.java
 create mode 100644 ext/servlets/src/main/java/net/sf/jasperreports/jakarta/web/package-info.java
 create mode 100644 ext/sort/src/main/java/net/sf/jasperreports/components/sort/package-info.java
 create mode 100644 ext/spring/src/main/java/net/sf/jasperreports/spring/package-info.java
 create mode 100644 ext/velocity/src/main/java/net/sf/jasperreports/velocity/util/package-info.java
 create mode 100644 ext/xalan/src/main/java/net/sf/jasperreports/xalan/data/package-info.java
 create mode 100644 ext/xalan/src/main/java/net/sf/jasperreports/xalan/query/package-info.java
 create mode 100644 ext/xalan/src/main/java/net/sf/jasperreports/xalan/util/package-info.java
 create mode 100644 tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/documentation/package-info.java
 create mode 100644 tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/processors/properties/package-info.java
 create mode 100644 tools/metadata/src/main/java/net/sf/jasperreports/annotations/properties/package-info.java
 create mode 100644 tools/metadata/src/main/java/net/sf/jasperreports/metadata/properties/package-info.java

diff --git a/core/src/main/java/net/sf/jasperreports/compilers/package-info.java b/core/src/main/java/net/sf/jasperreports/compilers/package-info.java
index 33674717d6..acc0e1c3e3 100644
--- a/core/src/main/java/net/sf/jasperreports/compilers/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/compilers/package-info.java
@@ -79,4 +79,5 @@
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
 
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.compilers;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/headertoolbar/package-info.java b/core/src/main/java/net/sf/jasperreports/components/headertoolbar/package-info.java
new file mode 100644
index 0000000000..e565f20fee
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/components/headertoolbar/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.components.headertoolbar;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/iconlabel/package-info.java b/core/src/main/java/net/sf/jasperreports/components/iconlabel/package-info.java
index 7bc7e619db..6908fe339b 100644
--- a/core/src/main/java/net/sf/jasperreports/components/iconlabel/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/iconlabel/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains classes for the built-in Icon Label component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.iconlabel;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/items/fill/package-info.java b/core/src/main/java/net/sf/jasperreports/components/items/fill/package-info.java
index 19c812ddc2..f047833144 100644
--- a/core/src/main/java/net/sf/jasperreports/components/items/fill/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/items/fill/package-info.java
@@ -25,4 +25,5 @@
 /**
  * Contains classes and interfaces for filling the item based components.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.items.fill;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/items/package-info.java b/core/src/main/java/net/sf/jasperreports/components/items/package-info.java
index ff2d31d77f..bcc076ec88 100644
--- a/core/src/main/java/net/sf/jasperreports/components/items/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/items/package-info.java
@@ -25,4 +25,5 @@
 /**
  * Contains classes and interfaces for the item based components.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.items;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/list/package-info.java b/core/src/main/java/net/sf/jasperreports/components/list/package-info.java
index d17b5a4c61..8fccbcd15a 100644
--- a/core/src/main/java/net/sf/jasperreports/components/list/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/list/package-info.java
@@ -61,4 +61,5 @@
 * not start rendering unless the space remaining on the page is at least the height of the 
 * element. 
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.list;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/package-info.java b/core/src/main/java/net/sf/jasperreports/components/package-info.java
index a0df4ce8d8..02043dd1f0 100644
--- a/core/src/main/java/net/sf/jasperreports/components/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/package-info.java
@@ -156,4 +156,5 @@
  * generated by the XChart library (<a href="http://knowm.org/open-source/xchart/">http://knowm.org/open-source/xchart/</a>).</li>
  * </ul>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/sort/package-info.java b/core/src/main/java/net/sf/jasperreports/components/sort/package-info.java
new file mode 100644
index 0000000000..3289baa6b3
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/components/sort/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.components.sort;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/subreport/fill/package-info.java b/core/src/main/java/net/sf/jasperreports/components/subreport/fill/package-info.java
index f86cee83d4..506ed26a33 100644
--- a/core/src/main/java/net/sf/jasperreports/components/subreport/fill/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/subreport/fill/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains fill time implementations for subreport component related interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.subreport.fill;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/subreport/package-info.java b/core/src/main/java/net/sf/jasperreports/components/subreport/package-info.java
index a54f8e4dce..4d39686430 100644
--- a/core/src/main/java/net/sf/jasperreports/components/subreport/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/subreport/package-info.java
@@ -78,4 +78,5 @@
 * dataset. 
 * </p>
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.subreport;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/table/fill/package-info.java b/core/src/main/java/net/sf/jasperreports/components/table/fill/package-info.java
index a9d8b4eac2..6dad8f5258 100644
--- a/core/src/main/java/net/sf/jasperreports/components/table/fill/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/table/fill/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains fill time implementations for Table component related interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.table.fill;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/table/package-info.java b/core/src/main/java/net/sf/jasperreports/components/table/package-info.java
index 18254366a5..8e19723019 100644
--- a/core/src/main/java/net/sf/jasperreports/components/table/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/table/package-info.java
@@ -78,4 +78,5 @@
 * dataset. 
 * </p>
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.table;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/components/table/util/package-info.java b/core/src/main/java/net/sf/jasperreports/components/table/util/package-info.java
index 10348a97ae..b25bd4c66b 100644
--- a/core/src/main/java/net/sf/jasperreports/components/table/util/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/components/table/util/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains utility classes for the built-in Table component.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.table.util;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/base/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/base/package-info.java
index a116198f2d..cf3ffab422 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/base/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/base/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains base classes for the Crosstab report element.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs.base;
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/design/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/design/package-info.java
index 8d3f5ad46d..9e6d2efdaf 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/design/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/design/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains design classes for the Crosstab report element.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs.design;
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/fill/calculation/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/fill/calculation/package-info.java
index d6bbf2b5b7..0dc545cd46 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/fill/calculation/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/fill/calculation/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes to be used in crosstab calculations at report filling time.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs.fill.calculation;
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/fill/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/fill/package-info.java
index 83435216bc..fc473e1c47 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/fill/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/fill/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes to be used at report filling time for the Crosstab report element.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs.fill;
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/interactive/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/interactive/package-info.java
index beab31c534..69ce0444f0 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/interactive/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/interactive/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for the Crosstab element interactivity.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs.interactive;
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/package-info.java
index fd73edea3a..cb98ed834f 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/package-info.java
@@ -320,4 +320,5 @@
  * empty space.
  * </p>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs;
diff --git a/core/src/main/java/net/sf/jasperreports/crosstabs/type/package-info.java b/core/src/main/java/net/sf/jasperreports/crosstabs/type/package-info.java
index 240f9e063a..77d535a332 100644
--- a/core/src/main/java/net/sf/jasperreports/crosstabs/type/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/crosstabs/type/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains <code>enum</code> types used by the Crosstab element.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.crosstabs.type;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/data/cache/package-info.java b/core/src/main/java/net/sf/jasperreports/data/cache/package-info.java
index c1104eb77e..34782bdb36 100644
--- a/core/src/main/java/net/sf/jasperreports/data/cache/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/data/cache/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for data caching.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.cache;
diff --git a/core/src/main/java/net/sf/jasperreports/data/package-info.java b/core/src/main/java/net/sf/jasperreports/data/package-info.java
new file mode 100644
index 0000000000..d32779cf8f
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2023 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.data;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/analytics/data/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/analytics/data/package-info.java
new file mode 100644
index 0000000000..ccbb1c32b6
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/analytics/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.analytics.data;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/analytics/dataset/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/analytics/dataset/package-info.java
new file mode 100644
index 0000000000..1e6494fa5a
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/analytics/dataset/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.analytics.dataset;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/base/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/base/package-info.java
index 17d88aea88..6967037fcc 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/base/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/base/package-info.java
@@ -26,4 +26,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.base;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/component/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/component/package-info.java
index 7b1cff1441..83fed9df2b 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/component/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/component/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides interfaces and base classes for the built-in JasperReports component functionality.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.component;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/convert/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/convert/package-info.java
new file mode 100644
index 0000000000..f8134f4a8b
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/convert/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.convert;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/data/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/data/package-info.java
index 502b3486d0..b8390daf2d 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/data/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/data/package-info.java
@@ -368,4 +368,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.data;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/design/events/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/design/events/package-info.java
new file mode 100644
index 0000000000..682c62d9d8
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/design/events/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.design.events;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/design/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/design/package-info.java
index b43405893c..205e4c0758 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/design/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/design/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.design;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/data/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/data/package-info.java
index 73ade18859..56afccb8fc 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/data/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/data/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for handling data types at export time. 
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.data;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/draw/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/draw/package-info.java
index a94d9aced7..94fec9532b 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/draw/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/draw/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for drawing elements at export time. 
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.draw;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/oasis/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/oasis/package-info.java
index 940931b01f..fa45dfad44 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/oasis/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/oasis/package-info.java
@@ -26,5 +26,6 @@
  * ODT and ODS. Classes in this package are based on the OASIS Open Document Format for Office Applications 
  * (<a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office</a>).
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.oasis;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/package-info.java
index 9646e77855..e0a110bcba 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/package-info.java
@@ -25,5 +25,6 @@
  * Provides utility classes for exporting reports to Office Open XML Format, such as 
  * DOCX, XLSX and PPTX.  
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.ooxml;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/type/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/type/package-info.java
index 757273f93f..3ae704928b 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/type/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/ooxml/type/package-info.java
@@ -25,5 +25,6 @@
  * Contains <code>enum</code> types used when exporting reports to Office Open XML Format, such as 
  * DOCX, XLSX and PPTX.  
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.ooxml.type;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/package-info.java
index 60628ab1f0..f4c069d5d1 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/package-info.java
@@ -342,5 +342,6 @@
  * @see net.sf.jasperreports.export.ExporterOutput
  * @see net.sf.jasperreports.export.ReportExportConfiguration
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/tabulator/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/tabulator/package-info.java
new file mode 100644
index 0000000000..3d2239a502
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/tabulator/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.export.tabulator;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/type/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/type/package-info.java
index a672d39305..764192aaae 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/type/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/type/package-info.java
@@ -24,5 +24,6 @@
 /**
  * Contains <code>enum</code> types used when exporting reports to various output formats.  
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.type;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/export/zip/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/export/zip/package-info.java
index f53a54b40d..75a75d3175 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/export/zip/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/export/zip/package-info.java
@@ -24,5 +24,6 @@
 /**
  * Provides utility classes used when exporting reports to compressed output formats such as DOCX, XLSX, PPTX.  
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.export.zip;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/fill/events/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/fill/events/package-info.java
new file mode 100644
index 0000000000..5b2336a903
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/fill/events/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.fill.events;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/fill/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/fill/package-info.java
index 1b8e6dd8ff..342765d8dc 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/fill/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/fill/package-info.java
@@ -259,4 +259,5 @@
  * @see net.sf.jasperreports.engine.util.JRLoader
  * @see net.sf.jasperreports.engine.util.JRSwapFile
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.fill;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/fonts/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/fonts/package-info.java
index 45892a3b3e..1ab4e15bd8 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/fonts/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/fonts/package-info.java
@@ -194,4 +194,5 @@
  * 
  * @see net.sf.jasperreports.engine.util.JRFontNotFoundException
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.fonts;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/package-info.java
index d615ff5ae2..cc7ac3e9ca 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/part/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/part/package-info.java
new file mode 100644
index 0000000000..96c964a4b6
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/part/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.part;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/print/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/print/package-info.java
index a371cf2aa0..13cbb4adb4 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/print/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/print/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.print;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/query/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/query/package-info.java
index 50bfa5294c..e6bfd112bd 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/query/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/query/package-info.java
@@ -431,5 +431,6 @@
  * @see net.sf.jasperreports.olap.JRMondrianQueryExecuterFactory
  * @see net.sf.jasperreports.olap.xmla.JRXmlaQueryExecuterFactory
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.query;
 
diff --git a/core/src/main/java/net/sf/jasperreports/engine/scriptlets/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/scriptlets/package-info.java
index 3c9d22142d..87fcdde068 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/scriptlets/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/scriptlets/package-info.java
@@ -141,4 +141,5 @@
  * @see net.sf.jasperreports.governors.MaxPagesGovernor
  * @see net.sf.jasperreports.governors.TimeoutGovernor
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.scriptlets;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/style/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/style/package-info.java
index f41958cfc9..6eb1d5da05 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/style/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/style/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.style;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/type/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/type/package-info.java
index 59ca9f1e53..891c836e27 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/type/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/type/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.type;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/util/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/util/package-info.java
index f3e46ff4cb..a412f2d3f4 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/util/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/util/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.util;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/util/text/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/util/text/package-info.java
new file mode 100644
index 0000000000..90a53e2897
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/util/text/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.util.text;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/engine/util/xml/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/util/xml/package-info.java
index fc37401012..435e499158 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/util/xml/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/util/xml/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.util.xml;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/virtualization/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/virtualization/package-info.java
index b17b9afc76..51e83b9e7d 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/virtualization/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/virtualization/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.virtualization;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/xml/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/xml/package-info.java
index 956e36cfa9..f5a7f73809 100644
--- a/core/src/main/java/net/sf/jasperreports/engine/xml/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/engine/xml/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.engine.xml;
diff --git a/core/src/main/java/net/sf/jasperreports/engine/xml/print/package-info.java b/core/src/main/java/net/sf/jasperreports/engine/xml/print/package-info.java
new file mode 100644
index 0000000000..e31df7e82c
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/engine/xml/print/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.engine.xml.print;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/export/annotations/package-info.java b/core/src/main/java/net/sf/jasperreports/export/annotations/package-info.java
index ed40fc5937..7b585fed08 100644
--- a/core/src/main/java/net/sf/jasperreports/export/annotations/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/export/annotations/package-info.java
@@ -26,4 +26,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.export.annotations;
diff --git a/core/src/main/java/net/sf/jasperreports/export/package-info.java b/core/src/main/java/net/sf/jasperreports/export/package-info.java
index dcd8e24a82..2680d077a1 100644
--- a/core/src/main/java/net/sf/jasperreports/export/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/export/package-info.java
@@ -114,4 +114,5 @@
  * @see net.sf.jasperreports.engine.JasperPrint
  * @see net.sf.jasperreports.engine.JRAbstractExporter
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.export;
diff --git a/core/src/main/java/net/sf/jasperreports/export/type/package-info.java b/core/src/main/java/net/sf/jasperreports/export/type/package-info.java
index 04b3b5ac4d..7a90adb668 100644
--- a/core/src/main/java/net/sf/jasperreports/export/type/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/export/type/package-info.java
@@ -26,4 +26,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.export.type;
diff --git a/core/src/main/java/net/sf/jasperreports/extensions/package-info.java b/core/src/main/java/net/sf/jasperreports/extensions/package-info.java
index 929e0e3a1c..d2677fbea1 100644
--- a/core/src/main/java/net/sf/jasperreports/extensions/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/extensions/package-info.java
@@ -135,4 +135,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.extensions;
diff --git a/core/src/main/java/net/sf/jasperreports/functions/annotations/package-info.java b/core/src/main/java/net/sf/jasperreports/functions/annotations/package-info.java
index eeb7a7a48e..9359fbd91a 100644
--- a/core/src/main/java/net/sf/jasperreports/functions/annotations/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/functions/annotations/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides annotations for built-in JasperReports functions.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.functions.annotations;
diff --git a/core/src/main/java/net/sf/jasperreports/functions/package-info.java b/core/src/main/java/net/sf/jasperreports/functions/package-info.java
index aceb477ff6..ace23920f1 100644
--- a/core/src/main/java/net/sf/jasperreports/functions/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/functions/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for built-in JasperReports functions.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.functions;
diff --git a/core/src/main/java/net/sf/jasperreports/governors/package-info.java b/core/src/main/java/net/sf/jasperreports/governors/package-info.java
index c5d9a20650..8e1c1d93f8 100644
--- a/core/src/main/java/net/sf/jasperreports/governors/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/governors/package-info.java
@@ -78,4 +78,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.governors;
diff --git a/core/src/main/java/net/sf/jasperreports/jackson/repo/package-info.java b/core/src/main/java/net/sf/jasperreports/jackson/repo/package-info.java
new file mode 100644
index 0000000000..24bf7a8cfa
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/jackson/repo/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jackson.repo;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/jackson/type/package-info.java b/core/src/main/java/net/sf/jasperreports/jackson/type/package-info.java
new file mode 100644
index 0000000000..025d46fcb4
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/jackson/type/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jackson.type;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/jackson/util/package-info.java b/core/src/main/java/net/sf/jasperreports/jackson/util/package-info.java
new file mode 100644
index 0000000000..ee75ecb511
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/jackson/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jackson.util;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/parts/package-info.java b/core/src/main/java/net/sf/jasperreports/parts/package-info.java
new file mode 100644
index 0000000000..da56613875
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/parts/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.parts;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/parts/subreport/package-info.java b/core/src/main/java/net/sf/jasperreports/parts/subreport/package-info.java
new file mode 100644
index 0000000000..325069c491
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/parts/subreport/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.parts.subreport;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/properties/package-info.java b/core/src/main/java/net/sf/jasperreports/properties/package-info.java
new file mode 100644
index 0000000000..026a691e56
--- /dev/null
+++ b/core/src/main/java/net/sf/jasperreports/properties/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.properties;
\ No newline at end of file
diff --git a/core/src/main/java/net/sf/jasperreports/renderers/package-info.java b/core/src/main/java/net/sf/jasperreports/renderers/package-info.java
index 67c99dd634..176241be3c 100644
--- a/core/src/main/java/net/sf/jasperreports/renderers/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/renderers/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.renderers;
diff --git a/core/src/main/java/net/sf/jasperreports/renderers/util/package-info.java b/core/src/main/java/net/sf/jasperreports/renderers/util/package-info.java
index 97af4fe13f..73391c1d6e 100644
--- a/core/src/main/java/net/sf/jasperreports/renderers/util/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/renderers/util/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains utility classes for working with image renderers.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.renderers.util;
diff --git a/core/src/main/java/net/sf/jasperreports/repo/package-info.java b/core/src/main/java/net/sf/jasperreports/repo/package-info.java
index a5058b6fee..0bc450e7b0 100644
--- a/core/src/main/java/net/sf/jasperreports/repo/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/repo/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.repo;
diff --git a/core/src/main/java/net/sf/jasperreports/search/package-info.java b/core/src/main/java/net/sf/jasperreports/search/package-info.java
index e289ef22cc..b2b00061ba 100644
--- a/core/src/main/java/net/sf/jasperreports/search/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/search/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.search;
diff --git a/core/src/main/java/net/sf/jasperreports/swing/package-info.java b/core/src/main/java/net/sf/jasperreports/swing/package-info.java
index 857fcf1eba..5df1c0cd23 100644
--- a/core/src/main/java/net/sf/jasperreports/swing/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/swing/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.swing;
diff --git a/core/src/main/java/net/sf/jasperreports/types/date/package-info.java b/core/src/main/java/net/sf/jasperreports/types/date/package-info.java
index 9f7865785e..44054eba2c 100644
--- a/core/src/main/java/net/sf/jasperreports/types/date/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/types/date/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.types.date;
diff --git a/core/src/main/java/net/sf/jasperreports/util/package-info.java b/core/src/main/java/net/sf/jasperreports/util/package-info.java
index 0f47abc5a2..8e11e4bec5 100644
--- a/core/src/main/java/net/sf/jasperreports/util/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/util/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.util;
diff --git a/core/src/main/java/net/sf/jasperreports/view/package-info.java b/core/src/main/java/net/sf/jasperreports/view/package-info.java
index 2a7167bdbd..74c2147f6d 100644
--- a/core/src/main/java/net/sf/jasperreports/view/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/view/package-info.java
@@ -118,4 +118,5 @@
  * 
  * @see net.sf.jasperreports.view.JRHyperlinkListener
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.view;
diff --git a/core/src/main/java/net/sf/jasperreports/view/save/package-info.java b/core/src/main/java/net/sf/jasperreports/view/save/package-info.java
index a71eaf8bad..3e307359b8 100644
--- a/core/src/main/java/net/sf/jasperreports/view/save/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/view/save/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.view.save;
diff --git a/core/src/main/java/net/sf/jasperreports/web/actions/package-info.java b/core/src/main/java/net/sf/jasperreports/web/actions/package-info.java
index 55c9624af2..ce417bb3c0 100644
--- a/core/src/main/java/net/sf/jasperreports/web/actions/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/web/actions/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.web.actions;
diff --git a/core/src/main/java/net/sf/jasperreports/web/package-info.java b/core/src/main/java/net/sf/jasperreports/web/package-info.java
index f548a0fc32..fc0008918d 100644
--- a/core/src/main/java/net/sf/jasperreports/web/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/web/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.web;
diff --git a/core/src/main/java/net/sf/jasperreports/web/servlets/package-info.java b/core/src/main/java/net/sf/jasperreports/web/servlets/package-info.java
index ac62ffe867..911ba0026f 100644
--- a/core/src/main/java/net/sf/jasperreports/web/servlets/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/web/servlets/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.web.servlets;
diff --git a/core/src/main/java/net/sf/jasperreports/web/util/package-info.java b/core/src/main/java/net/sf/jasperreports/web/util/package-info.java
index 373d178cee..c3562e7585 100644
--- a/core/src/main/java/net/sf/jasperreports/web/util/package-info.java
+++ b/core/src/main/java/net/sf/jasperreports/web/util/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.web.util;
diff --git a/core/src/main/resources/META-INF/MANIFEST.MF b/core/src/main/resources/META-INF/MANIFEST.MF
index eaf75c1268..9a281a76e3 100644
--- a/core/src/main/resources/META-INF/MANIFEST.MF
+++ b/core/src/main/resources/META-INF/MANIFEST.MF
@@ -32,7 +32,6 @@ Export-Package: net.sf.jasperreports.compilers,
  net.sf.jasperreports.crosstabs.fill.calculation,
  net.sf.jasperreports.crosstabs.interactive,
  net.sf.jasperreports.crosstabs.type,
- net.sf.jasperreports.crosstabs.xml,
  net.sf.jasperreports.data,
  net.sf.jasperreports.data.cache,
  net.sf.jasperreports.engine,
diff --git a/ext/ant/src/main/java/net/sf/jasperreports/ant/package-info.java b/ext/ant/src/main/java/net/sf/jasperreports/ant/package-info.java
index 97ef7dae72..407a5df2b9 100644
--- a/ext/ant/src/main/java/net/sf/jasperreports/ant/package-info.java
+++ b/ext/ant/src/main/java/net/sf/jasperreports/ant/package-info.java
@@ -135,4 +135,5 @@
 * </ul>
 * 
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.ant;
\ No newline at end of file
diff --git a/ext/barbecue/src/main/java/net/sf/jasperreports/barbecue/package-info.java b/ext/barbecue/src/main/java/net/sf/jasperreports/barbecue/package-info.java
index ba44768cb8..28fa8f7a3a 100644
--- a/ext/barbecue/src/main/java/net/sf/jasperreports/barbecue/package-info.java
+++ b/ext/barbecue/src/main/java/net/sf/jasperreports/barbecue/package-info.java
@@ -73,4 +73,5 @@
 * scale type from the <code>RetainShape</code> attribute and its size from the <code>size</code> defined 
 * for the barcode element in the report. 
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.barbecue;
\ No newline at end of file
diff --git a/ext/barcode4j/src/main/java/net/sf/jasperreports/barcode4j/package-info.java b/ext/barcode4j/src/main/java/net/sf/jasperreports/barcode4j/package-info.java
index d7e148fb58..7e83297e6c 100644
--- a/ext/barcode4j/src/main/java/net/sf/jasperreports/barcode4j/package-info.java
+++ b/ext/barcode4j/src/main/java/net/sf/jasperreports/barcode4j/package-info.java
@@ -134,4 +134,5 @@
 * levels as the image producer property, to allow the customization of the generated image. 
 * </p>
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.barcode4j;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/data/excel/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/data/excel/package-info.java
new file mode 100644
index 0000000000..c56a50ad6d
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/data/excel/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.data.excel;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/data/http/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/data/http/package-info.java
new file mode 100644
index 0000000000..a06dc2f1fa
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/data/http/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.data.http;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java
new file mode 100644
index 0000000000..01c9deb300
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.data.jdbc;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/data/json/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/data/json/package-info.java
new file mode 100644
index 0000000000..4a915ebbab
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/data/json/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.data.json;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/data/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/data/package-info.java
new file mode 100644
index 0000000000..218a02e4a3
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.data;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/repo/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/repo/package-info.java
new file mode 100644
index 0000000000..4d904d8f5e
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/repo/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.repo;
\ No newline at end of file
diff --git a/ext/castor/src/main/java/net/sf/jasperreports/util/package-info.java b/ext/castor/src/main/java/net/sf/jasperreports/util/package-info.java
new file mode 100644
index 0000000000..0729302145
--- /dev/null
+++ b/ext/castor/src/main/java/net/sf/jasperreports/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.util;
\ No newline at end of file
diff --git a/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/axis/package-info.java b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/axis/package-info.java
new file mode 100644
index 0000000000..c61d1b8057
--- /dev/null
+++ b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/axis/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.customizers.axis;
\ No newline at end of file
diff --git a/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/marker/package-info.java b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/marker/package-info.java
new file mode 100644
index 0000000000..e89a68de69
--- /dev/null
+++ b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/marker/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.customizers.marker;
\ No newline at end of file
diff --git a/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/package-info.java b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/package-info.java
new file mode 100644
index 0000000000..97a329a476
--- /dev/null
+++ b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.customizers;
\ No newline at end of file
diff --git a/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/shape/package-info.java b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/shape/package-info.java
new file mode 100644
index 0000000000..3d62652775
--- /dev/null
+++ b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/shape/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.customizers.shape;
\ No newline at end of file
diff --git a/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/type/package-info.java b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/type/package-info.java
new file mode 100644
index 0000000000..72fb6c85d1
--- /dev/null
+++ b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/type/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.customizers.type;
\ No newline at end of file
diff --git a/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/util/package-info.java b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/util/package-info.java
new file mode 100644
index 0000000000..5a57ed2e13
--- /dev/null
+++ b/ext/chart-customizers/src/main/java/net/sf/jasperreports/customizers/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.customizers.util;
\ No newline at end of file
diff --git a/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/package-info.java b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/package-info.java
new file mode 100644
index 0000000000..c7a8c0e935
--- /dev/null
+++ b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.chartthemes;
\ No newline at end of file
diff --git a/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/handlers/package-info.java b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/handlers/package-info.java
new file mode 100644
index 0000000000..7945fdfcae
--- /dev/null
+++ b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/handlers/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.chartthemes.simple.handlers;
\ No newline at end of file
diff --git a/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/package-info.java b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/package-info.java
new file mode 100644
index 0000000000..4b4b461319
--- /dev/null
+++ b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/simple/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.chartthemes.simple;
\ No newline at end of file
diff --git a/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/package-info.java b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/package-info.java
new file mode 100644
index 0000000000..e4b30dedc7
--- /dev/null
+++ b/ext/chart-themes/src/main/java/net/sf/jasperreports/chartthemes/spring/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.chartthemes.spring;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/base/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/base/package-info.java
index b7465de4e0..0dcc6b31e4 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/charts/base/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/base/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains base implementations for chart related interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.charts.base;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/convert/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/convert/package-info.java
new file mode 100644
index 0000000000..fe5e80149c
--- /dev/null
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/convert/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.charts.convert;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/design/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/design/package-info.java
index 5790577514..60ed17a04d 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/charts/design/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/design/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains design time implementations for chart related interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.charts.design;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/fill/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/fill/package-info.java
index f86cac2205..505d90a6da 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/charts/fill/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/fill/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains fill time implementations for chart related interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.charts.fill;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/package-info.java
index aab85f370c..d3c1a58a6d 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/charts/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/package-info.java
@@ -197,4 +197,5 @@
  * </dl>
  *  
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.charts;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/renderers/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/renderers/package-info.java
new file mode 100644
index 0000000000..5fd18c0358
--- /dev/null
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/renderers/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.charts.renderers;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/type/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/type/package-info.java
index 0d7bf4b6c7..aff514fea7 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/charts/type/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/type/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains <code>enum</code> types used by the built-in chart component.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.charts.type;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/charts/util/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/charts/util/package-info.java
index f285925be9..5cd9c2fb23 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/charts/util/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/charts/util/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains utility classes for complex chart customization.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.charts.util;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/components/charts/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/components/charts/package-info.java
index d2cb7de052..d714f309c4 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/components/charts/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/components/charts/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains interfaces and base classes for the built-in Spider Chart component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.charts;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/package-info.java
index e034aeaa2a..6a9e23c79e 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains classes for the built-in Spider Chart component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.spiderchart;
\ No newline at end of file
diff --git a/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/type/package-info.java b/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/type/package-info.java
index a2cf536b78..037f520e44 100644
--- a/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/type/package-info.java
+++ b/ext/charts/src/main/java/net/sf/jasperreports/components/spiderchart/type/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains <code>enum</code> types used by the built-in Spider Chart component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.spiderchart.type;
\ No newline at end of file
diff --git a/ext/chrome/src/main/java/net/sf/jasperreports/chrome/package-info.java b/ext/chrome/src/main/java/net/sf/jasperreports/chrome/package-info.java
new file mode 100644
index 0000000000..b0554878e2
--- /dev/null
+++ b/ext/chrome/src/main/java/net/sf/jasperreports/chrome/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.chrome;
\ No newline at end of file
diff --git a/ext/data-adapters-http/src/main/java/net/sf/jasperreports/dataadapters/http/package-info.java b/ext/data-adapters-http/src/main/java/net/sf/jasperreports/dataadapters/http/package-info.java
new file mode 100644
index 0000000000..b3bb505852
--- /dev/null
+++ b/ext/data-adapters-http/src/main/java/net/sf/jasperreports/dataadapters/http/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.dataadapters.http;
\ No newline at end of file
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/bean/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/bean/package-info.java
index 21a1ccaae8..91556ed5bb 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/bean/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/bean/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for bean data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.bean;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/csv/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/csv/package-info.java
index a81c5c73d4..be13d09caa 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/csv/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/csv/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for CSV data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.csv;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ds/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ds/package-info.java
index b17975dfe7..dbe9ba4e7f 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ds/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ds/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for custom data source data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.ds;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ejbql/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ejbql/package-info.java
index d228836717..db3799f323 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ejbql/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/ejbql/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for EJB QL data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.ejbql;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/empty/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/empty/package-info.java
index 76ebb4a0eb..06def40aff 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/empty/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/empty/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for empty data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.empty;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/excel/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/excel/package-info.java
index 137fc308d8..47fd435d34 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/excel/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/excel/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for Excel data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.excel;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/package-info.java
index 77419e068e..ab49962612 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for Hibernate data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.hibernate;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/spring/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/spring/package-info.java
index 1e78d00615..9525013c02 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/spring/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/hibernate/spring/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for Spring Hibernate data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.hibernate.spring;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java
index a3e0d8332e..f9df619ab0 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jdbc/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for JDBC data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.jdbc;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jndi/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jndi/package-info.java
index 5f253284d6..8e098e56c5 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jndi/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/jndi/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for JNDI data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.jndi;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/json/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/json/package-info.java
index 5a1df85f9b..96986f4494 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/json/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/json/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for JSON data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.json;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/mondrian/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/mondrian/package-info.java
index d01a29b09d..af129241b5 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/mondrian/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/mondrian/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for Mondrian data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.mondrian;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/provider/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/provider/package-info.java
index 23926ff08f..9009df6939 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/provider/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/provider/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for data adapters for data source providers.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.provider;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/qe/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/qe/package-info.java
index 05cc14d04f..c72eb11c5a 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/qe/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/qe/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for query executer data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.qe;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/random/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/random/package-info.java
index edd2e9684b..913aeb07e8 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/random/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/random/package-info.java
@@ -25,4 +25,5 @@
  * Contains classes for empty data adapters.
  * @author Veaceslav Chicu (schicu@users.sourceforge.net)
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.random;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xls/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xls/package-info.java
index 6c8343cb56..8e4c20ea83 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xls/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xls/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for Excel 2003 data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.xls;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xlsx/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xlsx/package-info.java
index ae6082201e..404f8ce316 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xlsx/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xlsx/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for Excel 2007 data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.xlsx;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xml/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xml/package-info.java
index 597544e766..4d0f534bba 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xml/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xml/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for XML data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.xml;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xmla/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xmla/package-info.java
index b71590112c..686061b988 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xmla/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/data/xmla/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for XML/A data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.data.xmla;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/package-info.java
index e61a758c6b..4d6398bef5 100644
--- a/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/package-info.java
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains classes for data adapters.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.dataadapters;
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/properties/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/properties/package-info.java
new file mode 100644
index 0000000000..d96e8b2390
--- /dev/null
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/properties/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.dataadapters.properties;
\ No newline at end of file
diff --git a/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/repo/package-info.java b/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/repo/package-info.java
new file mode 100644
index 0000000000..d323af6826
--- /dev/null
+++ b/ext/data-adapters/src/main/java/net/sf/jasperreports/dataadapters/repo/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.dataadapters.repo;
\ No newline at end of file
diff --git a/ext/ejbql-j2ee/src/main/java/net/sf/jasperreports/j2ee/ejbql/package-info.java b/ext/ejbql-j2ee/src/main/java/net/sf/jasperreports/j2ee/ejbql/package-info.java
new file mode 100644
index 0000000000..78dd89f410
--- /dev/null
+++ b/ext/ejbql-j2ee/src/main/java/net/sf/jasperreports/j2ee/ejbql/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.j2ee.ejbql;
\ No newline at end of file
diff --git a/ext/ejbql/src/main/java/net/sf/jasperreports/jakarta/ejbql/package-info.java b/ext/ejbql/src/main/java/net/sf/jasperreports/jakarta/ejbql/package-info.java
new file mode 100644
index 0000000000..3d67febfe5
--- /dev/null
+++ b/ext/ejbql/src/main/java/net/sf/jasperreports/jakarta/ejbql/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jakarta.ejbql;
\ No newline at end of file
diff --git a/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/components/iconlabel/package-info.java b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/components/iconlabel/package-info.java
new file mode 100644
index 0000000000..a3e159122f
--- /dev/null
+++ b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/components/iconlabel/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.poi.components.iconlabel;
\ No newline at end of file
diff --git a/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/data/package-info.java b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/data/package-info.java
new file mode 100644
index 0000000000..8723d7055a
--- /dev/null
+++ b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.poi.data;
\ No newline at end of file
diff --git a/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/export/package-info.java b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/export/package-info.java
new file mode 100644
index 0000000000..c06e4969b4
--- /dev/null
+++ b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/export/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.poi.export;
\ No newline at end of file
diff --git a/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/package-info.java b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/package-info.java
new file mode 100644
index 0000000000..132fd45671
--- /dev/null
+++ b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.poi;
\ No newline at end of file
diff --git a/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/query/package-info.java b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/query/package-info.java
new file mode 100644
index 0000000000..7b610ac84d
--- /dev/null
+++ b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/query/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.poi.query;
\ No newline at end of file
diff --git a/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/view/save/package-info.java b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/view/save/package-info.java
new file mode 100644
index 0000000000..26e686f342
--- /dev/null
+++ b/ext/excel-poi/src/main/java/net/sf/jasperreports/poi/view/save/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.poi.view.save;
\ No newline at end of file
diff --git a/ext/fastexcel/src/main/java/net/sf/jasperreports/fastexcel/package-info.java b/ext/fastexcel/src/main/java/net/sf/jasperreports/fastexcel/package-info.java
new file mode 100644
index 0000000000..c6748fed52
--- /dev/null
+++ b/ext/fastexcel/src/main/java/net/sf/jasperreports/fastexcel/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.fastexcel;
\ No newline at end of file
diff --git a/ext/functions/src/main/java/net/sf/jasperreports/functions/standard/package-info.java b/ext/functions/src/main/java/net/sf/jasperreports/functions/standard/package-info.java
new file mode 100644
index 0000000000..6656214fd9
--- /dev/null
+++ b/ext/functions/src/main/java/net/sf/jasperreports/functions/standard/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.functions.standard;
\ No newline at end of file
diff --git a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/fill/package-info.java b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/fill/package-info.java
index 8e1205139f..9c8ab1d641 100644
--- a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/fill/package-info.java
+++ b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/fill/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains fill time implementations for Google Map component related interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.map.fill;
\ No newline at end of file
diff --git a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/imageprovider/package-info.java b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/imageprovider/package-info.java
new file mode 100644
index 0000000000..2f588ce35b
--- /dev/null
+++ b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/imageprovider/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.components.map.imageprovider;
\ No newline at end of file
diff --git a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/package-info.java b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/package-info.java
index 3b40ac5f16..3c3ce2c3ea 100644
--- a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/package-info.java
+++ b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains classes for the built-in Google Map component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.map;
\ No newline at end of file
diff --git a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/type/package-info.java b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/type/package-info.java
index b4a44ee8d6..66c555a84f 100644
--- a/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/type/package-info.java
+++ b/ext/google-maps/src/main/java/net/sf/jasperreports/components/map/type/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Contains <code>enum</code> types used by the built-in Google Map component.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.components.map.type;
\ No newline at end of file
diff --git a/ext/groovy/src/main/java/net/sf/jasperreports/groovy/package-info.java b/ext/groovy/src/main/java/net/sf/jasperreports/groovy/package-info.java
new file mode 100644
index 0000000000..f97225e7c0
--- /dev/null
+++ b/ext/groovy/src/main/java/net/sf/jasperreports/groovy/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.groovy;
\ No newline at end of file
diff --git a/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/package-info.java b/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/package-info.java
new file mode 100644
index 0000000000..b828960730
--- /dev/null
+++ b/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.j2ee.hibernate;
\ No newline at end of file
diff --git a/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/package-info.java b/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/package-info.java
new file mode 100644
index 0000000000..e3692ac1de
--- /dev/null
+++ b/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.hibernate;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/actions/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/actions/package-info.java
new file mode 100644
index 0000000000..be82f22b7d
--- /dev/null
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/actions/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.interactivity.actions;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/commands/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/commands/package-info.java
index aaad2456ba..c4cc30e3c7 100644
--- a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/commands/package-info.java
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/commands/package-info.java
@@ -27,4 +27,5 @@
  * <h3>Related Documentation</h3>
  * <a href="http://community.jaspersoft.com/wiki/jasperreports-library-tutorial">JasperReports Tutorial</a>
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.interactivity.commands;
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/crosstabs/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/crosstabs/package-info.java
new file mode 100644
index 0000000000..d759abe1fc
--- /dev/null
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/crosstabs/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.interactivity.crosstabs;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/actions/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/actions/package-info.java
index aa8a32fe82..766a41c174 100644
--- a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/actions/package-info.java
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/actions/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains Action classes for the built-in Header Toolbar component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.interactivity.headertoolbar.actions;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/json/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/json/package-info.java
index 95e7bdcc63..3dee6d1301 100644
--- a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/json/package-info.java
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/json/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains utility classes for the built-in Header Toolbar component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.interactivity.headertoolbar.json;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/package-info.java
index cd6f5ffaac..157b36ad10 100644
--- a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/package-info.java
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/headertoolbar/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains classes for the built-in Header Toolbar component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.interactivity.headertoolbar;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/search/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/search/package-info.java
new file mode 100644
index 0000000000..4771955e95
--- /dev/null
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/search/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.interactivity.search;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/actions/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/actions/package-info.java
index 894a5100af..17dba892f3 100644
--- a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/actions/package-info.java
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/actions/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains Action classes for the built-in Sort component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.interactivity.sort.actions;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/package-info.java
index ea8f669e62..7fa6d2d81f 100644
--- a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/package-info.java
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/sort/package-info.java
@@ -25,4 +25,5 @@
 /**
 * Contains classes for the built-in Sort component.
 */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.interactivity.sort;
\ No newline at end of file
diff --git a/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/util/package-info.java b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/util/package-info.java
new file mode 100644
index 0000000000..8b7ced7288
--- /dev/null
+++ b/ext/interactivity/src/main/java/net/sf/jasperreports/interactivity/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.interactivity.util;
\ No newline at end of file
diff --git a/ext/javascript/src/main/java/net/sf/jasperreports/javascript/package-info.java b/ext/javascript/src/main/java/net/sf/jasperreports/javascript/package-info.java
new file mode 100644
index 0000000000..ebc8f5afd8
--- /dev/null
+++ b/ext/javascript/src/main/java/net/sf/jasperreports/javascript/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.javascript;
\ No newline at end of file
diff --git a/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/data/package-info.java b/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/data/package-info.java
new file mode 100644
index 0000000000..31f5c39599
--- /dev/null
+++ b/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jaxen.data;
\ No newline at end of file
diff --git a/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/query/package-info.java b/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/query/package-info.java
new file mode 100644
index 0000000000..46f69de6a7
--- /dev/null
+++ b/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/query/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jaxen.query;
\ No newline at end of file
diff --git a/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/util/xml/package-info.java b/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/util/xml/package-info.java
new file mode 100644
index 0000000000..ac9e135ae5
--- /dev/null
+++ b/ext/jaxen/src/main/java/net/sf/jasperreports/jaxen/util/xml/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jaxen.util.xml;
\ No newline at end of file
diff --git a/ext/jdt/src/main/java/net/sf/jasperreports/jdt/package-info.java b/ext/jdt/src/main/java/net/sf/jasperreports/jdt/package-info.java
new file mode 100644
index 0000000000..9613a8c58f
--- /dev/null
+++ b/ext/jdt/src/main/java/net/sf/jasperreports/jdt/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jdt;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/data/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/data/package-info.java
new file mode 100644
index 0000000000..dbda1ecf10
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.data;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/export/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/export/package-info.java
new file mode 100644
index 0000000000..ba90293355
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/export/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.export;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/evaluation/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/evaluation/package-info.java
new file mode 100644
index 0000000000..1e54988c70
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/evaluation/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.expression.filter.evaluation;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/package-info.java
new file mode 100644
index 0000000000..fdc1f0bcc8
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/expression/filter/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.expression.filter;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/expression/member/evaluation/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/expression/member/evaluation/package-info.java
new file mode 100644
index 0000000000..2d65be8d98
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/expression/member/evaluation/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.expression.member.evaluation;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/expression/member/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/expression/member/package-info.java
new file mode 100644
index 0000000000..6348392d9e
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/expression/member/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.expression.member;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/expression/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/expression/package-info.java
new file mode 100644
index 0000000000..fb5de5c370
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/expression/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.expression;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/package-info.java
new file mode 100644
index 0000000000..20595ab2df
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/parser/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/parser/package-info.java
new file mode 100644
index 0000000000..0b3944eda7
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/parser/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.parser;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/query/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/query/package-info.java
new file mode 100644
index 0000000000..331e161e3e
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/query/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.query;
\ No newline at end of file
diff --git a/ext/json/src/main/java/net/sf/jasperreports/json/util/package-info.java b/ext/json/src/main/java/net/sf/jasperreports/json/util/package-info.java
new file mode 100644
index 0000000000..1902d5e20a
--- /dev/null
+++ b/ext/json/src/main/java/net/sf/jasperreports/json/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.json.util;
\ No newline at end of file
diff --git a/ext/olap/src/main/java/net/sf/jasperreports/olap/mapping/package-info.java b/ext/olap/src/main/java/net/sf/jasperreports/olap/mapping/package-info.java
index 12d4375e7d..08350f93f7 100644
--- a/ext/olap/src/main/java/net/sf/jasperreports/olap/mapping/package-info.java
+++ b/ext/olap/src/main/java/net/sf/jasperreports/olap/mapping/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for OLAP field mapping.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.olap.mapping;
diff --git a/ext/olap/src/main/java/net/sf/jasperreports/olap/mondrian/package-info.java b/ext/olap/src/main/java/net/sf/jasperreports/olap/mondrian/package-info.java
index 4faffc328a..ec316cd49d 100644
--- a/ext/olap/src/main/java/net/sf/jasperreports/olap/mondrian/package-info.java
+++ b/ext/olap/src/main/java/net/sf/jasperreports/olap/mondrian/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for Mondrian result and hierarchy.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.olap.mondrian;
diff --git a/ext/olap/src/main/java/net/sf/jasperreports/olap/olap4j/package-info.java b/ext/olap/src/main/java/net/sf/jasperreports/olap/olap4j/package-info.java
index c2ed176023..901fe83b0d 100644
--- a/ext/olap/src/main/java/net/sf/jasperreports/olap/olap4j/package-info.java
+++ b/ext/olap/src/main/java/net/sf/jasperreports/olap/olap4j/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for Olap4J result and hierarchy.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.olap.olap4j;
diff --git a/ext/olap/src/main/java/net/sf/jasperreports/olap/package-info.java b/ext/olap/src/main/java/net/sf/jasperreports/olap/package-info.java
index 086de2288c..e0bacf23a4 100644
--- a/ext/olap/src/main/java/net/sf/jasperreports/olap/package-info.java
+++ b/ext/olap/src/main/java/net/sf/jasperreports/olap/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for OLAP data sources and query executers.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.olap;
diff --git a/ext/olap/src/main/java/net/sf/jasperreports/olap/result/package-info.java b/ext/olap/src/main/java/net/sf/jasperreports/olap/result/package-info.java
index 091f376e53..c84dd74a86 100644
--- a/ext/olap/src/main/java/net/sf/jasperreports/olap/result/package-info.java
+++ b/ext/olap/src/main/java/net/sf/jasperreports/olap/result/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for OLAP result and hierarchy.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.olap.result;
diff --git a/ext/olap/src/main/java/net/sf/jasperreports/olap/xmla/package-info.java b/ext/olap/src/main/java/net/sf/jasperreports/olap/xmla/package-info.java
index 2e938a5b55..533e3b2baa 100644
--- a/ext/olap/src/main/java/net/sf/jasperreports/olap/xmla/package-info.java
+++ b/ext/olap/src/main/java/net/sf/jasperreports/olap/xmla/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for XML/A query executer, result and hierarchy.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.olap.xmla;
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/classic/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/classic/package-info.java
new file mode 100644
index 0000000000..c317ae1b03
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/classic/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf.classic;
\ No newline at end of file
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/common/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/common/package-info.java
new file mode 100644
index 0000000000..2d327bc2a1
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/common/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf.common;
\ No newline at end of file
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/components/iconlabel/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/components/iconlabel/package-info.java
new file mode 100644
index 0000000000..5f152df380
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/components/iconlabel/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf.components.iconlabel;
\ No newline at end of file
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/package-info.java
new file mode 100644
index 0000000000..3b2424001c
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf;
\ No newline at end of file
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/type/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/type/package-info.java
new file mode 100644
index 0000000000..302b7d12f5
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/type/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf.type;
\ No newline at end of file
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/util/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/util/package-info.java
new file mode 100644
index 0000000000..1beef8adf7
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf.util;
\ No newline at end of file
diff --git a/ext/pdf/src/main/java/net/sf/jasperreports/pdf/view/save/package-info.java b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/view/save/package-info.java
new file mode 100644
index 0000000000..8f4b17f9ba
--- /dev/null
+++ b/ext/pdf/src/main/java/net/sf/jasperreports/pdf/view/save/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.pdf.view.save;
\ No newline at end of file
diff --git a/ext/pom-parent.xml b/ext/pom-parent.xml
index 9925453b2c..5bdac09472 100644
--- a/ext/pom-parent.xml
+++ b/ext/pom-parent.xml
@@ -72,16 +72,6 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
-				<configuration>
-					<archive>
-						<manifestFile>${project.build.directory}/classes/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/ext/servlets-j2ee/src/main/java/net/sf/jasperreports/j2ee/servlets/package-info.java b/ext/servlets-j2ee/src/main/java/net/sf/jasperreports/j2ee/servlets/package-info.java
index 2cffaddfd9..83b7d48ba9 100644
--- a/ext/servlets-j2ee/src/main/java/net/sf/jasperreports/j2ee/servlets/package-info.java
+++ b/ext/servlets-j2ee/src/main/java/net/sf/jasperreports/j2ee/servlets/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for built-in JasperReports servlets.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.j2ee.servlets;
diff --git a/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/servlets/package-info.java b/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/servlets/package-info.java
index a3c7d016d8..2280d372e2 100644
--- a/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/servlets/package-info.java
+++ b/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/servlets/package-info.java
@@ -24,4 +24,5 @@
 /**
  * Provides support for built-in JasperReports servlets.
  */
+@org.osgi.annotation.bundle.Export
 package net.sf.jasperreports.jakarta.servlets;
diff --git a/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/web/package-info.java b/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/web/package-info.java
new file mode 100644
index 0000000000..3bc6433163
--- /dev/null
+++ b/ext/servlets/src/main/java/net/sf/jasperreports/jakarta/web/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.jakarta.web;
\ No newline at end of file
diff --git a/ext/sort/src/main/java/net/sf/jasperreports/components/sort/package-info.java b/ext/sort/src/main/java/net/sf/jasperreports/components/sort/package-info.java
new file mode 100644
index 0000000000..3289baa6b3
--- /dev/null
+++ b/ext/sort/src/main/java/net/sf/jasperreports/components/sort/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.components.sort;
\ No newline at end of file
diff --git a/ext/spring/src/main/java/net/sf/jasperreports/spring/package-info.java b/ext/spring/src/main/java/net/sf/jasperreports/spring/package-info.java
new file mode 100644
index 0000000000..8310fe5940
--- /dev/null
+++ b/ext/spring/src/main/java/net/sf/jasperreports/spring/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.spring;
\ No newline at end of file
diff --git a/ext/velocity/src/main/java/net/sf/jasperreports/velocity/util/package-info.java b/ext/velocity/src/main/java/net/sf/jasperreports/velocity/util/package-info.java
new file mode 100644
index 0000000000..52e47d66c7
--- /dev/null
+++ b/ext/velocity/src/main/java/net/sf/jasperreports/velocity/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.velocity.util;
\ No newline at end of file
diff --git a/ext/xalan/src/main/java/net/sf/jasperreports/xalan/data/package-info.java b/ext/xalan/src/main/java/net/sf/jasperreports/xalan/data/package-info.java
new file mode 100644
index 0000000000..f2cface754
--- /dev/null
+++ b/ext/xalan/src/main/java/net/sf/jasperreports/xalan/data/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.xalan.data;
\ No newline at end of file
diff --git a/ext/xalan/src/main/java/net/sf/jasperreports/xalan/query/package-info.java b/ext/xalan/src/main/java/net/sf/jasperreports/xalan/query/package-info.java
new file mode 100644
index 0000000000..2b053dcfde
--- /dev/null
+++ b/ext/xalan/src/main/java/net/sf/jasperreports/xalan/query/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.xalan.query;
\ No newline at end of file
diff --git a/ext/xalan/src/main/java/net/sf/jasperreports/xalan/util/package-info.java b/ext/xalan/src/main/java/net/sf/jasperreports/xalan/util/package-info.java
new file mode 100644
index 0000000000..cdc66d7ff4
--- /dev/null
+++ b/ext/xalan/src/main/java/net/sf/jasperreports/xalan/util/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.xalan.util;
\ No newline at end of file
diff --git a/pom-parent.xml b/pom-parent.xml
index 33bde30cd9..229ad56a5a 100644
--- a/pom-parent.xml
+++ b/pom-parent.xml
@@ -147,6 +147,14 @@
 			<url>https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases</url>
 		</repository>
 	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.annotation.bundle</artifactId>
+			<version>2.0.0</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -203,6 +211,45 @@
 				<artifactId>maven-install-plugin</artifactId>
 				<version>${maven-install-plugin.version}</version>
 			</plugin>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<version>6.4.0</version>
+				<executions>
+					<execution>
+						<id>bnd-process</id>
+						<goals>
+							<goal>bnd-process</goal>
+						</goals>
+						<configuration><bnd><![CDATA[ 
+						Built-By: ${project.organization.name}
+						Specification-Title: ${project.name}
+						Specification-Version: ${project.version}
+						Specification-Vendor: ${project.organization.name}
+						Implementation-Title: net.sf.jasperreports.engine
+						Implementation-Version: ${project.version}-${buildNumber}
+						Implementation-Vendor: ${project.organization.name}
+						Bundle-Name: ${project.name}
+						Bundle-Version: ${project.version}
+						Bundle-Vendor: ${project.organization.name}
+						Bundle-ClassPath: .
+						DynamicImport-Package: *
+						-noextraheaders: true
+						-reproducible: true
+						]]></bnd></configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>${maven-jar-plugin.version}</version>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
diff --git a/tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/documentation/package-info.java b/tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/documentation/package-info.java
new file mode 100644
index 0000000000..88ff3cede4
--- /dev/null
+++ b/tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/documentation/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.annotations.documentation;
\ No newline at end of file
diff --git a/tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/processors/properties/package-info.java b/tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/processors/properties/package-info.java
new file mode 100644
index 0000000000..d0d3a77758
--- /dev/null
+++ b/tools/annotation-processors/src/main/java/net/sf/jasperreports/annotations/processors/properties/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.annotations.processors.properties;
\ No newline at end of file
diff --git a/tools/metadata/pom.xml b/tools/metadata/pom.xml
index fc67bdb29e..6bc664f4da 100644
--- a/tools/metadata/pom.xml
+++ b/tools/metadata/pom.xml
@@ -65,16 +65,6 @@
 					<compilerArgument>-Xlint:deprecation,-unchecked,-options</compilerArgument>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
-				<configuration>
-					<archive>
-						<manifestFile>${project.build.directory}/classes/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/tools/metadata/src/main/java/net/sf/jasperreports/annotations/properties/package-info.java b/tools/metadata/src/main/java/net/sf/jasperreports/annotations/properties/package-info.java
new file mode 100644
index 0000000000..863c2eedc7
--- /dev/null
+++ b/tools/metadata/src/main/java/net/sf/jasperreports/annotations/properties/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.annotations.properties;
\ No newline at end of file
diff --git a/tools/metadata/src/main/java/net/sf/jasperreports/metadata/properties/package-info.java b/tools/metadata/src/main/java/net/sf/jasperreports/metadata/properties/package-info.java
new file mode 100644
index 0000000000..b7695e63d4
--- /dev/null
+++ b/tools/metadata/src/main/java/net/sf/jasperreports/metadata/properties/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * JasperReports - Free Java Reporting Library.
+ * Copyright (C) 2001 - 2024 Cloud Software Group, Inc. All rights reserved.
+ * http://www.jaspersoft.com
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of JasperReports.
+ *
+ * JasperReports is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JasperReports is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ */
+@org.osgi.annotation.bundle.Export
+package net.sf.jasperreports.metadata.properties;
\ No newline at end of file