[RELEASE] Merge branch 'release/7.1.0' into 'master'

itext · Dec 1, 2017 · ca3ffea · ca3ffea
2 parents 1ad59bf + 249be21
commit ca3ffea
Show file tree

Hide file tree

Showing 749 changed files with 18,751 additions and 9,805 deletions.
diff --git a/barcodes/pom.xml b/barcodes/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.5</version>
+    <version>7.1.0</version>
   </parent>
 
   <artifactId>barcodes</artifactId>
@@ -29,13 +29,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <groups>${unittests}</groups>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -46,6 +39,13 @@
           <groups>${integrationtests}</groups>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <groups>${unittests}</groups>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java b/barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java b/barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java
@@ -46,7 +46,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.font.FontProgram;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDocument;

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java b/barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java
@@ -45,7 +45,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
 

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java b/barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java
@@ -43,17 +43,12 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.barcodes;
 
-import com.itextpdf.kernel.PdfException;
-import com.itextpdf.io.font.FontConstants;
-import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfDocument;
 
 import java.awt.Image;
-import java.io.IOException;
 
 public class Barcode39 extends Barcode1D {
 

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java
@@ -44,12 +44,9 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.io.font.FontConstants;
-import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfDocument;
 
 public class BarcodeCodabar extends Barcode1D {

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java
@@ -48,7 +48,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.barcodes.dmcode.ReedSolomon;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
@@ -99,13 +99,6 @@ public class BarcodeDataMatrix extends Barcode2D {
      * X12 encodation.
      */
     public static final int DM_X12 = 5;
-    /**
-     * X12 encodation.
-     *
-     * @deprecated Use {@link BarcodeDataMatrix#DM_X12} instead.
-     */
-    @Deprecated
-    public static final int DM_X21 = 5;
     /**
      * EDIFACT encodation.
      */

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java
@@ -44,16 +44,12 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.io.font.FontConstants;
-import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfDocument;
 
 import java.awt.Image;
-import java.io.IOException;
 import java.util.Arrays;
 
 public class BarcodeEAN extends Barcode1D {

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEANSUPP.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEANSUPP.java
@@ -48,7 +48,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.font.FontProgram;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 
 
 public class BarcodeEANSUPP extends Barcode1D {

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java
@@ -45,12 +45,9 @@ This file is part of the iText (R) project.
 
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.io.font.FontConstants;
-import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfDocument;
 
 import java.awt.Image;
@@ -63,7 +60,7 @@ This file is part of the iText (R) project.
  * <pre>
  * x = 0.8f;
  * n = 2;
- * font = new PdfType1Font(document, new TYPE_1_FONT(FontConstants.HELVETICA, PdfEncodings.WINANSI));
+ * font = new PdfType1Font(document, new TYPE_1_FONT(StandardFonts.HELVETICA, PdfEncodings.WINANSI));
  * size = 8;
  * baseline = size;
  * barHeight = size * 3;

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeMSI.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeMSI.java
@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.barcodes;
 
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodePDF417.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodePDF417.java
@@ -47,7 +47,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodePostnet.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodePostnet.java
@@ -46,7 +46,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfDocument;
 
 import java.awt.Image;

diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeQRCode.java b/barcodes/src/main/java/com/itextpdf/barcodes/BarcodeQRCode.java
@@ -49,7 +49,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.barcodes.qrcode.WriterException;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/Barcode128Test.java b/barcodes/src/test/java/com/itextpdf/barcodes/Barcode128Test.java
@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/Barcode39Test.java b/barcodes/src/test/java/com/itextpdf/barcodes/Barcode39Test.java
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.io.source.ByteArrayOutputStream;
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeDataMatrixTest.java b/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeDataMatrixTest.java
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
 
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfWriter;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeEANTest.java b/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeEANTest.java
@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeInter25Test.java b/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeInter25Test.java
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
 
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfWriter;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeMSITest.java b/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeMSITest.java
@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/BarcodePDF417Test.java b/barcodes/src/test/java/com/itextpdf/barcodes/BarcodePDF417Test.java
@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;

diff --git a/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeQRCodeTest.java b/barcodes/src/test/java/com/itextpdf/barcodes/BarcodeQRCodeTest.java
@@ -45,7 +45,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.barcodes.qrcode.EncodeHintType;
 import com.itextpdf.barcodes.qrcode.ErrorCorrectionLevel;
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfWriter;

diff --git a/font-asian/pom.xml b/font-asian/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.5</version>
+    <version>7.1.0</version>
   </parent>
 
   <artifactId>font-asian</artifactId>
@@ -22,17 +22,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.pitest</groupId>
-        <artifactId>pitest-maven</artifactId>
-        <version>${pitest.version}</version>
+        <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-javadoc-plugin</artifactId>
-        <version>${javadoc.version}</version>
+        <groupId>org.pitest</groupId>
+        <artifactId>pitest-maven</artifactId>
+        <version>${pitest.version}</version>
         <configuration>
           <skip>true</skip>
         </configuration>

diff --git a/forms/pom.xml b/forms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.5</version>
+    <version>7.1.0</version>
   </parent>
 
   <artifactId>forms</artifactId>
@@ -32,14 +32,14 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk15on</artifactId>
       <version>${bouncycastle.version}</version>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcprov-jdk15on</artifactId>
       <version>${bouncycastle.version}</version>
       <scope>test</scope>
       <optional>true</optional>
@@ -49,13 +49,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <groups>${unittests}</groups>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -66,6 +59,13 @@
           <groups>${integrationtests}</groups>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <groups>${unittests}</groups>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>