Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ tomcat
ide
.idea
.cloud-setup
openjrs-sample-backups
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,17 @@
tomcat/
ide/
/.env
/docker/local/__pycache__/
/openjrs-sample-backups/
/.cloud-setup/
__pycache__/
*.py[cod]
*.swp
*.swo
*.bak
*.orig
*.rej
*~
.env.local
.jrsks
.jrsksp
keystore.init.properties
2 changes: 1 addition & 1 deletion MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Maintainers and reviewers remain responsible for deciding which changes are acce

## Branching and release safety

The legacy working baseline and the JasperReports 7.1.0 migration are maintained separately. Do not merge experimental engine upgrades or rename compatibility-sensitive internals as part of the public-facing branding change.
The active `master` branch uses JasperReports 7.1.0 and native JR7 reports. The historical JR 6.20.3 baseline remains on `feature/jasperreports-7-migration` for comparison. Prepare new changes from `master`, keep unrelated migrations separate and preserve compatibility-sensitive internal identifiers. See [integration history and release checks](MERGING.md).

Before a production-oriented release, resolve known build integrity exceptions, verify third-party license obligations, assess security exposure of legacy dependencies, and run functional regression testing beyond the current CI smoke suite.

Expand Down
68 changes: 41 additions & 27 deletions MERGING.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,48 @@
# OpenJRS Server — PR integration and release checks

The baseline, engine migration and branding are independent review scopes.
Keep a PR in Draft until its maintainers authorize integration; CI success
does not itself authorize a merge or a production release.

| PR | Base | Scope | Integration condition |
| --- | --- | --- | --- |
| [#1](https://github.com/rftd/jasperreports-server-ce/pull/1) | `master` | Recover the historical Java 8 / JR 6.20.3 build and runtime baseline | Review the baseline and its diagnostic integrity exceptions |
| [#3](https://github.com/rftd/jasperreports-server-ce/pull/3) | `master` | OpenJRS documentation and public UI identity | Review branding, notices and locale/browser checks against the baseline |
| [#2](https://github.com/rftd/jasperreports-server-ce/pull/2) | `master` | JR 7.1.0 engine, exports and Community viewer/component compatibility | Revalidate the combined tree and keep unresolved compatibility/release gates explicit |

The integration order is #1, #3, then #2. After the baseline reaches `master`,
target the remaining PRs at `master` and verify that their diffs contain only
their intended changes. Update each remaining branch with the integrated base
and rerun its checks before merging it. This validates the engine together with
the OpenJRS interface. Preserve the original branches for comparison; do not
copy engine changes into the branding PR just to combine the branches.

The engine branch's [validated CI run](https://github.com/rftd/jasperreports-server-ce/actions/runs/39871809564)
covers REST PDF/XLSX, login, HTML/pagination/zoom/search/hyperlinks, table
sort/filter/undo/redo and Community visualization rendering. This does not
establish full coverage of formatting, crosstab interaction, drill-down,
scheduling, historical JRXML structures or compiled `.jasper` compatibility.
# OpenJRS Server — integration and release checks

## Integrated changes

The following PRs are merged and included in `master`:

| PR | Scope |
| --- | --- |
| [#1](https://github.com/rftd/jasperreports-server-ce/pull/1) | Historical Java 8 / JR 6.20.3 build and runtime baseline |
| [#3](https://github.com/rftd/jasperreports-server-ce/pull/3) | OpenJRS documentation and public UI identity |
| [#2](https://github.com/rftd/jasperreports-server-ce/pull/2) | JR 7.1.0 engine and Community viewer/component integration |
| [#4](https://github.com/rftd/jasperreports-server-ce/pull/4) | Local Docker Compose environment |
| [#5](https://github.com/rftd/jasperreports-server-ce/pull/5) | Removal of the Jaspersoft vendor heartbeat |
| [#6](https://github.com/rftd/jasperreports-server-ce/pull/6) | Native JR7 Community reports, removal of the JR6 adapter, Table/Map fixes and OpenStreetMap |

PRs #6, #5 and #4 were integrated in that order through their stacked bases.
The resulting `master` commit
[`927e53a5`](https://github.com/rftd/jasperreports-server-ce/commit/927e53a57759da1cba43b22dba7338028eeadd9f)
has the same source tree as the tested PR #6 head. The historical JR 6.20.3
baseline remains available on `feature/jasperreports-7-migration`.

The combined tree passed [Legacy full build](https://github.com/rftd/jasperreports-server-ce/actions/runs/40007634169)
and [Local Docker environment](https://github.com/rftd/jasperreports-server-ce/actions/runs/40007633970).
Coverage includes frontend/WAR, authentication, REST PDF/XLSX, branding, viewer
pagination/zoom/search/hyperlinks, interactive table sort/filter/undo/redo,
native employee/Foodmart MDX reports, Table/Map drilldown, map image exports,
heartbeat removal, persistence/key protection and sandboxed Chromium visualizations.
The local Docker installation was also confirmed functional. This does not
establish full coverage of formatting, crosstab interaction, scheduling or all
user-authored report/component types. JR6 sources and compiled `.jasper` files
require explicit migration; PDF accessibility remains deferred.

## Future changes and release checks

Prepare new changes on branches based on `master`, with reviewable scope and
appropriate checks. Keep PRs in Draft until integration is authorized; passing
CI alone does not authorize a merge or a production release. See
[MIGRATION.md](MIGRATION.md) for report-format changes and existing-install updates.

Before a production release, resolve the SiteMesh provenance/integrity
difference and review all enumerated dependency changes. The production
Buildomatic inventory stays strict; the CI diagnostic allowance is not
production approval. Preserve upstream copyright, license and third-party
notices, and review the independent project name before a public release.

Rebranding does not change `/jasperserver`, Maven/Java package identities,
database names, report formats, authentication, or the platform toolchain.
A new viewer, frontend framework or build system belongs in later PRs.
Keep `/jasperserver`, Maven/Java package identities, database names and the
Java 8 / Node 14 / Tomcat 9 / PostgreSQL 14 toolchain stable in unrelated changes.
A new viewer, frontend framework or build system belongs in separate PRs.
62 changes: 23 additions & 39 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,58 +107,42 @@ general audit of every possible external connection or third-party extension.

Upstream copyright and license notices remain in place.

> Historical build-recovery notes. See the [project README](README.md#current-status) for current branch status and verified tests. The JasperReports 7.1.0 migration is maintained separately in [PR #2](https://github.com/rftd/jasperreports-server-ce/pull/2).
## Build and dependency integrity

This branch starts with **build recovery**, not a JasperReports 7 runtime upgrade. The current application and its saved reports must remain unchanged until the original build is reproducible.
The historical JR 6.20.3 baseline and the JR 7.1.0 migration are integrated into
`master`; see [integration history and release checks](MERGING.md). The current
build still uses Java 8, Maven/Ant, Node.js 14, Yarn Classic, Tomcat 9 and
PostgreSQL 14. Use the [Docker guide](docker/local/README.md) for the tested local
setup and the [backend guide](jasperserver/README.md) for inherited manual tasks.

## Baseline observed in the source

- Server parent: `jasperserver/pom.xml` (24 Maven modules); Java compiler targets 8.
- JasperReports engine: 6.20.3; Spring 5.3.26; Spring Security 5.7.2; Hibernate 5.6.11.Final.
- Web UI: `jasperserver-ui/ce`, Lerna 3 / Yarn Classic, with archived Git dependencies.
- Original build flow requires publishing the web UI overlay into the local Maven repository before `buildomatic/js-ant build-all-ce`.
- `jasperserver/settings.xml` configures an HTTP Maven mirror, which needs separate verification and remediation.

## Restore historical private frontend dependencies

The UI manifests reference `git@git.jaspersoft.com` (no longer assumed accessible). The source tree also has ten corresponding archived source snapshots in `jasperserver-ui/ce/yarn-offline-mirror`. The bootstrap below validates and extracts those snapshots locally, then temporarily rewrites only the matching `package.json` references to local `file:` paths.

From the **repository root**:
The frontend still depends on archived source snapshots of former private Git
packages. From the repository root, the bootstrap verifies and prepares them:

```bash
python3 scripts/prepare-legacy-frontend.py --check
python3 scripts/prepare-legacy-frontend.py --prepare
cd jasperserver-ui/ce
yarn install --no-lockfile
# Once dependencies resolve: yarn run clean && yarn run build
cd ../..
python3 scripts/prepare-legacy-frontend.py --restore
```

**Important limitations:**

- The archived snapshots cover the historical private Git dependencies only. Other packages still require access to public npm registries or an existing Yarn cache; this is **not a complete offline installation**.
- Use Python 3.9+ and a legacy-compatible Node/Yarn toolchain (the original UI README identifies Node 14 and Yarn Classic 1.22). This is for build recovery only; do not deploy an unsupported Node version to production.
- `--no-lockfile` avoids changing the original Yarn lockfile during this diagnostic run. Do not commit generated lockfiles or temporarily rewritten manifests.
- `--restore` restores byte-for-byte manifest backups; the generated `.legacy-private-deps` directory is ignored by Git.
- The archive verifier rejects links and path traversal. Review the vendor packages and their licenses before redistribution. The script does not imply that they are security-patched.
- If the bootstrap fails, stop and record the error; do not proceed to JasperReports 7 or Jakarta EE migration yet.

## Build gates for the next phases

1. Verify the historical frontend install and compile (and publish its `jrs-ui` overlay).
2. Resolve the legacy Maven artifact repositories and compile all original server modules without changing engine versions.
3. Provision a disposable PostgreSQL/Tomcat 9 environment and run smoke tests for authentication, repository navigation, PDF/XLSX exports, parameters, schedules, REST endpoints, and security.
4. Establish tests and a compatibility matrix for JasperReports 6 → 7 report compilation, import/export and persistence.
5. Only then move JasperReports and platform upgrades in separate reviewable changes.

**No build, deployment or functional smoke test has been executed by this initial preflight patch.**
Build with the pinned Node/Yarn toolchain and publish the UI overlay before the
backend build, as shown in the Dockerfile and CI workflows. Restore the temporary
manifest rewrites with `python3 scripts/prepare-legacy-frontend.py --restore`;
do not commit rewritten manifests or generated dependencies. These archives are
not a complete offline installation: public npm/Maven dependencies are still
required. The bootstrap rejects archive links and path traversal and preserves
original manifests for restoration.

Both workflows exercise the combined engine and interface. Diagnostic CI accepts
only the enumerated dependency coordinates and hashes after the original strict
Buildomatic inventory reports its expected differences. This does not approve
the SiteMesh discrepancy or other dependency changes for production. Production
release review must also cover licensing, legacy dependency security and broader
functional regression testing.

## MongoDB connector removal (JasperReports 7 migration)

The legacy Jaspersoft MongoDB adapter (`com.jaspersoft.connectors.mongodb:js-mongodb-datasource:3.10.2`) is **not included** in this OpenJRS migration. Jaspersoft clarified in [jasperreports#578](https://github.com/Jaspersoft/jasperreports/issues/578) that the MongoDB connector is no longer included with the Community Edition from version 7 onward. The legacy connector is incompatible with the moved JasperReports 7 adapter APIs.

The experimental branch removes the proprietary adapter dependency, its connector module, example classes, Spring bean registrations, and the temporary compatibility shims. **Do not assume that existing MongoDB-backed reports will work after upgrading.** MongoDB JDBC-related source code and configuration are separate from this adapter and remain for independent review; a driver might still be required for that path. The original baseline is preserved on its own branch.
OpenJRS removes the proprietary adapter dependency, its connector module, example classes, Spring bean registrations, and the temporary compatibility shims. **Do not assume that existing MongoDB-backed reports will work after upgrading.** MongoDB JDBC-related source code and configuration are separate from this adapter and remain for independent review; a driver might still be required for that path. The original baseline is preserved on its own branch.

The historical WAR checksum inventory and diagnostic exception must be revisited deliberately after this dependency removal; a changed WAR inventory is not automatically a successful or production-approved build.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This is a **work-in-progress modernization fork**, not a certified production-re
| Functional smoke tests | CI verifies REST authentication, PDF/XLSX exports, viewer controls, interactive tables, Community visualizations and the OpenJRS interface |
| Current reporting engine | **JasperReports Library 7.1.0, experimental**; broader compatibility and dependency integrity remain under review |

This development tree includes the baseline recovered in [PR #1](https://github.com/rftd/jasperreports-server-ce/pull/1), the OpenJRS identity from [PR #3](https://github.com/rftd/jasperreports-server-ce/pull/3), and the experimental engine migration from [PR #2](https://github.com/rftd/jasperreports-server-ce/pull/2). Integration does not constitute a production release. The original JR 6.20.3 baseline remains available on `feature/jasperreports-7-migration`.
The `master` branch includes the recovered baseline, OpenJRS identity, JR 7.1.0 engine, local Docker environment, vendor heartbeat removal and native JR7 Community reports from merged PRs #1–#6. See [integration history and verified coverage](MERGING.md). Integration does not constitute a production release. The original JR 6.20.3 baseline remains available on `feature/jasperreports-7-migration`.

### AI-assisted maintenance

Expand Down Expand Up @@ -65,7 +65,7 @@ OpenJRS Server builds on pre-existing code. **Original copyright and license not

The independent name **OpenJRS Server does not remove or replace any upstream copyright, license, trademark, or attribution obligations**. This README is not a substitute for the licenses associated with individual files or dependencies.

See [BRANDING.md](BRANDING.md) for identity and attribution conventions, and [MERGING.md](MERGING.md) for the PR integration order and outstanding release gates.
See [BRANDING.md](BRANDING.md) for identity and attribution conventions, and [MERGING.md](MERGING.md) for integration history and outstanding release gates.

## Contributions and support

Expand Down
4 changes: 2 additions & 2 deletions README.pt-BR.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ O OpenJRS Server **ainda não é uma substituição pronta para produção**.
| Testes funcionais | CI valida autenticação REST, PDF/XLSX, controles do viewer, tabelas interativas, visualizações Community e a interface OpenJRS |
| Motor atual | **JasperReports Library 7.1.0, experimental**; compatibilidade ampliada e integridade das dependências seguem em revisão |

Esta árvore de desenvolvimento reúne a recuperação da base do [PR #1](https://github.com/rftd/jasperreports-server-ce/pull/1), a identidade OpenJRS do [PR #3](https://github.com/rftd/jasperreports-server-ce/pull/3) e a migração experimental do motor do [PR #2](https://github.com/rftd/jasperreports-server-ce/pull/2). A integração não constitui uma versão de produção. A base original com JR 6.20.3 permanece na branch `feature/jasperreports-7-migration`.
A branch `master` reúne a base recuperada, a identidade OpenJRS, o motor JR 7.1.0, o ambiente Docker local, a remoção do heartbeat e os exemplos Community nativos do JR7 dos PRs #1–#6, já mesclados. Veja o [histórico de integração e a cobertura validada](MERGING.md). A integração não constitui uma versão de produção. A base original com JR 6.20.3 permanece na branch `feature/jasperreports-7-migration`.

## Manutenção assistida por IA

Expand Down Expand Up @@ -58,7 +58,7 @@ A presença de ferramentas legadas sem suporte e a aprovação no CI **não equi

O código é derivado de um projeto existente. **Os avisos de copyright, autoria e licença originais devem ser preservados.** Os cabeçalhos de arquivos originais identificam a licença GNU AGPL, versão 3 ou posterior, salvo licenciamento comercial separado. Componentes de terceiros podem ter outras licenças e exigências de redistribuição.

O nome OpenJRS Server **não modifica nem elimina** essas obrigações. Veja [BRANDING.md](BRANDING.md) e a [ordem de integração dos PRs](MERGING.md).
O nome OpenJRS Server **não modifica nem elimina** essas obrigações. Veja [BRANDING.md](BRANDING.md) e o [histórico de integração e as pendências para lançamento](MERGING.md).

## Contribuições

Expand Down
4 changes: 0 additions & 4 deletions jasperserver/.arcconfig

This file was deleted.

13 changes: 0 additions & 13 deletions jasperserver/buildomatic/bin/code-coverage.xml
Original file line number Diff line number Diff line change
Expand Up @@ -437,19 +437,6 @@
</sourcefiles>
</group>

<group name="ce:jasperserver-connectors/mongodb-connector">
<classfiles>
<fileset dir="${js-path}/jasperserver-connectors/mongodb-connector">
<include name="target/classes/com/jaspersoft/**/*.class"/>
</fileset>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${js-path}/jasperserver-connectors/mongodb-connector">
<include name="src/main/java/com/jaspersoft/**/*.java"/>
</fileset>
</sourcefiles>
</group>

<group name="ce:jasperserver-action-model">
<classfiles>
<fileset dir="${js-path}/jasperserver-action-model">
Expand Down
7 changes: 1 addition & 6 deletions jasperserver/buildomatic/jacoco.coverage.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@
"jrsVersion" : "ce",
"instructionCoveredRatio" : 0.0,
"branchCoveredRatio" : 0.0
}, {
"moduleName" : "jasperserver-connectors/mongodb-connector",
"jrsVersion" : "ce",
"instructionCoveredRatio" : 0.0,
"branchCoveredRatio" : 0.0
}, {
"moduleName" : "jasperserver-core-util",
"jrsVersion" : "ce",
Expand Down Expand Up @@ -256,4 +251,4 @@
"jrsVersion" : "pro",
"instructionCoveredRatio" : 0.26,
"branchCoveredRatio" : 0.2
} ]
} ]
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public void rejectsJr6SyntaxInsteadOfConvertingIt() throws Exception {
public void loadsStandaloneExamplesAndProductionFixturesInNativeFormat() throws Exception {
Path root = Paths.get("..");
int reports = 0;
for (String directory : new String[] {"samples", "production-tests/src/test/resources", "jasperserver-remote-tests/src/test/resources", "jasperserver-remote-tests/test-backup", "jasperserver-war-jar/src/test/resources"}) {
for (String directory : new String[] {"samples", "production-tests/src/test/resources", "jasperserver-remote-tests/src/test/resources", "jasperserver-war-jar/src/test/resources"}) {
try (java.util.stream.Stream<Path> files = Files.walk(root.resolve(directory))) {
for (Path file : (Iterable<Path>) files.filter(p -> p.toString().endsWith(".jrxml"))::iterator) {
byte[] data = Files.readAllBytes(file);
Expand All @@ -268,7 +268,7 @@ public void loadsStandaloneExamplesAndProductionFixturesInNativeFormat() throws
}
}
}
assertEquals(53, reports);
assertEquals(51, reports);
}

@Test
Expand Down
Loading
Loading