Skip to content

fix: upgrade itext to openpdf (#21262) #21599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
netroms wants to merge 3 commits into from
Closed

fix: upgrade itext to openpdf (#21262) #21599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04392bb
fix: upgrade itext to openpdf (#21262)
netroms Jun 24, 2025
331eafb
Merge branch '2.40' into DHIS2-19782_2.40
netroms Sep 19, 2025
02cd219
Merge branch '2.40' into DHIS2-19782_2.40
jason-p-pickering Dec 8, 2025
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
4 changes: 2 additions & 2 deletions dhis-2/dhis-services/dhis-service-dxf2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@
<artifactId>javacsv</artifactId>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/DefaultPdfDataEntryFormService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ private void addCell_WithCheckBox(
checkbox.setBorderWidth(1);
checkbox.setBorderColor(Color.BLACK);

PdfFormField checkboxfield = checkbox.getCheckField();
PdfFormField checkboxfield = checkbox.getFullField();
checkboxfield.setFieldName(
strfldName + "_" + PdfFieldCell.TPYEDEFINE_NAME + PdfFieldCell.TYPE_CHECKBOX);

Expand Down
4 changes: 2 additions & 2 deletions ...ices/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public static DataValueSet getDataValueSet(InputStream in) {

List<org.hisp.dhis.dxf2.datavalue.DataValue> dataValueList = new ArrayList<>();

try {
try (in) {
reader = new PdfReader(in);

AcroFields form = reader.getAcroFields();
Expand Down Expand Up @@ -205,7 +205,7 @@ public static DataValueSet getDataValueSet(InputStream in) {
// Loop Through the Fields and get data.

@SuppressWarnings("unchecked")
Set<String> fldNames = form.getFields().keySet();
Set<String> fldNames = form.getAllFields().keySet();

for (String fldName : fldNames) {

Expand Down
2 changes: 1 addition & 1 deletion ...his-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFieldCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void cellLayout(PdfPCell cell, Rectangle rect, PdfContentByte[] canvases)
rf.setBackgroundColor(GrayColor.GRAYWHITE);
rf.setCheckType(RadioCheckField.TYPE_CIRCLE);

parent.addKid(rf.getRadioField());
parent.addKid(rf.getFullField());

leftLoc = rightLoc;
rightLoc += width;
Expand Down
4 changes: 2 additions & 2 deletions dhis-2/dhis-support/dhis-support-system/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
4 changes: 2 additions & 2 deletions dhis-2/dhis-web-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@
<artifactId>cache2k-api</artifactId>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
Expand Down
33 changes: 4 additions & 29 deletions dhis-2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,36 +808,11 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>${itext.version}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bctsp-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bctsp-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bcmail-jdk14</artifactId>
</exclusion>
</exclusions>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
<version>2.0.5</version>
</dependency>

<dependency>
Expand Down
Loading