diff --git a/README.md b/README.md index e3b8fa9..e9b5ed2 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Production gates still include volume/retained-storage restore; isolated compile | Directory | Artifact | Notes | | --- | --- | --- | | `foundation` | `com.kingsrook.qbits:qbit-document-generation` | Metadata, services, ports and schema. Depends on QQQ core only (RDBMS optional). | -| `renderer/vendor/openhtml-1.1.105-qqq-p1` | `com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1` | LGPL-2.1-or-later patched OpenHTML (one file differs from upstream 1.1.105), built from the tracked source with its notices; the renderer depends on it. | +| `renderer/vendor/openhtml-1.1.105-qqq-p1` | `com.kingsrook.thirdparty:openhtmltopdf-pdfbox: (upstream 1.1.105 + QQQ patch p1)` | LGPL-2.1-or-later patched OpenHTML (one file differs from upstream 1.1.105), built from the tracked source with its notices; the renderer depends on it. | | `renderer` | `com.kingsrook.qbits:qbit-document-renderer` | Standalone isolated renderer CLI/image source; no QQQ dependency. | | `bridges/renderer` | `qbit-document-generation-renderer` | `IsolatedRenderer` port implementation for the renderer. | | `bridges/remote-renderer` | `remote-renderer-parent` -> `qqq-remote-renderer-transport`, `qbit-document-generation-remote-renderer` | Remote renderer service and adapter. | diff --git a/bridges/printing/pom.xml b/bridges/printing/pom.xml index fd8876e..957621b 100644 --- a/bridges/printing/pom.xml +++ b/bridges/printing/pom.xml @@ -1,12 +1,13 @@ 4.0.0 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../../pom.xml com.kingsrook.qbitsqbit-document-generation-printing${revision} Document Generation Printing Bridge - 4.1.0-RC.210.1.0-SNAPSHOT0.1.0-SNAPSHOT21noneUTF-8 + 4.1.0-RC.210.1.0-SNAPSHOT21noneUTF-8 - 1.0.0 - + 1.0.0true + com.kingsrook.qqqqqq-bom-pom${qqq.version}pomimport com.kingsrook.qqqqqq-backend-core${qqq.version} com.kingsrook.qqqqqq-backend-module-rdbms${qqq.version} @@ -34,7 +35,7 @@ org.apache.maven.pluginsmaven-compiler-plugin3.14.1truetrue-Xlint:deprecation-Xlint:unchecked-Werror - org.apache.maven.pluginsmaven-surefire-plugin3.5.4 + org.apache.maven.pluginsmaven-surefire-plugin3.5.4 org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1com.puppycrawl.toolscheckstyle10.12.6${project.basedir}/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}truetruewarningtruevalidatecheck diff --git a/bridges/record-files/pom.xml b/bridges/record-files/pom.xml index f2ebe1a..873f8c6 100644 --- a/bridges/record-files/pom.xml +++ b/bridges/record-files/pom.xml @@ -1,10 +1,11 @@ 4.0.0 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../../pom.xml com.kingsrook.qbitsqbit-document-generation-record-files${revision} Document Generation Record Files Bridge - 4.1.0-RC.210.1.0-SNAPSHOT0.1.0-SNAPSHOT21noneUTF-8 - + 4.1.0-RC.210.1.0-SNAPSHOT21noneUTF-8true + com.kingsrook.qqqqqq-bom-pom${qqq.version}pomimport com.kingsrook.qqqqqq-backend-core${qqq.version} com.kingsrook.qqqqqq-backend-module-rdbms${qqq.version} @@ -32,7 +33,7 @@ org.apache.maven.pluginsmaven-compiler-plugin3.14.1truetrue-Xlint:deprecation-Xlint:unchecked-Werror - org.apache.maven.pluginsmaven-surefire-plugin3.5.4 + org.apache.maven.pluginsmaven-surefire-plugin3.5.4 org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1com.puppycrawl.toolscheckstyle10.12.6${project.basedir}/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}truetruewarningtruevalidatecheck diff --git a/bridges/remote-renderer/pom.xml b/bridges/remote-renderer/pom.xml index c74af55..a37d047 100644 --- a/bridges/remote-renderer/pom.xml +++ b/bridges/remote-renderer/pom.xml @@ -1,8 +1,10 @@ 4.0.0 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../../pom.xml com.kingsrook.qbitsremote-renderer-parent${revision}pom ../renderertransportadapter - 0.1.0-SNAPSHOT21UTF-8 + 21UTF-8true2.22.4 + com.fasterxml.jacksonjackson-bom${jackson-bom.version}pomimport org.apache.maven.pluginsmaven-resources-plugin3.3.1 own-license-noticeprocess-resourcescopy-resources @@ -10,7 +12,7 @@ org.apache.maven.pluginsmaven-compiler-plugin3.14.1 - org.apache.maven.pluginsmaven-surefire-plugin3.5.4 + org.apache.maven.pluginsmaven-surefire-plugin3.5.4 org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1 com.puppycrawl.toolscheckstyle10.12.6 ${project.basedir}/../../renderer/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}/../../renderertruetruewarningtrue diff --git a/bridges/renderer/pom.xml b/bridges/renderer/pom.xml index f0b9870..d5a7aba 100644 --- a/bridges/renderer/pom.xml +++ b/bridges/renderer/pom.xml @@ -1,9 +1,11 @@ 4.0.0 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../../pom.xml com.kingsrook.qbitsqbit-document-generation-renderer${revision} Document Generation Isolated Renderer Bridge - 0.1.0-SNAPSHOT21noneUTF-8 + 21noneUTF-8true2.22.4 + com.fasterxml.jacksonjackson-bom${jackson-bom.version}pomimport com.kingsrook.qbitsqbit-document-generation${revision} com.openhtmltopdfopenhtmltopdf-pdfbox @@ -32,7 +34,7 @@ org.apache.maven.pluginsmaven-compiler-plugin3.14.1truetrue-Xlint:all-Werror - org.apache.maven.pluginsmaven-surefire-plugin3.5.4 + org.apache.maven.pluginsmaven-surefire-plugin3.5.4 org.apache.maven.pluginsmaven-dependency-plugin3.8.1runtime-distributionpackagecopy-dependenciesruntime${project.build.directory}/lib org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1com.puppycrawl.toolscheckstyle10.12.6${project.basedir}/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}truetruewarningtruevalidatecheck diff --git a/bridges/scripting/pom.xml b/bridges/scripting/pom.xml index 50bdde6..feb5bb2 100644 --- a/bridges/scripting/pom.xml +++ b/bridges/scripting/pom.xml @@ -1,10 +1,11 @@ 4.0.0 - com.kingsrookqbit-build-parent2.0.0 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../../pom.xml com.kingsrook.qbitsqbit-document-generation-scripting${revision} Document Generation Scripting Bridge - 4.1.0-RC.210.1.0-SNAPSHOT0.1.0-SNAPSHOT21noneUTF-8 + GNU Affero General Public License v3.0https://www.gnu.org/licenses/agpl-3.0-standalone.htmlrepo + 4.1.0-RC.210.1.0-SNAPSHOT21noneUTF-8true com.kingsrook.qqqqqq-backend-core${qqq.version} com.kingsrook.qqqqqq-backend-module-rdbms${qqq.version} @@ -31,7 +32,7 @@ org.apache.maven.pluginsmaven-compiler-plugin3.14.1 - org.apache.maven.pluginsmaven-surefire-plugin3.5.4 + org.apache.maven.pluginsmaven-surefire-plugin3.5.4 org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1 com.puppycrawl.toolscheckstyle10.12.6 ${project.basedir}/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}truewarningtrue diff --git a/foundation/pom.xml b/foundation/pom.xml index db66f96..92cb84f 100644 --- a/foundation/pom.xml +++ b/foundation/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - com.kingsrookqbit-build-parent2.1.1 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../pom.xml com.kingsrook.qbits qbit-document-generation ${revision} QBit Document Generation User-defined document templates and generation coordination for QQQ - 4.1.0-RC.210.1.0-SNAPSHOT2121noneUTF-8 + 4.1.0-RC.212121noneUTF-8false Apache License, Version 2.0https://www.apache.org/licenses/LICENSE-2.0repo com.kingsrook.qqqqqq-bom-pom${qqq.version}pomimport diff --git a/pom.xml b/pom.xml index 5dade11..ba36843 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,20 @@ 4.0.0 - + + com.kingsrookqbit-build-parent2.1.1 com.kingsrook.qbits qbit-document-generation-reactor ${revision} pom QBit Document Generation (reactor) + https://github.com/Kingsrook/qbit-bom + scm:git:https://github.com/Kingsrook/qbit-bom.gitscm:git:ssh://git@github.com/Kingsrook/qbit-bom.githttps://github.com/Kingsrook/qbit-bomHEAD Apache License, Version 2.0https://www.apache.org/licenses/LICENSE-2.0repo - 0.1.0-SNAPSHOTUTF-8 + 0.1.0-SNAPSHOTUTF-8true @@ -20,4 +26,15 @@ bridges/printing bridges/scripting + + + + org.codehaus.mojoflatten-maven-plugin1.7.3 + trueossrh + + flattenprocess-resourcesflatten + flatten.cleancleanclean + + + diff --git a/renderer/Dockerfile b/renderer/Dockerfile index 43d400c..578ffba 100644 --- a/renderer/Dockerfile +++ b/renderer/Dockerfile @@ -10,7 +10,10 @@ COPY Dockerfile ./ RUN apt-get update && apt-get install -y --no-install-recommends gcc g++ libc6-dev make cmake patch \ && sh ./build-zint.sh +# The renderer's version comes from its parent, the repository reactor POM (../pom.xml). Build from this directory with that file as a named BuildKit context: +# docker build --build-context reactor= ... (the reactor POM is copied to /pom.xml, where ../pom.xml resolves for /renderer/pom.xml) FROM ${BUILD_IMAGE} AS build +COPY --from=reactor pom.xml /pom.xml WORKDIR /renderer COPY vendor/openhtml-1.1.105-qqq-p1 ./vendor/openhtml-1.1.105-qqq-p1 RUN sh ./vendor/openhtml-1.1.105-qqq-p1/build-openhtml.sh /renderer/openhtml-build /renderer/.m2 diff --git a/renderer/README.md b/renderer/README.md index 9dc146e..ec32bf7 100644 --- a/renderer/README.md +++ b/renderer/README.md @@ -7,7 +7,7 @@ This standalone Java CLI renders user-authored PDF layouts and typed ZPL label s ## Source build The PDF output dependency is a separately built, narrowly patched OpenHTML -module under `com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1`. +module under `com.kingsrook.thirdparty:openhtmltopdf-pdfbox: (upstream 1.1.105 + QQQ patch p1)`. Build it from the retained source into an isolated Maven repository before a local renderer build; use that same repository with `-Dmaven.repo.local=...`. See [the source build instructions](vendor/openhtml-1.1.105-qqq-p1/README.md). diff --git a/renderer/THIRD-PARTY.md b/renderer/THIRD-PARTY.md index fc5aa75..36d2467 100644 --- a/renderer/THIRD-PARTY.md +++ b/renderer/THIRD-PARTY.md @@ -4,7 +4,7 @@ Runtime libraries are separate JARs, not shaded into an opaque binary. Their lic | Component | Pinned version | License / source | | --- | --- | --- | -| OpenHTMLtoPDF PDFBox output / core | 1.1.105-qqq-p1 / 1.1.105 | LGPL-2.1-or-later; [complete local source and patch](vendor/openhtml-1.1.105-qqq-p1/README.md), [official source tag](https://github.com/openhtmltopdf/openhtmltopdf/tree/1.1.105), [published upstream POM](https://repo.maven.apache.org/maven2/io/github/openhtmltopdf/openhtmltopdf-pdfbox/1.1.105/openhtmltopdf-pdfbox-1.1.105.pom) | +| OpenHTMLtoPDF PDFBox output / core | family revision (upstream 1.1.105 + QQQ patch p1) / 1.1.105 | LGPL-2.1-or-later; [complete local source and patch](vendor/openhtml-1.1.105-qqq-p1/README.md), [official source tag](https://github.com/openhtmltopdf/openhtmltopdf/tree/1.1.105), [published upstream POM](https://repo.maven.apache.org/maven2/io/github/openhtmltopdf/openhtmltopdf-pdfbox/1.1.105/openhtmltopdf-pdfbox-1.1.105.pom) | | PDFBox, FontBox, PDFBox IO, XMPBox | 3.0.8 | Apache-2.0; [project](https://pdfbox.apache.org/), [security advisories](https://pdfbox.apache.org/security.html) | | FreeMarker | 2.3.35 | Apache-2.0; [release notes](https://freemarker.apache.org/docs/versions_2_3_35.html), [security model](https://github.com/apache/freemarker/security) | | Jsoup | 1.23.2 | MIT; [project license](https://github.com/jhy/jsoup/blob/master/LICENSE) | @@ -14,7 +14,7 @@ Runtime libraries are separate JARs, not shaded into an opaque binary. Their lic | graphics2d | 3.0.1 | Apache-2.0; [project](https://github.com/rototor/pdfbox-graphics2d) | | Commons Logging | 1.4.0 | Apache-2.0; [project](https://commons.apache.org/proper/commons-logging/) | -The maintained upstream OpenHTMLtoPDF group is `io.github.openhtmltopdf`. The PDFBox output module is now source-built under the distinct `com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1` identity; the official core remains unchanged at 1.1.105. One upstream Java file is modified to preserve the complete image stream dictionary when disabling interpolation, including PNG predictor and JPEG filter metadata. The full source archive, exact patch, original LGPL notices, dated modification notice and reproducible build recipe are retained under `vendor/openhtml-1.1.105-qqq-p1` and shipped at `/usr/share/doc/qqq-openhtml` in the image. The library remains a separate replaceable JAR. Do not substitute this fork under the upstream GAV or distribute it without corresponding source/notices. Private vendor regression evidence does not replace the renderer consumer and exact-image gates. +The maintained upstream OpenHTMLtoPDF group is `io.github.openhtmltopdf`. The PDFBox output module is now source-built under the distinct `com.kingsrook.thirdparty:openhtmltopdf-pdfbox: (upstream 1.1.105 + QQQ patch p1)` identity; the official core remains unchanged at 1.1.105. One upstream Java file is modified to preserve the complete image stream dictionary when disabling interpolation, including PNG predictor and JPEG filter metadata. The full source archive, exact patch, original LGPL notices, dated modification notice and reproducible build recipe are retained under `vendor/openhtml-1.1.105-qqq-p1` and shipped at `/usr/share/doc/qqq-openhtml` in the image. The library remains a separate replaceable JAR. Do not substitute this fork under the upstream GAV or distribute it without corresponding source/notices. Private vendor regression evidence does not replace the renderer consumer and exact-image gates. The upstream POM already depends on PDFBox 3.0.8. This renderer does not reuse the trusted proof's old OpenHTMLtoPDF 1.0.10/PDFBox 2 baseline. PDFBox's 2026 path-traversal advisories concern its examples module, which is not shipped here; moving to the current branch is not a claim that the proof exercised those vulnerable examples. diff --git a/renderer/pom.xml b/renderer/pom.xml index 3c44537..2085e25 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -1,11 +1,13 @@ 4.0.0 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../pom.xml com.kingsrook.qbitsqbit-document-renderer${revision} QQQ isolated document renderer - 0.1.0-SNAPSHOT21UTF-8 + 21UTF-8true2.22.4 + com.fasterxml.jacksonjackson-bom${jackson-bom.version}pomimport - com.kingsrook.thirdpartyopenhtmltopdf-pdfbox1.1.105-qqq-p1 + com.kingsrook.thirdpartyopenhtmltopdf-pdfbox${revision} org.apache.pdfboxpdfbox3.0.8 org.freemarkerfreemarker2.3.35 org.jsoupjsoup1.23.2 @@ -30,7 +32,7 @@ org.apache.maven.pluginsmaven-compiler-plugin3.14.1truetrue-XDcompilePolicy=simple--should-stop=ifError=FLOW-XDaddTypeAnnotationsToSymbol=true-Xplugin:ErrorProne -Xep:UnnecessaryParentheses:OFF -Xep:NotJavadoc:OFF-Xlint:all-Werrorcom.google.errorproneerror_prone_core2.49.0 - org.apache.maven.pluginsmaven-surefire-plugin3.5.4true${project.build.directory} + org.apache.maven.pluginsmaven-surefire-plugin3.5.4true${project.build.directory} org.apache.maven.pluginsmaven-dependency-plugin3.9.0runtime-librariespackagecopy-dependenciesruntime${project.build.directory}/lib org.apache.maven.pluginsmaven-jar-plugin3.4.2com.kingsrook.qbits.renderer.RendererMaintruelib/ org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1com.puppycrawl.toolscheckstyle10.12.6${project.basedir}/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}truetruewarningtruevalidatecheck diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/QQQ-MODIFICATIONS.txt b/renderer/vendor/openhtml-1.1.105-qqq-p1/QQQ-MODIFICATIONS.txt index c9d9e6d..80b9af5 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/QQQ-MODIFICATIONS.txt +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/QQQ-MODIFICATIONS.txt @@ -14,7 +14,7 @@ bytes, preserve actual copied stream Length, force Interpolate=false on the clone, and close raw input even when copying fails. Original upstream notices and LGPL licenses remain in META-INF. -Artifact: com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1 +Artifact: com.kingsrook.thirdparty:openhtmltopdf-pdfbox: (upstream 1.1.105 + QQQ patch p1) Corresponding modified sources: same GAV with classifier sources. The full-source bundle also contains the standalone Maven POM, trusted regression tests, exact patch and reproduction instructions. Distribute it diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/README.md b/renderer/vendor/openhtml-1.1.105-qqq-p1/README.md index a762ad5..b43a197 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/README.md +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/README.md @@ -2,7 +2,7 @@ This directory contains the complete corresponding LGPL-2.1-or-later sources, original notices, dated modification notice and exact patch for: -`com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1`. +`com.kingsrook.thirdparty:openhtmltopdf-pdfbox: (upstream 1.1.105 + QQQ patch p1)`. Upstream: actual tag 1.1.105, commit 54b31598f14ea77139ec435106810ba67bd68656. Source JAR: https://repo.maven.apache.org/maven2/io/github/openhtmltopdf/openhtmltopdf-pdfbox/1.1.105/openhtmltopdf-pdfbox-1.1.105-sources.jar @@ -43,7 +43,8 @@ known supported PNG/JPEG background path; it is not a universal PDF sanitizer. ## Maven reactor module -This directory is also a standard Maven module: `pom.xml` and `src/` are the `module/` tree of the complete-source archive, byte for byte -(`sh verify-module-source.sh` checks the archive hash and compares). The repository reactor builds it, with its 15 regression tests, before the -renderer, producing `com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1` and its `-sources` jar. `build-openhtml.sh` (used by the +This directory is also a standard Maven module: `src/` is the `module/src` tree of the complete-source archive and `pom.xml` is its `module/pom.xml` except for the parent's relativePath +(`../../../pom.xml` here, `../parent/pom.xml` inside the archive, which also ships `parent/pom.xml`, a copy of the reactor POM; `sh verify-module-source.sh` checks the archive hash and compares both). +The module's version comes from the reactor parent's single ``; its explicit LGPL-2.1-or-later license entry is unchanged and is not overridden by the parent's Apache-2.0. The repository reactor builds it, with its 15 regression tests, before the +renderer, producing `com.kingsrook.thirdparty:openhtmltopdf-pdfbox: (upstream 1.1.105 + QQQ patch p1)` and its `-sources` jar. `build-openhtml.sh` (used by the renderer Dockerfile into a private builder repository) is unchanged and still validates the same hashes. diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/build-openhtml.sh b/renderer/vendor/openhtml-1.1.105-qqq-p1/build-openhtml.sh index 23dd4bb..b0cbd53 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/build-openhtml.sh +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/build-openhtml.sh @@ -11,6 +11,7 @@ test ! -e "$work" mkdir -p "$work" "$repository" (cd "$work" && jar xf "$vendor/openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip") printf '%s %s\n' 34f4f40a95c7ed607fb76f9ecfd1c8f47c185c2c9258822c7f96d8e9fbee3ecb "$work/provenance/upstream-sources.jar" | sha256sum -c - +rev=$(sed -n 's:.*\(.*\).*:\1:p' "$work/parent/pom.xml" | head -n 1) # verify includes the fifteen real upstream-clone/background regressions. mvn -B -f "$work/module/pom.xml" "-Dmaven.repo.local=$repository" verify # Install only the verified artifact into this discarded builder's private repo. @@ -18,7 +19,8 @@ mvn -B -f "$work/module/pom.xml" "-Dmaven.repo.local=$repository" -DskipTests in mkdir "$work/corresponding-source" cp "$vendor"/* "$work/corresponding-source/" cp "$work/module/pom.xml" "$work/corresponding-source/build-pom.xml" -cp "$work/module/target/openhtmltopdf-pdfbox-1.1.105-qqq-p1-sources.jar" "$work/corresponding-source/" +cp "$work/parent/pom.xml" "$work/corresponding-source/build-parent-pom.xml" +cp "$work/module/target/openhtmltopdf-pdfbox-$rev-sources.jar" "$work/corresponding-source/" cp "$work/module/target/surefire-reports/com.kingsrook.thirdparty.RasterMetadataTest.txt" "$work/corresponding-source/vendor-test-results.txt" (java -version; mvn -version) > "$work/corresponding-source/build-toolchain.txt" 2>&1 -(cd "$work/module/target" && sha256sum openhtmltopdf-pdfbox-1.1.105-qqq-p1.jar openhtmltopdf-pdfbox-1.1.105-qqq-p1-sources.jar) > "$work/corresponding-source/built-artifacts.sha256" +(cd "$work/module/target" && sha256sum openhtmltopdf-pdfbox-$rev.jar openhtmltopdf-pdfbox-$rev-sources.jar) > "$work/corresponding-source/built-artifacts.sha256" diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/inputs.sha256 b/renderer/vendor/openhtml-1.1.105-qqq-p1/inputs.sha256 index 4118e48..dec5321 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/inputs.sha256 +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/inputs.sha256 @@ -1,2 +1,2 @@ -83daf8fd1e5ec3d27933028bb8d484674b7c40ab7f492dce0093aa344c73a441 openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip +9cfe3426e7f198a3aa97c99d073738e5050c8047c360e11167743e147c384920 openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip 8dab8e86c45393a6bfea32d755f1e130b3ebeef8f77a46e6593af223080c5d25 openhtml-image-dictionary.patch diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip b/renderer/vendor/openhtml-1.1.105-qqq-p1/openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip index 71ed6f8..5913678 100644 Binary files a/renderer/vendor/openhtml-1.1.105-qqq-p1/openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip and b/renderer/vendor/openhtml-1.1.105-qqq-p1/openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip differ diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/pom.xml b/renderer/vendor/openhtml-1.1.105-qqq-p1/pom.xml index 0b0a23a..14f0c59 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/pom.xml +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/pom.xml @@ -1,11 +1,15 @@ 4.0.0 - com.kingsrook.thirdpartyopenhtmltopdf-pdfbox1.1.105-qqq-p1 + com.kingsrook.qbitsqbit-document-generation-reactor${revision}../../../pom.xml + com.kingsrook.thirdpartyopenhtmltopdf-pdfbox${revision} OpenHTML PDFBox raster metadata correction - Source-built OpenHTML1.1.105 with a narrow image-copy correction; LGPL2.1-or-later. + Source-built OpenHTML1.1.105 with a narrow image-copy correction; LGPL2.1-or-later. Not an original upstream release: its Maven version is the QBit Document Generation family version; the upstream version and the QQQ patch level are in the openhtml.* properties. + https://github.com/danfickle/openhtmltopdf + + scm:git:https://github.com/danfickle/openhtmltopdf.githttps://github.com/danfickle/openhtmltopdf/tree/1.1.1051.1.105 GNU Lesser General Public License2.1 or laterhttps://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - 821UTF-82026-10-31T00:00:00Z + 1.1.10554b31598f14ea77139ec435106810ba67bd68656p1821UTF-82026-10-31T00:00:00Ztrue org.apache.pdfboxpdfbox3.0.8 org.apache.pdfboxxmpbox3.0.8 @@ -15,9 +19,10 @@ org.apache.maven.pluginsmaven-resources-plugin3.3.1 - org.apache.maven.pluginsmaven-compiler-plugin3.14.1 - org.apache.maven.pluginsmaven-surefire-plugin3.5.4true${project.build.directory} + org.apache.maven.pluginsmaven-compiler-plugin3.14.188 + org.apache.maven.pluginsmaven-surefire-plugin3.5.4true${project.build.directory} org.apache.maven.pluginsmaven-jar-plugin3.4.2 org.apache.maven.pluginsmaven-source-plugin3.3.1jar-no-fork + org.codehaus.mojoflatten-maven-plugin1.7.3trueossrhflattenprocess-resourcesflattenflatten.cleancleanclean diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/src/main/resources/META-INF/QQQ-MODIFICATIONS.txt b/renderer/vendor/openhtml-1.1.105-qqq-p1/src/main/resources/META-INF/QQQ-MODIFICATIONS.txt index c9d9e6d..6fc64be 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/src/main/resources/META-INF/QQQ-MODIFICATIONS.txt +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/src/main/resources/META-INF/QQQ-MODIFICATIONS.txt @@ -14,7 +14,10 @@ bytes, preserve actual copied stream Length, force Interpolate=false on the clone, and close raw input even when copying fails. Original upstream notices and LGPL licenses remain in META-INF. -Artifact: com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1 +Artifact: com.kingsrook.thirdparty:openhtmltopdf-pdfbox, published at the QBit Document Generation +family version. The modified library is upstream 1.1.105 with QQQ patch level 1 (originally +distributed as version 1.1.105-qqq-p1); the version numbers it is based on are recorded in the +POM properties openhtml.upstream.version and openhtml.qqq.patch. Corresponding modified sources: same GAV with classifier sources. The full-source bundle also contains the standalone Maven POM, trusted regression tests, exact patch and reproduction instructions. Distribute it diff --git a/renderer/vendor/openhtml-1.1.105-qqq-p1/verify-module-source.sh b/renderer/vendor/openhtml-1.1.105-qqq-p1/verify-module-source.sh index d69a7d1..fa82fc3 100644 --- a/renderer/vendor/openhtml-1.1.105-qqq-p1/verify-module-source.sh +++ b/renderer/vendor/openhtml-1.1.105-qqq-p1/verify-module-source.sh @@ -7,5 +7,10 @@ work=$(mktemp -d) trap 'rm -rf "$work"' EXIT (cd "$work" && jar xf "$vendor/openhtmltopdf-pdfbox-1.1.105-qqq-p1-complete-source.zip") diff -r "$work/module/src" "$vendor/src" -cmp "$work/module/pom.xml" "$vendor/pom.xml" +# the archive's module POM differs from the repository module POM only in the parent's relativePath (inside the archive: ../parent/pom.xml) +strip() { sed 's#[^<]*##' "$1"; } +strip "$work/module/pom.xml" > "$work/module-pom.normalized" +strip "$vendor/pom.xml" > "$work/repository-pom.normalized" +cmp "$work/module-pom.normalized" "$work/repository-pom.normalized" +cmp "$work/parent/pom.xml" "$vendor/../../../pom.xml" echo "module source identical to archive"