Skip to content

Commit f9350ff

Browse files
committed
[RELEASE] iText 5 - 5.5.13.2
Merge branch 'release/5.5.13.2' into master
2 parents 414f7b3 + 96e49f6 commit f9350ff

File tree

1,377 files changed

+1784
-1514
lines changed

Some content is hidden

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

1,377 files changed

+1784
-1514
lines changed

CONTRIBUTING.md

Lines changed: 50 additions & 91 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 [community@itextpdf.com](mailto:community@itextpdf.com).
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,88 +70,37 @@ 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.
74-
75-
```shell
76-
git clone git@github.com:itext/itextpdf.git
77-
cd itextpdf
78-
git fetch origin
79-
git checkout -b develop origin/develop
80-
```
81-
82-
* Make your changes in a new git branch based off the develop branch:
83-
84-
```shell
85-
git checkout -b my-fix-branch develop
86-
```
87-
88-
* Create your patch, **including appropriate test cases**.
73+
* Fork the iText repository on GitHub.
74+
* Clone your iText fork to your local machine.
75+
* Make your changes, **including appropriate test cases**.
8976
* Follow our [Coding Rules](#rules).
90-
* Run the full iText test suite and ensure that all tests pass.
9177
* Commit your changes using a descriptive commit message that follows our
9278
[commit message conventions](#commit-message-format).
93-
94-
```shell
95-
git commit -a
96-
```
97-
Note: the optional commit `-a` command line option will automatically `add` and `rm` edited files.
98-
99-
* Now would be a good time to fix up your commits (if you want or need to) with `git rebase --interactive`.
79+
* Now would be a good time to fix up your commits (if you want or need to) with `git rebase --interactive`.
10080
* Build your changes locally to ensure all the tests pass.
101-
* Push your branch to your GitHub account:
102-
103-
```shell
104-
git remote add my-remote git@github.com:my-remote/itextpdf.git
105-
git push my-remote my-fix-branch
106-
```
107-
108-
* In GitHub, send a pull request to `itextpdf:develop`.
81+
* Push your changes to your GitHub account.
82+
* Create a pull request in GitHub.
83+
"Head fork" should be your repository, and the "base fork" should be the iText7 official repository.
10984
* If we suggest changes then:
11085
* Make the required updates.
111-
* Re-run the iText test suite to ensure tests are still passing.
112-
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
113-
114-
```shell
115-
git fetch origin
116-
git rebase develop -i
117-
git push my-remote my-fix-branch -f
118-
```
86+
* Fix up your commits if needed, with an interactive rebase.
87+
* Re-run the tests and make sure that they are still passing.
88+
* Force push to your GitHub repository. This will update your Pull Request.
11989

12090
That's it! Thank you for your contribution!
12191

12292
#### After your pull request is merged
12393

124-
After your pull request is merged, you can safely delete your branch and pull the changes
125-
from the main (upstream) repository:
126-
127-
* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
128-
129-
```shell
130-
git push my-remote --delete my-fix-branch
131-
```
132-
133-
* Check out the develop branch:
134-
135-
```shell
136-
git checkout develop -f
137-
```
138-
139-
* Delete the local branch:
140-
141-
```shell
142-
git branch -D my-fix-branch
143-
```
144-
145-
* Update your develop with the latest upstream version:
146-
147-
```shell
148-
git pull --ff upstream develop
149-
```
94+
After your pull request is merged, you can safely delete your fork and pull the changes
95+
from the main (upstream) repository.
15096

15197

15298
## <a name="rules">Coding Rules</a>
15399
To ensure consistency throughout the source code, keep these rules in mind as you are working:
154100

101+
* We develop in Java first, and then port to .NET, so code submissions in Java are preferred.
102+
Nevertheless this shouldn't stop you from making a good pull request to the .NET port.
103+
* All Java code **must** be Java 7. Sorry, no lambda expressions or other Java 8 language features.
155104
* All features or bug fixes **must be tested** by one or more [unit tests][unit-testing].
156105
* All public API methods **must be documented** with JavaDoc. To see how we document our APIs, please check
157106
out the existing [javadocs][javadocs].
@@ -162,9 +111,11 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
162111

163112
## <a name="commit">Git Commit Guidelines</a>
164113

165-
We have very precise rules over how our git commit messages can be formatted. This leads to **more
114+
We have guidelines on how our git commit messages should be formatted. This leads to **more
166115
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**.
116+
we use the git commit messages to **generate the iText 7 Community change log**.
117+
118+
These guidelines were taken from Chris Beams' blog post [How to Write a Git Commit Message][git-commit].
168119

169120
### Commit Message Format
170121
Each commit message consists of a **subject**, a **body** and a **footer**:
@@ -177,29 +128,30 @@ Each commit message consists of a **subject**, a **body** and a **footer**:
177128
<footer>
178129
```
179130

180-
Any line of the commit message cannot be longer 70 characters! This allows the message to be easier
131+
Any line of the commit message should not be longer 72 characters! This allows the message to be easier
181132
to read on GitHub as well as in various git tools.
182133

183134
### Subject
184135
The subject contains succinct description of the change:
185136

186-
* use the imperative, present tense: "change" not "changed" nor "changes"
187-
* don't capitalize first letter
188-
* no dot (.) at the end
189-
* describe what the **change** does, not the actions the developer has done
137+
* [Separate subject from body with a blank line][git-commit-separate]
138+
* [Limit the subject line to 50 characters][git-commit-limit-50]
139+
* [Capitalize the subject line][git-commit-capitalize]
140+
* [Do not end the subject line with a period][git-commit-end]
141+
* [Use the imperative mood in the subject line][git-commit-imperative]
190142

191143
### Body
192-
Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
193-
The body should include the motivation for the change and contrast this with previous behavior.
144+
* [Wrap the body at 72 characters][git-commit-wrap-72]
145+
* [Use the body to explain _what_ and _why_ vs. _how_][git-commit-why-not-how]
194146

195147
### Footer
196-
The footer should contain any information about **Breaking Changes** and is also the place to
148+
The footer contains any information about **Breaking Changes** and is also the place to
197149
reference JIRA or GitHub issues that this commit **Closes**.
198150

199151

200152
## <a name="cla">Signing the iCLA</a>
201153

202-
Please sign the iText Contributor License Agreement (iCLA) before sending pull requests. For any larger code
154+
Please sign the **iText Contributor License Agreement (iCLA)** before sending pull requests. For any larger code
203155
changes (more than 20 lines of significant code) to be accepted, the iCLA must be signed. It's a quick process, we promise!
204156

205157
We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
@@ -208,21 +160,28 @@ We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
208160
## <a name="coc">Contributor Code of Conduct</a>
209161
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.
210162

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/
163+
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:
214164

165+
* StackExchange: [http://stackexchange.com/legal](http://stackexchange.com/legal)
166+
* Github: [https://help.github.com/articles/github-terms-of-service/](https://help.github.com/articles/github-terms-of-service/)
215167

216168
[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
169+
[coc]: CODE_OF_CONDUCT.md
170+
[github]: https://github.com/itext/itext7
220171
[java-style-guide]: http://www.oracle.com/technetwork/java/codeconvtoc-136057.html
221172
[javadocs]: http://itextpdf.com/api
222-
[pull]: https://github.com/itext/itextpdf/pulls
173+
[pull]: https://github.com/itext/itext7/pulls
223174
[sscce]: http://sscce.org/
224-
[stackoverflow]: http://stackoverflow.com/questions/tagged/itext
175+
[stackoverflow]: http://stackoverflow.com/questions/tagged/itext7
225176
[good-questions]: http://stackoverflow.com/help/how-to-ask
226177
[mcve]: http://stackoverflow.com/help/mcve
227178
[support]: http://itextpdf.com/support
228179
[unit-testing]: http://junit.org/
180+
[git-commit]: https://chris.beams.io/posts/git-commit/
181+
[git-commit-separate]: https://chris.beams.io/posts/git-commit/#separate
182+
[git-commit-limit-50]: https://chris.beams.io/posts/git-commit/#limit-50
183+
[git-commit-capitalize]: https://chris.beams.io/posts/git-commit/#capitalize
184+
[git-commit-end]: https://chris.beams.io/posts/git-commit/#end
185+
[git-commit-imperative]: https://chris.beams.io/posts/git-commit/#imperative
186+
[git-commit-wrap-72]: https://chris.beams.io/posts/git-commit/#wrap-72
187+
[git-commit-why-not-how]: https://chris.beams.io/posts/git-commit/#why-not-how

itext/barcodeDataMatrix.pdf

-1.51 KB
Binary file not shown.

itext/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>itextpdf</artifactId>
13-
<version>5.5.13.1</version>
13+
<version>5.5.13.2</version>
1414

1515
<name>iText Core</name>
1616
<description>A Free Java-PDF library</description>
@@ -74,14 +74,14 @@
7474
<dependencies>
7575
<dependency>
7676
<groupId>org.bouncycastle</groupId>
77-
<artifactId>bcprov-jdk15on</artifactId>
78-
<version>1.49</version>
77+
<artifactId>bcprov-jdk15to18</artifactId>
78+
<version>1.66</version>
7979
<optional>true</optional>
8080
</dependency>
8181
<dependency>
8282
<groupId>org.bouncycastle</groupId>
8383
<artifactId>bcpkix-jdk15on</artifactId>
84-
<version>1.49</version>
84+
<version>1.66</version>
8585
<optional>true</optional>
8686
</dependency>
8787
<dependency>
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>org.apache.santuario</groupId>
9595
<artifactId>xmlsec</artifactId>
96-
<version>1.5.1</version>
96+
<version>1.5.6</version>
9797
<optional>true</optional>
9898
</dependency>
9999
</dependencies>

itext/src/main/java/com/itextpdf/awt/AsianFontMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/awt/DefaultFontMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/awt/FontMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/awt/PdfGraphics2D.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/awt/PdfPrinterGraphics2D.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/awt/geom/PolylineShape.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/awt/geom/PolylineShapeIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/testutils/CompareTool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/testutils/ITextTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Pavel Alay, Bruno Lowagie, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/text/AccessibleElementId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/text/Anchor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/text/Annotation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

itext/src/main/java/com/itextpdf/text/BadElementException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
*
33
* This file is part of the iText (R) project.
4-
Copyright (c) 1998-2019 iText Group NV
4+
Copyright (c) 1998-2020 iText Group NV
55
* Authors: Bruno Lowagie, Paulo Soares, et al.
66
*
77
* This program is free software; you can redistribute it and/or modify

0 commit comments

Comments
 (0)