Skip to content

Commit ca3ffea

Browse files
amedeeamedee
committed
[RELEASE] Merge branch 'release/7.1.0' into 'master'
2 parents 1ad59bf + 249be21 commit ca3ffea

File tree

749 files changed

+18751
-9805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

749 files changed

+18751
-9805
lines changed

‎barcodes/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.itextpdf</groupId>
77
<artifactId>root</artifactId>
8-
<version>7.0.5</version>
8+
<version>7.1.0</version>
99
</parent>
1010

1111
<artifactId>barcodes</artifactId>
@@ -29,13 +29,6 @@
2929

3030
<build>
3131
<plugins>
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-surefire-plugin</artifactId>
35-
<configuration>
36-
<groups>${unittests}</groups>
37-
</configuration>
38-
</plugin>
3932
<plugin>
4033
<groupId>org.apache.maven.plugins</groupId>
4134
<artifactId>maven-failsafe-plugin</artifactId>
@@ -46,6 +39,13 @@
4639
<groups>${integrationtests}</groups>
4740
</configuration>
4841
</plugin>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-surefire-plugin</artifactId>
45+
<configuration>
46+
<groups>${unittests}</groups>
47+
</configuration>
48+
</plugin>
4949
</plugins>
5050
</build>
5151
</project>

‎barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
4444
package com.itextpdf.barcodes;
4545

4646
import com.itextpdf.kernel.PdfException;
47-
import com.itextpdf.kernel.color.Color;
47+
import com.itextpdf.kernel.colors.Color;
4848
import com.itextpdf.kernel.geom.Rectangle;
4949
import com.itextpdf.kernel.pdf.PdfDocument;
5050
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;

‎barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This file is part of the iText (R) project.
4646
import com.itextpdf.io.font.FontProgram;
4747
import com.itextpdf.kernel.geom.Rectangle;
4848
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
49-
import com.itextpdf.kernel.color.Color;
49+
import com.itextpdf.kernel.colors.Color;
5050
import com.itextpdf.kernel.font.PdfFont;
5151
import com.itextpdf.kernel.pdf.PdfArray;
5252
import com.itextpdf.kernel.pdf.PdfDocument;

‎barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This file is part of the iText (R) project.
4545

4646
import com.itextpdf.kernel.geom.Rectangle;
4747
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
48-
import com.itextpdf.kernel.color.Color;
48+
import com.itextpdf.kernel.colors.Color;
4949
import com.itextpdf.kernel.pdf.PdfDocument;
5050
import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
5151

‎barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,12 @@ This file is part of the iText (R) project.
4343
*/
4444
package com.itextpdf.barcodes;
4545

46-
import com.itextpdf.kernel.PdfException;
47-
import com.itextpdf.io.font.FontConstants;
48-
import com.itextpdf.io.font.PdfEncodings;
4946
import com.itextpdf.kernel.geom.Rectangle;
50-
import com.itextpdf.kernel.font.PdfFontFactory;
5147
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
52-
import com.itextpdf.kernel.color.Color;
48+
import com.itextpdf.kernel.colors.Color;
5349
import com.itextpdf.kernel.pdf.PdfDocument;
5450

5551
import java.awt.Image;
56-
import java.io.IOException;
5752

5853
public class Barcode39 extends Barcode1D {
5954

‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,9 @@ This file is part of the iText (R) project.
4444
package com.itextpdf.barcodes;
4545

4646
import com.itextpdf.kernel.PdfException;
47-
import com.itextpdf.io.font.FontConstants;
48-
import com.itextpdf.io.font.PdfEncodings;
4947
import com.itextpdf.kernel.geom.Rectangle;
50-
import com.itextpdf.kernel.font.PdfFontFactory;
5148
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
52-
import com.itextpdf.kernel.color.Color;
49+
import com.itextpdf.kernel.colors.Color;
5350
import com.itextpdf.kernel.pdf.PdfDocument;
5451

5552
public class BarcodeCodabar extends Barcode1D {

‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ This file is part of the iText (R) project.
4848
import com.itextpdf.barcodes.dmcode.ReedSolomon;
4949
import com.itextpdf.kernel.geom.Rectangle;
5050
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
51-
import com.itextpdf.kernel.color.Color;
51+
import com.itextpdf.kernel.colors.Color;
5252
import com.itextpdf.kernel.pdf.PdfArray;
5353
import com.itextpdf.kernel.pdf.PdfDocument;
5454
import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
@@ -99,13 +99,6 @@ public class BarcodeDataMatrix extends Barcode2D {
9999
* X12 encodation.
100100
*/
101101
public static final int DM_X12 = 5;
102-
/**
103-
* X12 encodation.
104-
*
105-
* @deprecated Use {@link BarcodeDataMatrix#DM_X12} instead.
106-
*/
107-
@Deprecated
108-
public static final int DM_X21 = 5;
109102
/**
110103
* EDIFACT encodation.
111104
*/

‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,12 @@ This file is part of the iText (R) project.
4444
package com.itextpdf.barcodes;
4545

4646
import com.itextpdf.kernel.PdfException;
47-
import com.itextpdf.io.font.FontConstants;
48-
import com.itextpdf.io.font.PdfEncodings;
4947
import com.itextpdf.kernel.geom.Rectangle;
50-
import com.itextpdf.kernel.font.PdfFontFactory;
5148
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
52-
import com.itextpdf.kernel.color.Color;
49+
import com.itextpdf.kernel.colors.Color;
5350
import com.itextpdf.kernel.pdf.PdfDocument;
5451

5552
import java.awt.Image;
56-
import java.io.IOException;
5753
import java.util.Arrays;
5854

5955
public class BarcodeEAN extends Barcode1D {

‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEANSUPP.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ This file is part of the iText (R) project.
4848
import com.itextpdf.io.font.FontProgram;
4949
import com.itextpdf.kernel.geom.Rectangle;
5050
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
51-
import com.itextpdf.kernel.color.Color;
51+
import com.itextpdf.kernel.colors.Color;
5252

5353

5454
public class BarcodeEANSUPP extends Barcode1D {

‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ This file is part of the iText (R) project.
4545

4646

4747
import com.itextpdf.kernel.PdfException;
48-
import com.itextpdf.io.font.FontConstants;
49-
import com.itextpdf.io.font.PdfEncodings;
5048
import com.itextpdf.kernel.geom.Rectangle;
51-
import com.itextpdf.kernel.font.PdfFontFactory;
5249
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
53-
import com.itextpdf.kernel.color.Color;
50+
import com.itextpdf.kernel.colors.Color;
5451
import com.itextpdf.kernel.pdf.PdfDocument;
5552

5653
import java.awt.Image;
@@ -63,7 +60,7 @@ This file is part of the iText (R) project.
6360
* <pre>
6461
* x = 0.8f;
6562
* n = 2;
66-
* font = new PdfType1Font(document, new TYPE_1_FONT(FontConstants.HELVETICA, PdfEncodings.WINANSI));
63+
* font = new PdfType1Font(document, new TYPE_1_FONT(StandardFonts.HELVETICA, PdfEncodings.WINANSI));
6764
* size = 8;
6865
* baseline = size;
6966
* barHeight = size * 3;

0 commit comments

Comments
 (0)