Merge branch 'release_branch_DEVSIX-5942' into master-rc

itext · Oct 20, 2021 · a274601 · a274601
2 parents 87fffa6 + 6d5b066
commit a274601
Show file tree

Hide file tree

Showing 559 changed files with 3,839 additions and 859 deletions.
diff --git a/barcodes/pom.xml b/barcodes/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>7.1.16</version>
+ <version>7.1.17</version>
  </parent>
  <artifactId>barcodes</artifactId>
  <name>iText 7 - barcodes</name>

diff --git a/font-asian/pom.xml b/font-asian/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>7.1.16</version>
+ <version>7.1.17</version>
  </parent>
  <artifactId>font-asian</artifactId>
  <name>iText 7 - Asian fonts</name>

diff --git a/forms/pom.xml b/forms/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>7.1.16</version>
+ <version>7.1.17</version>
  </parent>
  <artifactId>forms</artifactId>
  <name>iText 7 - forms</name>

diff --git a/forms/src/main/java/com/itextpdf/forms/PdfPageFormCopier.java b/forms/src/main/java/com/itextpdf/forms/PdfPageFormCopier.java
@@ -167,12 +167,14 @@ private void copyParentFormField(PdfPage toPage, Map<String, PdfFormField> field
  PdfAnnotation annot, PdfFormField parentField) {
  PdfString parentName = parentField.getFieldName();
  if (!fieldsTo.containsKey(parentName.toUnicodeString())) {
+ // no such field, hence we should simply add it
  PdfFormField field = createParentFieldCopy(annot.getPdfObject(), documentTo);
  PdfArray kids = field.getKids();
  field.getPdfObject().remove(PdfName.Kids);
  formTo.addField(field, toPage);
  field.getPdfObject().put(PdfName.Kids, kids);
  } else {
+ // it is either a field (field name will not be null) or a widget (field name is not null)
  PdfFormField field = makeFormField(annot.getPdfObject());
  if (field == null) {
  return;
@@ -190,18 +192,36 @@ private void copyParentFormField(PdfPage toPage, Map<String, PdfFormField> field
  fieldsTo);
  }
  } else {
- if (!parentField.getKids().contains(field.getPdfObject())) {
+ if (!parentField.getKids().contains(field.getPdfObject())
+ && formTo.getFields().contains(parentField.getPdfObject())) {
+ // its parent is already a field of the resultant document,
+ // hence we only need to update its children
  HashSet<String> existingFields = new HashSet<>();
  getAllFieldNames(formTo.getFields(), existingFields);
  addChildToExistingParent(annot.getPdfObject(), existingFields);
+ } else {
+ // its parent is not a field of the resultant document, but the latter contains
+ // a field of the same name, therefore we should merge them (note that merging in this context
+ // differs from merging a widget and an annotation into a single entity)
+ PdfFormField mergedField = mergeFieldsWithTheSameName(field);
+ // we need to add the field not to its representation (#getFormFields()), but to
+ // /Fields entry of the acro form
+ formTo.addField(mergedField, toPage);
  }
  }
  }
  }
 
  private PdfFormField mergeFieldsWithTheSameName(PdfFormField newField) {
- String fullFieldName = newField.getFieldName().toUnicodeString();
  PdfString fieldName = newField.getPdfObject().getAsString(PdfName.T);
+ if (null == fieldName) {
+ fieldName = newField.getParent().getAsString(PdfName.T);
+ }
+
+ String fullFieldName = fieldName.toUnicodeString();
+ if (null != newField.getFieldName()) {
+ fullFieldName = newField.getFieldName().toUnicodeString();
+ }
 
  logger.warn(MessageFormatUtil.format(LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, fullFieldName));
 

diff --git a/forms/src/test/java/com/itextpdf/forms/FormFieldFlatteningTest.java b/forms/src/test/java/com/itextpdf/forms/FormFieldFlatteningTest.java
@@ -254,7 +254,7 @@ private static void fillTextFieldsThenFlattenThenCompare(String testName) throws
  }
 
  @Test
- @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 3)})
+ @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 5)})
  //Logging is expected since there are duplicate field names
  //isReadOnly should be true after DEVSIX-2156
  public void flattenReadOnly() throws IOException {

diff --git a/forms/src/test/java/com/itextpdf/forms/PdfFormCopyTest.java b/forms/src/test/java/com/itextpdf/forms/PdfFormCopyTest.java
@@ -53,6 +53,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -63,8 +64,8 @@ This file is part of the iText (R) project.
 @Category(IntegrationTest.class)
 public class PdfFormCopyTest extends ExtendedITextTest {
 
- public static final String sourceFolder = "./src/test/resources/com/itextpdf/forms/PdfFormFieldsCopyTest/";
- public static final String destinationFolder = "./target/test/com/itextpdf/forms/PdfFormFieldsCopyTest/";
+ public static final String sourceFolder = "./src/test/resources/com/itextpdf/forms/PdfFormCopyTest/";
+ public static final String destinationFolder = "./target/test/com/itextpdf/forms/PdfFormCopyTest/";
 
  @BeforeClass
  public static void beforeClass() {
@@ -73,7 +74,7 @@ public static void beforeClass() {
 
  @Test
  @LogMessages(messages = {
- @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 13)
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 32)
  })
  public void copyFieldsTest01() throws IOException, InterruptedException {
  String srcFilename1 = sourceFolder + "appearances1.pdf";
@@ -328,7 +329,7 @@ public void copyFieldsTest06() throws IOException, InterruptedException {
 
  @Test
  @LogMessages(messages = {
- @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 13)
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 32)
  })
  public void copyFieldsTest07() throws IOException, InterruptedException {
  String srcFilename = sourceFolder + "datasheet.pdf";
@@ -350,7 +351,7 @@ public void copyFieldsTest07() throws IOException, InterruptedException {
 
  @Test
  @LogMessages(messages = {
- @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 13)
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 32)
  })
  public void copyFieldsTest08() throws IOException, InterruptedException {
  String srcFilename1 = sourceFolder + "appearances1.pdf";
@@ -378,7 +379,7 @@ public void copyFieldsTest08() throws IOException, InterruptedException {
 
  @Test
  @LogMessages(messages = {
- @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 26)
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 64)
  })
  public void copyFieldsTest09() throws IOException, InterruptedException {
  String srcFilename = sourceFolder + "datasheet.pdf";
@@ -516,9 +517,9 @@ public void unnamedFieldsHierarchyTest() throws IOException, InterruptedExceptio
  })
  public void copyAndEditTextFields() throws IOException, InterruptedException {
  //TODO: update after DEVSIX-2354
- String srcFileName = sourceFolder + "/checkPdfFormCopy_Source.pdf";
+ String srcFileName = sourceFolder + "checkPdfFormCopy_Source.pdf";
  String destFilename = destinationFolder + "copyAndEditTextFields.pdf";
- String cmpFileName = sourceFolder + "/cmp_copyAndEditTextFields.pdf";
+ String cmpFileName = sourceFolder + "cmp_copyAndEditTextFields.pdf";
 
  PdfDocument srcDoc = new PdfDocument(new PdfReader(srcFileName));
  PdfDocument destDoc = new PdfDocument(new PdfWriter(destFilename));
@@ -547,9 +548,9 @@ public void copyAndEditTextFields() throws IOException, InterruptedException {
  })
  public void copyAndEditCheckboxes() throws IOException, InterruptedException {
  //TODO: update after DEVSIX-2354
- String srcFileName = sourceFolder + "/checkPdfFormCopy_Source.pdf";
+ String srcFileName = sourceFolder + "checkPdfFormCopy_Source.pdf";
  String destFilename = destinationFolder + "copyAndEditCheckboxes.pdf";
- String cmpFileName = sourceFolder + "/cmp_copyAndEditCheckboxes.pdf";
+ String cmpFileName = sourceFolder + "cmp_copyAndEditCheckboxes.pdf";
 
  PdfDocument srcDoc = new PdfDocument(new PdfReader(srcFileName));
  PdfDocument destDoc = new PdfDocument(new PdfWriter(destFilename));
@@ -576,9 +577,9 @@ public void copyAndEditCheckboxes() throws IOException, InterruptedException {
  })
  public void copyAndEditRadioButtons() throws IOException, InterruptedException {
  //TODO: update after DEVSIX-2354
- String srcFileName = sourceFolder + "/checkPdfFormCopy_Source.pdf";
+ String srcFileName = sourceFolder + "checkPdfFormCopy_Source.pdf";
  String destFilename = destinationFolder + "copyAndEditRadioButtons.pdf";
- String cmpFileName = sourceFolder + "/cmp_copyAndEditRadioButtons.pdf";
+ String cmpFileName = sourceFolder + "cmp_copyAndEditRadioButtons.pdf";
 
  PdfDocument srcDoc = new PdfDocument(new PdfReader(srcFileName));
  PdfDocument destDoc = new PdfDocument(new PdfWriter(destFilename));
@@ -596,4 +597,103 @@ public void copyAndEditRadioButtons() throws IOException, InterruptedException {
 
  Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFileName, destinationFolder, "diff_"));
  }
+
+ @Test
+ @LogMessages(messages = {
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD)
+ })
+ public void mergeMergedFieldAndMergedFieldTest() throws IOException, InterruptedException {
+ String srcFileName1 = sourceFolder + "fieldMergedWithWidget.pdf";
+ String destFilename = destinationFolder + "mergeMergedFieldAndMergedFieldTest.pdf";
+ String cmpFileName = sourceFolder + "cmp_mergeMergedFieldAndMergedFieldTest.pdf";
+
+ try (
+ PdfWriter writer = new PdfWriter(destFilename);
+ PdfDocument resultPdfDocument = new PdfDocument(writer);
+ PdfReader reader1 = new PdfReader(srcFileName1);
+ PdfDocument sourceDoc1 = new PdfDocument(reader1);) {
+ PdfAcroForm.getAcroForm(resultPdfDocument, true);
+ PdfPageFormCopier formCopier = new PdfPageFormCopier();
+
+ sourceDoc1.copyPagesTo(1, sourceDoc1.getNumberOfPages(), resultPdfDocument, formCopier);
+ sourceDoc1.copyPagesTo(1, sourceDoc1.getNumberOfPages(), resultPdfDocument, formCopier);
+ }
+
+ Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFileName, destinationFolder, "diff_"));
+ }
+
+ @Test
+ @LogMessages(messages = {
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 2)
+ })
+ public void mergeMergedFieldAndTwoWidgetsTest() throws IOException, InterruptedException {
+ String srcFileName1 = sourceFolder + "fieldMergedWithWidget.pdf";
+ String srcFileName2 = sourceFolder + "fieldTwoWidgets.pdf";
+ String destFilename = destinationFolder + "mergeMergedFieldAndTwoWidgetsTest.pdf";
+ String cmpFileName = sourceFolder + "cmp_mergeMergedFieldAndTwoWidgetsTest.pdf";
+
+ try (
+ PdfWriter writer = new PdfWriter(destFilename);
+ PdfDocument resultPdfDocument = new PdfDocument(writer);
+ PdfReader reader1 = new PdfReader(srcFileName1);
+ PdfDocument sourceDoc1 = new PdfDocument(reader1);
+ PdfReader reader2 = new PdfReader(srcFileName2);
+ PdfDocument sourceDoc2 = new PdfDocument(reader2);) {
+ PdfAcroForm.getAcroForm(resultPdfDocument, true);
+ PdfPageFormCopier formCopier = new PdfPageFormCopier();
+
+ sourceDoc1.copyPagesTo(1, sourceDoc1.getNumberOfPages(), resultPdfDocument, formCopier);
+ sourceDoc2.copyPagesTo(1, sourceDoc2.getNumberOfPages(), resultPdfDocument, formCopier);
+ }
+
+ Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFileName, destinationFolder, "diff_"));
+ }
+
+ @Test
+ @LogMessages(messages = {
+ @LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD)
+ })
+ public void mergeTwoWidgetsAndMergedFieldTest() throws IOException, InterruptedException {
+ String srcFileName1 = sourceFolder + "fieldMergedWithWidget.pdf";
+ String srcFileName2 = sourceFolder + "fieldTwoWidgets.pdf";
+ String destFilename = destinationFolder + "mergeTwoWidgetsAndMergedFieldTest.pdf";
+ String cmpFileName = sourceFolder + "cmp_mergeTwoWidgetsAndMergedFieldTest.pdf";
+
+ try (
+ PdfWriter writer = new PdfWriter(destFilename);
+ PdfDocument resultPdfDocument = new PdfDocument(writer);
+ PdfReader reader1 = new PdfReader(srcFileName1);
+ PdfDocument sourceDoc1 = new PdfDocument(reader1);
+ PdfReader reader2 = new PdfReader(srcFileName2);
+ PdfDocument sourceDoc2 = new PdfDocument(reader2);) {
+ PdfAcroForm.getAcroForm(resultPdfDocument, true);
+ PdfPageFormCopier formCopier = new PdfPageFormCopier();
+
+ sourceDoc2.copyPagesTo(1, sourceDoc2.getNumberOfPages(), resultPdfDocument, formCopier);
+ sourceDoc1.copyPagesTo(1, sourceDoc1.getNumberOfPages(), resultPdfDocument, formCopier);
+ }
+
+ Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFileName, destinationFolder, "diff_"));
+ }
+
+ @Test
+ public void mergeTwoWidgetsAndTwoWidgetsTest() throws IOException, InterruptedException {
+ String srcFileName2 = sourceFolder + "fieldTwoWidgets.pdf";
+ String destFilename = destinationFolder + "mergeTwoWidgetsAndTwoWidgetsTest.pdf";
+ String cmpFileName = sourceFolder + "cmp_mergeTwoWidgetsAndTwoWidgetsTest.pdf";
+
+ try (
+ PdfWriter writer = new PdfWriter(destFilename);
+ PdfDocument resultPdfDocument = new PdfDocument(writer);
+ PdfReader reader2 = new PdfReader(srcFileName2);
+ PdfDocument sourceDoc2 = new PdfDocument(reader2);) {
+ PdfAcroForm.getAcroForm(resultPdfDocument, true);
+ PdfPageFormCopier formCopier = new PdfPageFormCopier();
+
+ sourceDoc2.copyPagesTo(1, sourceDoc2.getNumberOfPages(), resultPdfDocument, formCopier);
+ sourceDoc2.copyPagesTo(1, sourceDoc2.getNumberOfPages(), resultPdfDocument, formCopier);
+ }
+
+ Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFileName, destinationFolder, "diff_"));
+ }
 }
diff --git a/...eldsCopyTest/AnnotationSampleStandard.pdf → ...FormCopyTest/AnnotationSampleStandard.pdf b/...eldsCopyTest/AnnotationSampleStandard.pdf → ...FormCopyTest/AnnotationSampleStandard.pdf
diff --git a/...ms/PdfFormFieldsCopyTest/appearances1.pdf → ...df/forms/PdfFormCopyTest/appearances1.pdf b/...ms/PdfFormFieldsCopyTest/appearances1.pdf → ...df/forms/PdfFormCopyTest/appearances1.pdf
diff --git a/...ieldsCopyTest/checkPdfFormCopy_Source.pdf → ...fFormCopyTest/checkPdfFormCopy_Source.pdf b/...ieldsCopyTest/checkPdfFormCopy_Source.pdf → ...fFormCopyTest/checkPdfFormCopy_Source.pdf
diff --git a/...est/cmp_AnnotationSampleStandard_copy.pdf → ...est/cmp_AnnotationSampleStandard_copy.pdf b/...est/cmp_AnnotationSampleStandard_copy.pdf → ...est/cmp_AnnotationSampleStandard_copy.pdf
diff --git a/...ldsCopyTest/cmp_copyAndEditCheckboxes.pdf → ...ormCopyTest/cmp_copyAndEditCheckboxes.pdf b/...ldsCopyTest/cmp_copyAndEditCheckboxes.pdf → ...ormCopyTest/cmp_copyAndEditCheckboxes.pdf
diff --git a/...sCopyTest/cmp_copyAndEditRadioButtons.pdf → ...mCopyTest/cmp_copyAndEditRadioButtons.pdf b/...sCopyTest/cmp_copyAndEditRadioButtons.pdf → ...mCopyTest/cmp_copyAndEditRadioButtons.pdf
diff --git a/...ldsCopyTest/cmp_copyAndEditTextFields.pdf → ...ormCopyTest/cmp_copyAndEditTextFields.pdf b/...ldsCopyTest/cmp_copyAndEditTextFields.pdf → ...ormCopyTest/cmp_copyAndEditTextFields.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields01.pdf → ...orms/PdfFormCopyTest/cmp_copyFields01.pdf b/...dfFormFieldsCopyTest/cmp_copyFields01.pdf → ...orms/PdfFormCopyTest/cmp_copyFields01.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields02.pdf → ...orms/PdfFormCopyTest/cmp_copyFields02.pdf b/...dfFormFieldsCopyTest/cmp_copyFields02.pdf → ...orms/PdfFormCopyTest/cmp_copyFields02.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields03.pdf → ...orms/PdfFormCopyTest/cmp_copyFields03.pdf b/...dfFormFieldsCopyTest/cmp_copyFields03.pdf → ...orms/PdfFormCopyTest/cmp_copyFields03.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields05.pdf → ...orms/PdfFormCopyTest/cmp_copyFields05.pdf b/...dfFormFieldsCopyTest/cmp_copyFields05.pdf → ...orms/PdfFormCopyTest/cmp_copyFields05.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields06.pdf → ...orms/PdfFormCopyTest/cmp_copyFields06.pdf b/...dfFormFieldsCopyTest/cmp_copyFields06.pdf → ...orms/PdfFormCopyTest/cmp_copyFields06.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields07.pdf → ...orms/PdfFormCopyTest/cmp_copyFields07.pdf b/...dfFormFieldsCopyTest/cmp_copyFields07.pdf → ...orms/PdfFormCopyTest/cmp_copyFields07.pdf
diff --git a/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_copyFields08.pdf b/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_copyFields08.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields09.pdf → ...orms/PdfFormCopyTest/cmp_copyFields09.pdf b/...dfFormFieldsCopyTest/cmp_copyFields09.pdf → ...orms/PdfFormCopyTest/cmp_copyFields09.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields10.pdf → ...orms/PdfFormCopyTest/cmp_copyFields10.pdf b/...dfFormFieldsCopyTest/cmp_copyFields10.pdf → ...orms/PdfFormCopyTest/cmp_copyFields10.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields11.pdf → ...orms/PdfFormCopyTest/cmp_copyFields11.pdf b/...dfFormFieldsCopyTest/cmp_copyFields11.pdf → ...orms/PdfFormCopyTest/cmp_copyFields11.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields12.pdf → ...orms/PdfFormCopyTest/cmp_copyFields12.pdf b/...dfFormFieldsCopyTest/cmp_copyFields12.pdf → ...orms/PdfFormCopyTest/cmp_copyFields12.pdf
diff --git a/...dfFormFieldsCopyTest/cmp_copyFields13.pdf → ...orms/PdfFormCopyTest/cmp_copyFields13.pdf b/...dfFormFieldsCopyTest/cmp_copyFields13.pdf → ...orms/PdfFormCopyTest/cmp_copyFields13.pdf
diff --git a/...fFormFieldsCopyTest/cmp_copyLargeFile.pdf → ...rms/PdfFormCopyTest/cmp_copyLargeFile.pdf b/...fFormFieldsCopyTest/cmp_copyLargeFile.pdf → ...rms/PdfFormCopyTest/cmp_copyLargeFile.pdf
diff --git a/..._copyMultipleSubfieldsSmartModeTest01.pdf → ..._copyMultipleSubfieldsSmartModeTest01.pdf b/..._copyMultipleSubfieldsSmartModeTest01.pdf → ..._copyMultipleSubfieldsSmartModeTest01.pdf
diff --git a/...yTest/cmp_copyMultipleSubfieldsTest01.pdf → ...yTest/cmp_copyMultipleSubfieldsTest01.pdf b/...yTest/cmp_copyMultipleSubfieldsTest01.pdf → ...yTest/cmp_copyMultipleSubfieldsTest01.pdf
diff --git a/...yTest/cmp_copyMultipleSubfieldsTest02.pdf → ...yTest/cmp_copyMultipleSubfieldsTest02.pdf b/...yTest/cmp_copyMultipleSubfieldsTest02.pdf → ...yTest/cmp_copyMultipleSubfieldsTest02.pdf
diff --git a/...yTest/cmp_copyMultipleSubfieldsTest03.pdf → ...yTest/cmp_copyMultipleSubfieldsTest03.pdf b/...yTest/cmp_copyMultipleSubfieldsTest03.pdf → ...yTest/cmp_copyMultipleSubfieldsTest03.pdf
diff --git a/...t/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeMergedFieldAndMergedFieldTest.pdf b/...t/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeMergedFieldAndMergedFieldTest.pdf
diff --git a/...st/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeMergedFieldAndTwoWidgetsTest.pdf b/...st/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeMergedFieldAndTwoWidgetsTest.pdf
diff --git a/...st/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeTwoWidgetsAndMergedFieldTest.pdf b/...st/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeTwoWidgetsAndMergedFieldTest.pdf
diff --git a/...est/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeTwoWidgetsAndTwoWidgetsTest.pdf b/...est/resources/com/itextpdf/forms/PdfFormCopyTest/cmp_mergeTwoWidgetsAndTwoWidgetsTest.pdf
diff --git a/...pyTest/cmp_unnamedFieldsHierarchyTest.pdf → ...pyTest/cmp_unnamedFieldsHierarchyTest.pdf b/...pyTest/cmp_unnamedFieldsHierarchyTest.pdf → ...pyTest/cmp_unnamedFieldsHierarchyTest.pdf
diff --git a/...ms/PdfFormFieldsCopyTest/copyFields12.pdf → ...df/forms/PdfFormCopyTest/copyFields12.pdf b/...ms/PdfFormFieldsCopyTest/copyFields12.pdf → ...df/forms/PdfFormCopyTest/copyFields12.pdf
diff --git a/...ms/PdfFormFieldsCopyTest/copyFields13.pdf → ...df/forms/PdfFormCopyTest/copyFields13.pdf b/...ms/PdfFormFieldsCopyTest/copyFields13.pdf → ...df/forms/PdfFormCopyTest/copyFields13.pdf
diff --git a/.../copyMultipleSubfieldsSmartModeTest01.pdf → .../copyMultipleSubfieldsSmartModeTest01.pdf b/.../copyMultipleSubfieldsSmartModeTest01.pdf → .../copyMultipleSubfieldsSmartModeTest01.pdf
diff --git a/...sCopyTest/copyMultipleSubfieldsTest01.pdf → ...mCopyTest/copyMultipleSubfieldsTest01.pdf b/...sCopyTest/copyMultipleSubfieldsTest01.pdf → ...mCopyTest/copyMultipleSubfieldsTest01.pdf
diff --git a/...sCopyTest/copyMultipleSubfieldsTest02.pdf → ...mCopyTest/copyMultipleSubfieldsTest02.pdf b/...sCopyTest/copyMultipleSubfieldsTest02.pdf → ...mCopyTest/copyMultipleSubfieldsTest02.pdf
diff --git a/...sCopyTest/copyMultipleSubfieldsTest03.pdf → ...mCopyTest/copyMultipleSubfieldsTest03.pdf b/...sCopyTest/copyMultipleSubfieldsTest03.pdf → ...mCopyTest/copyMultipleSubfieldsTest03.pdf
diff --git a/...forms/PdfFormFieldsCopyTest/datasheet.pdf → ...xtpdf/forms/PdfFormCopyTest/datasheet.pdf b/...forms/PdfFormFieldsCopyTest/datasheet.pdf → ...xtpdf/forms/PdfFormCopyTest/datasheet.pdf
diff --git a/...orms/PdfFormFieldsCopyTest/datasheet2.pdf → ...tpdf/forms/PdfFormCopyTest/datasheet2.pdf b/...orms/PdfFormFieldsCopyTest/datasheet2.pdf → ...tpdf/forms/PdfFormCopyTest/datasheet2.pdf
diff --git a/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/fieldMergedWithWidget.pdf b/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/fieldMergedWithWidget.pdf
diff --git a/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/fieldTwoWidgets.pdf b/forms/src/test/resources/com/itextpdf/forms/PdfFormCopyTest/fieldTwoWidgets.pdf
diff --git a/...PdfFormFieldsCopyTest/fieldsOn2-sPage.pdf → ...forms/PdfFormCopyTest/fieldsOn2-sPage.pdf b/...PdfFormFieldsCopyTest/fieldsOn2-sPage.pdf → ...forms/PdfFormCopyTest/fieldsOn2-sPage.pdf
diff --git a/...PdfFormFieldsCopyTest/fieldsOn3-sPage.pdf → ...forms/PdfFormCopyTest/fieldsOn3-sPage.pdf b/...PdfFormFieldsCopyTest/fieldsOn3-sPage.pdf → ...forms/PdfFormCopyTest/fieldsOn3-sPage.pdf
diff --git a/...forms/PdfFormFieldsCopyTest/frontpage.pdf → ...xtpdf/forms/PdfFormCopyTest/frontpage.pdf b/...forms/PdfFormFieldsCopyTest/frontpage.pdf → ...xtpdf/forms/PdfFormCopyTest/frontpage.pdf
diff --git a/...rmFieldsCopyTest/hello2_with_comments.pdf → .../PdfFormCopyTest/hello2_with_comments.pdf b/...rmFieldsCopyTest/hello2_with_comments.pdf → .../PdfFormCopyTest/hello2_with_comments.pdf
diff --git a/...ormFieldsCopyTest/hello_with_comments.pdf → ...s/PdfFormCopyTest/hello_with_comments.pdf b/...ormFieldsCopyTest/hello_with_comments.pdf → ...s/PdfFormCopyTest/hello_with_comments.pdf
diff --git a/...forms/PdfFormFieldsCopyTest/largeFile.pdf → ...xtpdf/forms/PdfFormCopyTest/largeFile.pdf b/...forms/PdfFormFieldsCopyTest/largeFile.pdf → ...xtpdf/forms/PdfFormCopyTest/largeFile.pdf
diff --git a/.../forms/PdfFormFieldsCopyTest/srcFile1.pdf → ...extpdf/forms/PdfFormCopyTest/srcFile1.pdf b/.../forms/PdfFormFieldsCopyTest/srcFile1.pdf → ...extpdf/forms/PdfFormCopyTest/srcFile1.pdf
diff --git a/...s/PdfFormFieldsCopyTest/unnamedFields.pdf → ...f/forms/PdfFormCopyTest/unnamedFields.pdf b/...s/PdfFormFieldsCopyTest/unnamedFields.pdf → ...f/forms/PdfFormCopyTest/unnamedFields.pdf
diff --git a/hyph/pom.xml b/hyph/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>7.1.16</version>
+ <version>7.1.17</version>
  </parent>
  <artifactId>hyph</artifactId>
  <name>iText 7 - hyph</name>

diff --git a/io/pom.xml b/io/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>7.1.16</version>
+ <version>7.1.17</version>
  </parent>
  <artifactId>io</artifactId>
  <name>iText 7 - io</name>