Skip to content

Commit c30f5ca

Browse files
committed
🔖 [RELEASE] Merge branch 'release/7.0.3' into 'master'
DEVSIX-1287, DEVSIX-1289
2 parents 14deebc + 54f234f commit c30f5ca

File tree

638 files changed

+14587
-4964
lines changed

Some content is hidden

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

638 files changed

+14587
-4964
lines changed

BUILDING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
To build iText 7, [Maven][1] must be installed.
1+
To build **iText 7 Community**, [Maven][1] must be installed.
22

3-
Running install without a profile will generate the iText 7 jars:
3+
Running install without a profile will generate the **iText 7 Community** jars:
44
```bash
55
$ mvn clean install \
66
-Dmaven.test.skip=true \

CONTRIBUTING.md

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Contributing to iText
1+
# Contributing to iText 7 Community
22

3-
We'd love for you to contribute to our source code and to make iText even better than it is
3+
We'd love for you to contribute to our source code and to make **iText 7 Community** even better than it is
44
today! Here are the guidelines we'd like you to follow:
55

66
- [Question or Problem?](#question)
@@ -15,7 +15,7 @@ today! Here are the guidelines we'd like you to follow:
1515

1616
## <a name="question">Got a Question or Problem?</a>
1717

18-
If you have questions about how to use iText, please direct these to [StackOverflow][stackoverflow].
18+
If you have questions about how to use **iText 7 Community**, please direct these to [Stack Overflow][stackoverflow].
1919

2020
If you are a customer with a [support agreement][support], you also have direct access to our JIRA and our developers.
2121

@@ -32,7 +32,7 @@ If you would like to implement a new feature then consider what kind of change i
3232

3333
* **Major Changes** that you wish to contribute to the project should be discussed first so that we can better
3434
coordinate our efforts, prevent duplication of work, and help you to craft the change so that it is successfully
35-
accepted into the project.
35+
accepted into the project. Contact us at [[email protected]](mailto:[email protected]).
3636
* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a [Pull Request][pull].
3737

3838

@@ -41,7 +41,7 @@ accepted into the project.
4141
### Submitting a Question or an Issue
4242
Before you submit your question or issue, search [Stack Overflow][stackoverflow], maybe your question was already answered.
4343

44-
If your issue appears to be a bug, and hasn't been reported, ask a question on [Stack Overflow][stackoverflow].
44+
If your issue appears to be a bug, and hasn't been reported, ask a question on [Stack Overflow][stackoverflow] to verify that is indeed a bug and not a mistake in your own code.
4545
Help us to maximize the effort we can spend fixing issues and adding new
4646
features, by not reporting duplicate issues. Providing the following information will increase the
4747
chances of your issue being dealt with quickly:
@@ -55,7 +55,7 @@ chances of your issue being dealt with quickly:
5555
* **Related Issues** - has a similar issue been reported before?
5656
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
5757
causing the problem (line of code or commit)
58-
* **Tag the question** - add the tag 'itext' to your question so we can find it.
58+
* **Tag the question** - add the tag `itext7` to your question so we can find it.
5959

6060
**If you get help, help others. Good karma rulez!**
6161

@@ -70,11 +70,11 @@ Before you submit your pull request consider the following guidelines:
7070
* Please sign the [iText Contributor License Agreement (iCLA)](#cla) before sending pull
7171
requests for any change of more than 20 significant lines of code (we're not counting curly braces and other syntactical sugar).
7272
We cannot accept code without this agreement.
73-
* Clone iText to your local machine.
73+
* Clone **iText 7 Community** to your local machine.
7474

7575
```shell
76-
git clone [email protected]:itext/itextpdf.git
77-
cd itextpdf
76+
git clone [email protected]:itext/itext7.git
77+
cd itext7
7878
git fetch origin
7979
git checkout -b develop origin/develop
8080
```
@@ -87,7 +87,7 @@ Before you submit your pull request consider the following guidelines:
8787

8888
* Create your patch, **including appropriate test cases**.
8989
* Follow our [Coding Rules](#rules).
90-
* Run the full iText test suite and ensure that all tests pass.
90+
* Run the full **iText 7 Community** test suite and ensure that all tests pass.
9191
* Commit your changes using a descriptive commit message that follows our
9292
[commit message conventions](#commit-message-format).
9393

@@ -96,19 +96,19 @@ Before you submit your pull request consider the following guidelines:
9696
```
9797
Note: the optional commit `-a` command line option will automatically `add` and `rm` edited files.
9898

99-
* Now would be a good time to fix up your commits (if you want or need to) with `git rebase --interactive`.
99+
* Now would be a good time to fix up your commits (if you want or need to) with `git rebase --interactive`.
100100
* Build your changes locally to ensure all the tests pass.
101101
* Push your branch to your GitHub account:
102102

103103
```shell
104-
git remote add my-remote [email protected]:my-remote/itextpdf.git
104+
git remote add my-remote [email protected]:my-remote/itext7.git
105105
git push my-remote my-fix-branch
106106
```
107107

108-
* In GitHub, send a pull request to `itextpdf:develop`.
108+
* In GitHub, send a pull request to `itext7:develop`.
109109
* If we suggest changes then:
110110
* Make the required updates.
111-
* Re-run the iText test suite to ensure tests are still passing.
111+
* Re-run the **iText 7 Community** test suite to ensure tests are still passing.
112112
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
113113

114114
```shell
@@ -152,6 +152,9 @@ from the main (upstream) repository:
152152
## <a name="rules">Coding Rules</a>
153153
To ensure consistency throughout the source code, keep these rules in mind as you are working:
154154
155+
* We develop in Java first, and then port to .NET, so code submissions in Java are preferred.
156+
Nevertheless this shouldn't stop you from making a good pull request to the .NET port.
157+
* All Java code **must** be Java 7. Sorry, no lambda expressions or other Java 8 language features.
155158
* All features or bug fixes **must be tested** by one or more [unit tests][unit-testing].
156159
* All public API methods **must be documented** with JavaDoc. To see how we document our APIs, please check
157160
out the existing [javadocs][javadocs].
@@ -162,9 +165,9 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
162165
163166
## <a name="commit">Git Commit Guidelines</a>
164167
165-
We have very precise rules over how our git commit messages can be formatted. This leads to **more
168+
We have guidelines on how our git commit messages should be formatted. This leads to **more
166169
readable messages** that are easy to follow when looking through the **project history**. But also,
167-
we use the git commit messages to **generate the iText change log**.
170+
we use the git commit messages to **generate the iText 7 Community change log**.
168171
169172
### Commit Message Format
170173
Each commit message consists of a **subject**, a **body** and a **footer**:
@@ -177,7 +180,7 @@ Each commit message consists of a **subject**, a **body** and a **footer**:
177180
<footer>
178181
```
179182
180-
Any line of the commit message cannot be longer 70 characters! This allows the message to be easier
183+
Any line of the commit message should not be longer 70 characters! This allows the message to be easier
181184
to read on GitHub as well as in various git tools.
182185
183186
### Subject
@@ -199,7 +202,7 @@ reference JIRA or GitHub issues that this commit **Closes**.
199202

200203
## <a name="cla">Signing the iCLA</a>
201204

202-
Please sign the iText Contributor License Agreement (iCLA) before sending pull requests. For any larger code
205+
Please sign the **iText Contributor License Agreement (iCLA)** before sending pull requests. For any larger code
203206
changes (more than 20 lines of significant code) to be accepted, the iCLA must be signed. It's a quick process, we promise!
204207
205208
We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
@@ -208,20 +211,19 @@ We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
208211
## <a name="coc">Contributor Code of Conduct</a>
209212
Please note that this project is released with a [Contributor Code of Conduct][coc]. By participating in this project you agree to abide by its terms.
210213

211-
We use the StackExchange network for free support and GitHub for code hosting. By using these services, you agree to abide by their terms:
212-
* StackExchange: http://stackexchange.com/legal
213-
* Github: https://help.github.com/articles/github-terms-of-service/
214+
We use the [Stack Exchange][stackoverflow] network for free support and [GitHub][github] for code hosting. By using these services, you agree to abide by their terms:
214215

216+
* StackExchange: [http://stackexchange.com/legal](http://stackexchange.com/legal)
217+
* Github: [https://help.github.com/articles/github-terms-of-service/](https://help.github.com/articles/github-terms-of-service/)
215218

216219
[cla]: http://itextpdf.com/policy
217-
[coc]: https://github.com/itext/itextpdf/blob/master/CODE_OF_CONDUCT.md
218-
[github]: https://github.com/itext/itextpdf
219-
[itext-dev]: https://lists.sourceforge.net/lists/listinfo/itext-developers
220+
[coc]: CODE_OF_CONDUCT.md
221+
[github]: https://github.com/itext/itext7
220222
[java-style-guide]: http://www.oracle.com/technetwork/java/codeconvtoc-136057.html
221223
[javadocs]: http://itextpdf.com/api
222-
[pull]: https://github.com/itext/itextpdf/pulls
224+
[pull]: https://github.com/itext/itext7/pulls
223225
[sscce]: http://sscce.org/
224-
[stackoverflow]: http://stackoverflow.com/questions/tagged/itext
226+
[stackoverflow]: http://stackoverflow.com/questions/tagged/itext7
225227
[good-questions]: http://stackoverflow.com/help/how-to-ask
226228
[mcve]: http://stackoverflow.com/help/mcve
227229
[support]: http://itextpdf.com/support

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
[iText][itext] consists of several jars.
1+
**[iText 7 Community][itext]** consists of several jars.
22

33
The iText 7 Core/Community release contains:
4+
45
- ```kernel-x.y.z.jar```: low-level functionality
56
- ```io-x.y.z.jar```: low-level functionality
67
- ```layout-x.y.z.jar```: high-level functionality
@@ -12,27 +13,28 @@ The iText 7 Core/Community release contains:
1213
- ```font-asian-x.y.z.jar```: use this is you need CJK functionality (Chinese / Japanese / Korean)
1314
- ```sign-x.y.z.jar```: use this if you need support for digital signatures
1415

15-
The iText 7 Community source code is hosted on [Github][github], where you can also [download the latest releases][latest].
16+
The **iText 7 Community** source code is hosted on [Github][github], where you can also [download the latest releases][latest].
1617

1718
You can also [build iText 7 Community from source][building].
1819

19-
We also have a tool that can help you debug PDFs:
20+
We also have a Java tool that can help you debug PDFs:
2021
- ```itext-rups-x.y.z.jar```
2122
RUPS is also hosted on [Github][github-rups]
2223

23-
If you have an idea on how to improve iText and you want to submit code,
24+
If you have an idea on how to improve **iText 7 Community** and you want to submit code,
2425
please read our [Contribution Guidelines][contributing].
2526

26-
iText is dual licensed as [AGPL][agpl]/Commercial software.
27+
**iText 7** is dual licensed as [AGPL][agpl]/[Commercial software][sales].
2728

2829
AGPL is a free / open source software license.
2930

30-
This doesn't mean the software is gratis!
31+
This doesn't mean the software is [gratis][gratis]!
3132

3233
Buying a license is mandatory as soon as you develop commercial activities
3334
distributing the iText software inside your product or deploying it on a network
3435
without disclosing the source code of your own applications under the AGPL license.
3536
These activities include:
37+
3638
- offering paid services to customers as an ASP
3739
- serving PDFs on the fly in the cloud or in a web application
3840
- shipping iText with a closed source product
@@ -42,9 +44,9 @@ Contact [sales] for more info.
4244
[agpl]: LICENSE.md
4345
[building]: BUILDING.md
4446
[contributing]: CONTRIBUTING.md
45-
[extrajars]: EXTRAJARS.md
4647
[itext]: http://itextpdf.com/
4748
[github]: https://github.com/itext/itext7
4849
[latest]: https://github.com/itext/itext7/releases/latest
4950
[github-rups]: http://github.com/itext/rups
50-
[sales]: http://itextpdf.com/sales
51+
[sales]: http://itextpdf.com/sales
52+
[gratis]: https://en.wikipedia.org/wiki/Gratis_versus_libre

barcodes/pom.xml

Lines changed: 1 addition & 2 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.2</version>
8+
<version>7.0.3</version>
99
</parent>
1010

1111
<artifactId>barcodes</artifactId>
@@ -23,7 +23,6 @@
2323
<groupId>com.itextpdf</groupId>
2424
<artifactId>kernel</artifactId>
2525
<version>${project.version}</version>
26-
<scope>compile</scope>
2726
</dependency>
2827
</dependencies>
2928

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

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

46-
import com.itextpdf.io.font.FontConstants;
47-
import com.itextpdf.io.font.PdfEncodings;
4846
import com.itextpdf.kernel.PdfException;
4947
import com.itextpdf.kernel.color.Color;
50-
import com.itextpdf.kernel.font.PdfFontFactory;
5148
import com.itextpdf.kernel.geom.Rectangle;
5249
import com.itextpdf.kernel.pdf.PdfDocument;
5350
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
5451

55-
import java.io.IOException;
5652
import java.util.HashMap;
5753
import java.util.Map;
5854

@@ -344,7 +340,7 @@ public static String getRawText(String text, boolean ucc, Barcode128CodeSet code
344340
throw new PdfException(PdfException.ThereAreIllegalCharactersForBarcode128In1);
345341
}
346342
c = text.charAt(0);
347-
char currentCode = START_B;
343+
char currentCode = getStartSymbol(codeSet);
348344
int index = 0;
349345
if ((codeSet == Barcode128CodeSet.AUTO || codeSet == Barcode128CodeSet.C) && isNextDigits(text, index, 2)) {
350346
currentCode = START_C;

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/Version.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,6 @@ public int getTotalECCodewords() {
272272
return ecCodewordsPerBlock * getNumBlocks();
273273
}
274274

275-
/**
276-
* @return
277-
*/
278275
public ECB[] getECBlocks() {
279276
return ecBlocks;
280277
}

barcodes/src/test/java/com/itextpdf/barcodes/Barcode128Test.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,13 @@ This file is part of the iText (R) project.
5252
import com.itextpdf.kernel.utils.CompareTool;
5353
import com.itextpdf.test.ExtendedITextTest;
5454
import com.itextpdf.test.annotations.type.IntegrationTest;
55-
56-
import java.io.IOException;
57-
5855
import org.junit.Assert;
5956
import org.junit.BeforeClass;
6057
import org.junit.Test;
6158
import org.junit.experimental.categories.Category;
6259

60+
import java.io.IOException;
61+
6362
@Category(IntegrationTest.class)
6463
public class Barcode128Test extends ExtendedITextTest {
6564

@@ -112,4 +111,10 @@ public void barcode02Test() throws IOException, PdfException, InterruptedExcepti
112111

113112
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
114113
}
114+
115+
@Test
116+
public void barcodeRawValueGenerationTest01() {
117+
Assert.assertEquals(new String(new byte[] {103, 17, 18, 19, 20, 21, 17, 18, 19, 20, 21}), Barcode128.getRawText("1234512345", false, Barcode128.Barcode128CodeSet.A));
118+
}
119+
115120
}

font-asian/pom.xml

Lines changed: 9 additions & 1 deletion
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.2</version>
8+
<version>7.0.3</version>
99
</parent>
1010

1111
<artifactId>font-asian</artifactId>
@@ -28,6 +28,14 @@
2828
<skip>true</skip>
2929
</configuration>
3030
</plugin>
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-javadoc-plugin</artifactId>
34+
<version>${javadoc.version}</version>
35+
<configuration>
36+
<skip>true</skip>
37+
</configuration>
38+
</plugin>
3139
</plugins>
3240
</build>
3341

forms/pom.xml

Lines changed: 1 addition & 5 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.2</version>
8+
<version>7.0.3</version>
99
</parent>
1010

1111
<artifactId>forms</artifactId>
@@ -17,13 +17,11 @@
1717
<groupId>com.itextpdf</groupId>
1818
<artifactId>kernel</artifactId>
1919
<version>${project.version}</version>
20-
<scope>compile</scope>
2120
</dependency>
2221
<dependency>
2322
<groupId>com.itextpdf</groupId>
2423
<artifactId>layout</artifactId>
2524
<version>${project.version}</version>
26-
<scope>compile</scope>
2725
</dependency>
2826
<dependency>
2927
<groupId>com.itextpdf</groupId>
@@ -35,15 +33,13 @@
3533
<groupId>org.bouncycastle</groupId>
3634
<artifactId>bcprov-jdk15on</artifactId>
3735
<version>${bouncycastle.version}</version>
38-
<type>jar</type>
3936
<scope>test</scope>
4037
<optional>true</optional>
4138
</dependency>
4239
<dependency>
4340
<groupId>org.bouncycastle</groupId>
4441
<artifactId>bcpkix-jdk15on</artifactId>
4542
<version>${bouncycastle.version}</version>
46-
<type>jar</type>
4743
<scope>test</scope>
4844
<optional>true</optional>
4945
</dependency>

0 commit comments

Comments
 (0)