Skip to content

Commit dd93ae9

Browse files
committed
Merge branch 'release/5.5.9'
2 parents c1fe1f9 + 298d35b commit dd93ae9

File tree

813 files changed

+4209
-2112
lines changed

Some content is hidden

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

813 files changed

+4209
-2112
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,7 @@ target/
148148
nbactions*.xml
149149
*.patch
150150
*.md.html
151+
.pmd
152+
.pmdruleset.xml
153+
.checkstyle
154+
.vagrant/

BUILDING.md

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
1-
To build iText, Maven must be installed: http://maven.apache.org/
1+
To build iText, [Maven][1] must be installed.
22

33
Running install without a profile will generate the itextpdf jar:
4+
```bash
5+
$ mvn clean install -Dmaven.test.skip=true | tee mvn.log
6+
```
47

5-
```mvn install```
8+
When using the profile `all` also the source and javadoc jars will be generated:
9+
```bash
10+
$ mvn clean install -P all -Dmaven.test.skip=true | tee mvn.log
11+
```
612

7-
When using the profile 'all' also the source and javadoc jars will be generated:
8-
9-
```mvn install -P all```
10-
11-
If you are in need of the asian font jars, you can run one of the following commands:
12-
13-
```mvn clean install -f itext-asian.pom```
14-
```mvn clean install -f itext-asiancmaps.pom```
13+
If you are in need of the Asian font jars, you can run one of the following commands:
14+
```bash
15+
$ mvn clean install -f itextpdf/itext-asian.pom | tee mvn.log
16+
```
1517

1618
If you need the hyphenation jar, execute:
17-
18-
```mvn clean install -f itext-hyph-xml.pom```
19+
```bash
20+
$ mvn clean install -f itextpdf/itext-hyph-xml.pom | tee mvn.log
21+
```
22+
23+
To run the tests, [Ghostscript][2] and [Imagemagick][3] must be installed.
24+
```bash
25+
$ mvn clean install -Dmaven.test.failure.ignore=false -DgsExec=$(which gs) -DcompareExec=$(which compare) | tee mvn.log
26+
```
27+
28+
You can use the `Vagrantfile` to get a [Vagrant][4] VM ([Ubuntu][5] 14.04 LTS - Trusty Tahr, with [VirtualBox][6]) with all the required software installed.
29+
```bash
30+
$ vagrant box add ubuntu/trusty64
31+
$ vagrant up
32+
$ vagrant ssh -- 'cd /vagrant ; mvn clean install -Dmaven.test.skip=true' | tee mvn.log
33+
```
34+
35+
[1]: http://maven.apache.org/
36+
[2]: http://www.ghostscript.com/
37+
[3]: http://www.imagemagick.org/
38+
[4]: https://www.vagrantup.com/
39+
[5]: http://www.ubuntu.com/
40+
[6]: https://www.virtualbox.org/

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at http://itextpdf.com/contact. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at [http://contributor-covenant.org/version/1/4][version]
72+
73+
[homepage]: http://contributor-covenant.org
74+
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,48 @@ today! Here are the guidelines we'd like you to follow:
1010
- [Coding Rules](#rules)
1111
- [Commit Message Guidelines](#commit)
1212
- [Signing the iCLA](#cla)
13-
- [Further Info](#info)
13+
- [Contributor Code of Conduct](#coc)
1414

15-
## <a name="question"></a> Got a Question or Problem?
15+
16+
## <a name="question">Got a Question or Problem?</a>
1617

1718
If you have questions about how to use iText, please direct these to [StackOverflow][stackoverflow].
1819

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

21-
## <a name="issue"></a> Found an Issue?
22+
23+
## <a name="issue">Found an Issue?</a>
2224
If you find a bug in the source code or a mistake in the documentation, you can help us by
2325
submitting a [Pull Request][pull] with a fix.
2426

2527
**Please see the [Submission Guidelines](#submit) below**.
2628

27-
## <a name="feature"></a> Want to implement a Feature?
29+
30+
## <a name="feature">Want to implement a Feature?</a>
2831
If you would like to implement a new feature then consider what kind of change it is:
2932

3033
* **Major Changes** that you wish to contribute to the project should be discussed first so that we can better
3134
coordinate our efforts, prevent duplication of work, and help you to craft the change so that it is successfully
3235
accepted into the project.
3336
* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a [Pull Request][pull].
3437

35-
## <a name="submit"></a> Submission Guidelines
3638

37-
### Submitting an Issue
38-
Before you submit your issue, search [Stack Overflow][stackoverflow], maybe your question was already answered.
39+
## <a name="submit">Submission Guidelines</a>
40+
41+
### Submitting a Question or an Issue
42+
Before you submit your question or issue, search [Stack Overflow][stackoverflow], maybe your question was already answered.
3943

4044
If your issue appears to be a bug, and hasn't been reported, ask a question on [Stack Overflow][stackoverflow].
4145
Help us to maximize the effort we can spend fixing issues and adding new
4246
features, by not reporting duplicate issues. Providing the following information will increase the
4347
chances of your issue being dealt with quickly:
4448

49+
* **[How to ask good questions][good-questions]**
4550
* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
4651
* **Motivation for or Use Case** - explain why this is a bug for you
4752
* **iText Version(s)** - is it a regression?
4853
* **Operating System** - is this a problem on Windows or Linux, maybe on Mac?
49-
* **Reproduce the Error** - provide a [Short, Self Contained, Correct (Compilable), Example][sscce].
54+
* **Reproduce the Error** - provide a [Short, Self Contained, Correct (Compilable), Example][sscce], also known as a [Minimal, Complete, and Verifiable example][mcve].
5055
* **Related Issues** - has a similar issue been reported before?
5156
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
5257
causing the problem (line of code or commit)
@@ -143,7 +148,8 @@ from the main (upstream) repository:
143148
git pull --ff upstream develop
144149
```
145150
146-
## <a name="rules"></a> Coding Rules
151+
152+
## <a name="rules">Coding Rules</a>
147153
To ensure consistency throughout the source code, keep these rules in mind as you are working:
148154
149155
* All features or bug fixes **must be tested** by one or more [unit tests][unit-testing].
@@ -153,7 +159,8 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
153159
[Oracle's Code Conventions for the Java Programming Language][java-style-guide], with these additions:
154160
* Wrap all code at **100 characters**.
155161

156-
## <a name="commit"></a> Git Commit Guidelines
162+
163+
## <a name="commit">Git Commit Guidelines</a>
157164

158165
We have very precise rules over how our git commit messages can be formatted. This leads to **more
159166
readable messages** that are easy to follow when looking through the **project history**. But also,
@@ -189,14 +196,23 @@ The body should include the motivation for the change and contrast this with pre
189196
The footer should contain any information about **Breaking Changes** and is also the place to
190197
reference JIRA or GitHub issues that this commit **Closes**.
191198
192-
## <a name="cla"></a> Signing the iCLA
199+
200+
## <a name="cla">Signing the iCLA</a>
193201
194202
Please sign the iText Contributor License Agreement (iCLA) before sending pull requests. For any larger code
195203
changes (more than 20 lines of significant code) to be accepted, the iCLA must be signed. It's a quick process, we promise!
196204

197205
We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
198206
199207
208+
## <a name="coc">Contributor Code of Conduct</a>
209+
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.
210+
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+
215+
200216
[cla]: http://itextpdf.com/policy
201217
[coc]: https://github.com/itext/itextpdf/blob/master/CODE_OF_CONDUCT.md
202218
[github]: https://github.com/itext/itextpdf
@@ -206,5 +222,7 @@ We'll need you to [(digitally) sign and then email, fax or mail the form][cla].
206222
[pull]: https://github.com/itext/itextpdf/pulls
207223
[sscce]: http://sscce.org/
208224
[stackoverflow]: http://stackoverflow.com/questions/tagged/itext
225+
[good-questions]: http://stackoverflow.com/help/how-to-ask
226+
[mcve]: http://stackoverflow.com/help/mcve
209227
[support]: http://itextpdf.com/support
210228
[unit-testing]: http://junit.org/

EXTRAJARS.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

LICENSE.md

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,36 @@
1-
This program is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License version 3 as published by the Free Software Foundation with the addition of the following permission added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY iText Group NV, iText Group NV DISCLAIMS THE WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
2-
3-
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
4-
You should have received a copy of the GNU Affero General Public License along with this program; if not, see http://www.gnu.org/licenses or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA, 02110-1301 USA, or download the license from the following URL:
5-
6-
http://itextpdf.com/terms-of-use/
7-
8-
The interactive user interfaces in modified source and object code versions of this program must display Appropriate Legal Notices, as required under Section 5 of the GNU Affero General Public License.
9-
10-
In accordance with Section 7(b) of the GNU Affero General Public License, a covered work must retain the producer line in every PDF that is created or manipulated using iText.
11-
12-
You can be released from the requirements of the license by purchasing a commercial license. Buying such a license is mandatory as soon as you develop commercial activities involving the iText software without disclosing the source code of your own applications.
13-
These activities include: offering paid services to customers as an ASP, serving PDFs on the fly in a web application, shipping iText with a closed source product.
14-
15-
For more information, please contact iText Software Corp. at this address: [email protected]
1+
This program is free software; you can redistribute it and/or modify
2+
it under the terms of the GNU Affero General Public License version 3
3+
as published by the Free Software Foundation with the addition of the
4+
following permission added to Section 15 as permitted in Section 7(a):
5+
FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
6+
ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
7+
OF THIRD PARTY RIGHTS
8+
9+
This program is distributed in the hope that it will be useful, but
10+
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11+
or FITNESS FOR A PARTICULAR PURPOSE.
12+
See the GNU Affero General Public License for more details.
13+
You should have received a copy of the GNU Affero General Public License
14+
along with this program; if not, see http://www.gnu.org/licenses or write to
15+
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
16+
Boston, MA, 02110-1301 USA, or download the license from the following URL:
17+
http://itextpdf.com/terms-of-use/
18+
19+
The interactive user interfaces in modified source and object code versions
20+
of this program must display Appropriate Legal Notices, as required under
21+
Section 5 of the GNU Affero General Public License.
22+
23+
In accordance with Section 7(b) of the GNU Affero General Public License,
24+
a covered work must retain the producer line in every PDF that is created
25+
or manipulated using iText.
26+
27+
You can be released from the requirements of the license by purchasing
28+
a commercial license. Buying such a license is mandatory as soon as you
29+
develop commercial activities involving the iText software without
30+
disclosing the source code of your own applications.
31+
These activities include: offering paid services to customers as an ASP,
32+
serving PDFs on the fly in a web application, shipping iText with a closed
33+
source product.
34+
35+
For more information, please contact iText Software Corp. at this
36+

README.md

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
1-
iText consists of several jars.
1+
[iText][itext] consists of several jars.
22

33
The main iText release contains:
44
- ```itextpdf-x.y.z.jar```: the core library
55
- ```itext-xtra-x.y.z.jar```: extra functionality (PDF 2!)
66
- ```itext-pdfa-x.y.z.jar```: PDF/A-related functionality
7+
- ```xmlworker-x.y.z.jar```: XML (and HTML) functionality
78

8-
This project is hosted on https://github.com/itext
9+
iText is hosted on https://github.com/itext/itextpdf
910

1011
You can find the latest releases here:
11-
- https://github.com/itext/itextpdf
12-
- https://github.com/itext/xtra
13-
- https://github.com/itext/pdfa
12+
- http://github.com/itext/itextpdf/releases/latest
1413

1514
You can also [build iText from source][building].
1615

17-
In some cases, you'll need [extra jars][extrajars].
18-
These jars are bundled in a zip file here:
19-
http://sourceforge.net/projects/itext/files/extrajars/
20-
21-
For XML (and HTML) functionality, you need this jar:
22-
- ```xmlworker-x.y.z.jar```
23-
This project is hosted on https://github.com/itext/xmlworker
24-
25-
Finally, we also have a tool that can help you debug PDFs:
16+
We also have a tool that can help you debug PDFs:
2617
- ```itext-rups-x.y.z.jar```
27-
This project is hosted on https://github.com/itext/rups
18+
RUPS is hosted on http://github.com/itext/rups
2819

2920
If you have an idea on how to improve iText and you want to submit code,
3021
please read our [Contribution Guidelines][contributing].
@@ -49,3 +40,4 @@ Contact sales for more info: http://itextpdf.com/sales
4940
[building]: BUILDING.md
5041
[contributing]: CONTRIBUTING.md
5142
[extrajars]: EXTRAJARS.md
43+
[itext]: http://itextpdf.com/

Vagrantfile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
$script = <<SCRIPT
2+
#!/usr/bin/env bash
3+
4+
apt-get update
5+
apt-get -y install dos2unix git git-flow ghostscript imagemagick maven mc openjdk-7-jdk php5-cli screen
6+
7+
git config --global color.ui true
8+
git config --global core.abbrev 10
9+
git config --global core.editor nano
10+
git config --global core.abbrev 10
11+
git config --global --bool pull.rebase true
12+
git config --global branch.autosetupmerge always
13+
git config --global branch.autosetuprebase always
14+
git config --global core.autocrlf input
15+
git config --global core.safecrlf false
16+
git config --global apply.whitespace nowarn
17+
git config --global push.default simple
18+
git config --global alias.ignore '!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi'
19+
SCRIPT
20+
21+
Vagrant.configure(2) do |config|
22+
config.vm.box = "ubuntu/trusty64"
23+
config.vm.provision :shell, inline: $script
24+
config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
25+
config.vm.provider :virtualbox do |vb|
26+
vb.customize ["modifyvm", :id, "--memory", "2048"]
27+
end
28+
end

0 commit comments

Comments
 (0)