itext
diff --git a/‎.mailmap‎
Lines changed: 0 additions & 1 deletion b/‎.mailmap‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎BUILDING.md‎
Lines changed: 19 additions & 3 deletions b/‎BUILDING.md‎
Lines changed: 19 additions & 3 deletions
diff --git a/‎Jenkinsfile‎
Lines changed: 20 additions & 28 deletions b/‎Jenkinsfile‎
Lines changed: 20 additions & 28 deletions
diff --git a/‎barcodes/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎barcodes/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎font-asian/pom.xml‎
Lines changed: 1 addition & 8 deletions b/‎font-asian/pom.xml‎
Lines changed: 1 addition & 8 deletions
diff --git a/‎forms/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎forms/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎forms/src/main/java/com/itextpdf/forms/PdfAcroForm.java‎
Lines changed: 13 additions & 4 deletions b/‎forms/src/main/java/com/itextpdf/forms/PdfAcroForm.java‎
Lines changed: 13 additions & 4 deletions
diff --git a/‎forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java‎
Lines changed: 11 additions & 3 deletions b/‎forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java‎
Lines changed: 11 additions & 3 deletions
@@ -64,7 +64,6 @@ Peter Goodman <[email protected]>                              <[email protected]
 Peter Goodman <[email protected]>                              <[email protected]>
 Peter Goodman <[email protected]>                              <[email protected]>
 Peter Kjuak <[email protected]>                        <[email protected]>
-Richard Cohn <[email protected]>                                <[email protected]>
 Richard Schwark <[email protected]>                   <[email protected]>
 Roman Leonov <[email protected]>                       <[email protected]>
 Roman Nadvodny <[email protected]>                 <[email protected]>
 
@@ -7,12 +7,28 @@ $ mvn clean install \
     > >(tee mvn.log) 2> >(tee mvn-error.log >&2)
 ```
 
-To run the tests, [Ghostscript][2] and [Imagemagick][3] must be installed.
+Please note that tests are not run in default profile. To run tests, [Ghostscript][2] and [Imagemagick][3] must be installed. 
+Some of the tests compare generated PDF files with template files that show the correct results, and these tools are used to
+visually compare PDF files. Ghostscript is required to render PDF files into images and Imagemagick is used to compare image data. 
+There are two options for running tests:
+1. Pass Ghostscript and Imagemagick compare commands as ITEXT_GS_EXEC and ITEXT_MAGICK_COMPARE_EXEC environment variables, respectively 
+(Ghostscript and Imagemagick folders must be added to PATH environment variable). This option is suitable for both Windows and Unix systems. 
+The syntax of commands depends on installed Ghostscript and Imagemagick versions (`gs`, `gswin64c`, `magick compare`).
+2. Pass the paths to Ghostscript and Imagemagick compare execution files as ITEXT_GS_EXEC and ITEXT_MAGICK_COMPARE_EXEC 
+environment variables. Examples of paths on Windows:
+- `C:\Program Files\gs\gs9.26\bin\gswin64c.exe`
+- `C:\Program Files\ImageMagick-7.0.9-Q16\compare.exe`
+
+If you have a new version of ImageMagick, then there is no compare.exe utility there, wrap the path to magick.exe in quotes and call compare command:
+ITEXT_MAGICK_COMPARE_EXEC=`"C:\Program Files\ImageMagick-7.0.9-Q16\magick.exe" compare`
+
+To run build with tests, activate the `test` profile and pass ITEXT_GS_EXEC and ITEXT_MAGICK_COMPARE_EXEC environment variables:
 ```bash
 $ mvn clean install \
+	-P test \
     -Dmaven.test.failure.ignore=false \
-    -DgsExec=$(which gs) \
-    -DcompareExec=$(which compare) \
+    -DITEXT_GS_EXEC="gs command" \
+    -DITEXT_MAGICK_COMPARE_EXEC="magick compare command" \
     > >(tee mvn.log) 2> >(tee mvn-error.log >&2)
 ```
 
 
@@ -1,24 +1,7 @@
 #!/usr/bin/env groovy
 @Library('pipeline-library')_
 
-def schedule, sonarBranchName, sonarBranchTarget
-switch (env.BRANCH_NAME) {
-    case ~/.*master.*/:
-        schedule = '@monthly'
-        sonarBranchName = '-Dsonar.branch.name=master'
-        sonarBranchTarget = ''
-        break
-    case ~/.*develop.*/:
-        schedule = '@midnight'
-        sonarBranchName = '-Dsonar.branch.name=develop'
-        sonarBranchTarget = '-Dsonar.branch.target=master'
-        break
-    default:
-        schedule = ''
-        sonarBranchName = '-Dsonar.branch.name=' + env.BRANCH_NAME
-        sonarBranchTarget = '-Dsonar.branch.target=develop'
-        break
-}
+def vars = setBranchDependentVars(env.BRANCH_NAME)
 
 pipeline {
 
@@ -30,15 +13,22 @@ pipeline {
 
     options {
         ansiColor('xterm')
-        buildDiscarder(logRotator(artifactNumToKeepStr: '1'))
+        buildDiscarder(
+            logRotator(
+                numToKeepStr: vars.buildNumToKeep,
+                artifactNumToKeepStr: vars.buildArtifactNumToKeep,
+                daysToKeepStr: vars.buildDaysToKeep,
+                artifactDaysToKeepStr: vars.buildArtifactDaysToKeep
+            )
+        )
         parallelsAlwaysFailFast()
         skipStagesAfterUnstable()
         timeout(time: 2, unit: 'HOURS')
         timestamps()
     }
 
     triggers {
-        cron(schedule)
+        cron(vars.schedule)
     }
 
     tools {
@@ -47,6 +37,13 @@ pipeline {
     }
 
     stages {
+	    stage('Abort possible previous builds') {
+            steps {
+                script {
+                    abortPreviousBuilds()
+                }
+            }
+        }
         stage('Build') {
             options {
                 retry(2)
@@ -90,11 +87,6 @@ pipeline {
                 withMaven(jdk: "${JDK_VERSION}", maven: 'M3', mavenLocalRepo: '.repository') {
                     sh 'mvn --no-transfer-progress verify --activate-profiles qa -Dpmd.analysisCache=true'
                 }
-                recordIssues(tools: [
-                        checkStyle(),
-                        pmdParser(),
-                        spotBugs(useRankAsPriority: true)
-                ])
                 dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
             }
         }
@@ -105,7 +97,7 @@ pipeline {
             steps {
                 withMaven(jdk: "${JDK_VERSION}", maven: 'M3', mavenLocalRepo: '.repository') {
                     withSonarQubeEnv('Sonar') {
-                        sh 'mvn --no-transfer-progress --activate-profiles test -DgsExec="${gsExec}" -DcompareExec="${compareExec}" -Dmaven.main.skip=true -Dmaven.test.failure.ignore=false org.jacoco:jacoco-maven-plugin:prepare-agent verify org.jacoco:jacoco-maven-plugin:report -Dsonar.java.spotbugs.reportPaths="target/spotbugs.xml" sonar:sonar ' + sonarBranchName + ' ' + sonarBranchTarget
+                        sh "mvn --no-transfer-progress --activate-profiles test -DgsExec=\"$gsExec\" -DcompareExec=\"$compareExec\" -Dmaven.main.skip=true -Dmaven.test.failure.ignore=false org.jacoco:jacoco-maven-plugin:prepare-agent verify org.jacoco:jacoco-maven-plugin:report -Dsonar.java.spotbugs.reportPaths=\"target/spotbugs.xml\" sonar:sonar $vars.sonarBranchName $vars.sonarBranchTarget"
                     }
                 }
             }
@@ -198,14 +190,14 @@ pipeline {
         }
         fixed {
             script {
-                if (env.BRANCH_NAME.contains('master') || env.BRANCH_NAME.contains('develop')) {
+                if (vars.notifySlack) {
                     slackNotifier("#ci", currentBuild.currentResult, "${env.BRANCH_NAME} - Back to normal")
                 }
             }
         }
         regression {
             script {
-                if (env.BRANCH_NAME.contains('master') || env.BRANCH_NAME.contains('develop')) {
+                if (vars.notifySlack) {
                     slackNotifier("#ci", currentBuild.currentResult, "${env.BRANCH_NAME} - First failure")
                 }
             }
 
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.11</version>
+    <version>7.1.12</version>
   </parent>
   <artifactId>barcodes</artifactId>
   <name>iText 7 - barcodes</name>
 
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.11</version>
+    <version>7.1.12</version>
   </parent>
   <artifactId>font-asian</artifactId>
   <name>iText 7 - Asian fonts</name>
@@ -21,33 +21,26 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${failsafe.version}</version>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${javadoc.version}</version>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.pitest</groupId>
         <artifactId>pitest-maven</artifactId>
-        <version>${pitest.version}</version>
         <configuration>
           <skip>true</skip>
         </configuration>
 
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.11</version>
+    <version>7.1.12</version>
   </parent>
   <artifactId>forms</artifactId>
   <name>iText 7 - forms</name>
 
@@ -730,10 +730,9 @@ public void flattenFields() {
             PdfDictionary parent = fieldObject.getAsDictionary(PdfName.Parent);
             if (parent != null) {
                 PdfArray kids = parent.getAsArray(PdfName.Kids);
-                if(kids!=null) {
+                if (kids != null) {
                     kids.remove(fieldObject);
-                    // TODO what if parent was in it's turn the only child of it's parent (parent of parent)?
-                    // shouldn't we remove them recursively? check it
+                    // TODO DEVSIX-2715 if parent was in it's turn the only child of it's parent, we should remove them recursively
                     if (kids.isEmpty()) {
                         fFields.remove(parent);
                     }
@@ -976,7 +975,7 @@ private void addWidgetAnnotationToPage(PdfPage page, PdfAnnotation annot) {
         boolean tagged = page.getDocument().isTagged();
         if (tagged) {
             tagPointer = page.getDocument().getTagStructureContext().getAutoTaggingPointer();
-            //TODO attributes?
+            //TODO DEVSIX-4117 PrintField attributes
             tagPointer.addTag(StandardRoles.FORM);
         }
 
@@ -1036,6 +1035,16 @@ public void release() {
         fields = null;
     }
 
+    @Override
+    public PdfObjectWrapper<PdfDictionary> setModified() {
+        if (getPdfObject().getIndirectReference() != null) {
+            super.setModified();
+        } else {
+            document.getCatalog().setModified();
+        }
+        return this;
+    }
+
     private static PdfDictionary createAcroFormDictionaryByFields(PdfArray fields) {
         PdfDictionary dictionary = new PdfDictionary();
         dictionary.put(PdfName.Fields, fields);
 
@@ -89,6 +89,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
 import com.itextpdf.layout.Canvas;
 import com.itextpdf.layout.Style;
+import com.itextpdf.layout.element.Div;
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Text;
 import com.itextpdf.layout.layout.LayoutArea;
@@ -2608,11 +2609,17 @@ private void drawChoiceAppearance(Rectangle rect, float fontSize, String value,
 
         Canvas modelCanvas = new Canvas(canvas, new Rectangle(3, 0, Math.max(0, width - widthBorder), Math.max(0, height - heightBorder)));
         modelCanvas.setProperty(Property.APPEARANCE_STREAM_LAYOUT, true);
+        Div div = new Div();
+        if(getFieldFlag(PdfChoiceFormField.FF_COMBO)) {
+            div.setVerticalAlignment(VerticalAlignment.MIDDLE);
+        }
+        div.setHeight(Math.max(0, height - heightBorder));
         for (int index = 0; index < strings.size(); index++) {
             Boolean isFull = modelCanvas.getRenderer().getPropertyAsBoolean(Property.FULL);
             if (Boolean.TRUE.equals(isFull)) {
                 break;
             }
+
             Paragraph paragraph = new Paragraph(strings.get(index)).setFont(font).setFontSize(fontSize).setMargins(0, 0, 0, 0).setMultipliedLeading(1);
             paragraph.setProperty(Property.FORCED_PLACEMENT, true);
             paragraph.setTextAlignment(convertJustificationToTextAlignment());
@@ -2636,8 +2643,9 @@ private void drawChoiceAppearance(Rectangle rect, float fontSize, String value,
                     }
                 }
             }
-            modelCanvas.add(paragraph);
+            div.add(paragraph);
         }
+        modelCanvas.add(div);
         canvas.
                 restoreState().
                 endVariableText();
@@ -2891,15 +2899,15 @@ protected void drawPdfA2CheckAppearance(float width, float height, String onStat
     }
 
     /**
+     * Draws PDF/A-1 compliant check appearance.
+     * 
      * @param width         width of the checkbox
      * @param height        height of the checkbox
      * @param selectedValue the selected value of the checkbox which determines the appearance of the checkbox
      * @param checkType     the type that determines how the checkbox will look like. Allowed values are {@value TYPE_CHECK},
      *                      {@value TYPE_CIRCLE}, {@value TYPE_CROSS}, {@value TYPE_DIAMOND}, {@value TYPE_SQUARE}, {@value TYPE_STAR}
      * @deprecated use {@link #drawPdfA2CheckAppearance(float, float, String, int)} instead.
      */
-    // TODO when removing the method: check {@link #drawCheckBox(PdfCanvas, float, float, float, boolean)} and consider
-    //  removing last redundant "on" parameter
     @Deprecated
     protected void drawPdfA1CheckAppearance(float width, float height, String selectedValue, int checkType) {
         PdfStream stream = (PdfStream) new PdfStream().makeIndirect(getDocument());