Skip to content

Commit aa98a78

Browse files
amedeeamedee
committed
[RELEASE] merging 'release/5.5.11' into 'master'
2 parents 80bfa36 + 7d36fe3 commit aa98a78

File tree

1,384 files changed

+24192
-1548
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,384 files changed

+24192
-1548
lines changed

‎itext/itext-asian.pom‎

Lines changed: 79 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,94 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<artifactId>itext-parent</artifactId>
8-
<groupId>com.itextpdf</groupId>
9-
<version>1.0.0</version>
10-
</parent>
6+
<parent>
7+
<artifactId>itext-parent</artifactId>
8+
<groupId>com.itextpdf</groupId>
9+
<version>1.0.0</version>
10+
</parent>
1111

12-
<artifactId>itext-asian</artifactId>
13-
<packaging>jar</packaging>
14-
<version>5.2.0</version>
12+
<artifactId>itext-asian</artifactId>
13+
<version>5.2.0</version>
1514

16-
<name>iText, a Free Java-PDF library</name>
17-
<description>iTextAsian fonts for use in conjunction with iText, a free Java-PDF library</description>
18-
<url>http://www.itextpdf.com/</url>
15+
<name>iText, a Free Java-PDF library</name>
16+
<description>iTextAsian fonts for use in conjunction with iText, a free Java-PDF library</description>
17+
<url>http://www.itextpdf.com/</url>
1918

20-
<licenses>
21-
<license>
22-
<name>GNU Affero General Public License v3</name>
23-
<url>http://www.fsf.org/licensing/licenses/agpl-3.0.html</url>
24-
</license>
25-
</licenses>
19+
<licenses>
20+
<license>
21+
<name>GNU Affero General Public License v3</name>
22+
<url>http://www.fsf.org/licensing/licenses/agpl-3.0.html</url>
23+
</license>
24+
</licenses>
2625

27-
<developers>
28-
</developers>
26+
<developers>
27+
<developer>
28+
<id>itext</id>
29+
<name>iText Software</name>
30+
<email>[email protected]</email>
31+
<url>http://www.itextpdf.com</url>
32+
</developer>
33+
</developers>
2934

30-
<mailingLists>
31-
<mailingList>
32-
<name>iText on StackOverflow</name>
33-
<subscribe>
34-
http://stackoverflow.com/questions/tagged/itext
35-
</subscribe>
36-
<archive>
37-
http://stackoverflow.com/questions/tagged/itext
38-
</archive>
39-
<otherArchives>
40-
<otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
41-
<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
42-
<otherArchive>http://www.junlu.com/2.html</otherArchive>
43-
<otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
44-
<otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
45-
</otherArchives>
46-
</mailingList>
47-
</mailingLists>
35+
<mailingLists>
36+
<mailingList>
37+
<name>iText on StackOverflow</name>
38+
<subscribe>http://stackoverflow.com/questions/tagged/itext</subscribe>
39+
<archive>http://stackoverflow.com/questions/tagged/itext</archive>
40+
<otherArchives>
41+
<otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
42+
<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
43+
<otherArchive>http://www.junlu.com/2.html</otherArchive>
44+
<otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
45+
<otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
46+
</otherArchives>
47+
</mailingList>
48+
</mailingLists>
4849

49-
<scm>
50-
<connection>scm:git:[email protected]:itext/itextpdf.git</connection>
51-
<url>https://github.com/itext/itextpdf</url>
52-
</scm>
50+
<scm>
51+
<connection>scm:git:[email protected]:itext/itextpdf.git</connection>
52+
<url>https://github.com/itext/itextpdf</url>
53+
</scm>
5354

54-
<issueManagement>
55-
<system>jira</system>
56-
<url>https://jira.itextsupport.com/</url>
57-
</issueManagement>
55+
<issueManagement>
56+
<system>jira</system>
57+
<url>https://jira.itextsupport.com/</url>
58+
</issueManagement>
5859

59-
<ciManagement>
60-
<system>jenkins-ci</system>
61-
<url>http://ci.itextsupport.com/</url>
62-
</ciManagement>
60+
<ciManagement>
61+
<system>jenkins-ci</system>
62+
<url>http://ci.itextsupport.com/</url>
63+
</ciManagement>
6364

64-
<properties>
65-
<java.version>1.5</java.version>
66-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67-
</properties>
65+
<properties>
66+
<java.version>1.5</java.version>
67+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
68+
</properties>
6869

69-
<build>
70-
<plugins>
71-
<plugin>
72-
<artifactId>maven-compiler-plugin</artifactId>
73-
<version>3.3</version>
74-
<configuration>
75-
<source>${java.version}</source>
76-
<target>${java.version}</target>
77-
</configuration>
78-
</plugin>
79-
</plugins>
80-
<filters>
81-
</filters>
82-
<resources>
83-
<resource>
84-
<directory>src/main/resources</directory>
85-
<includes>
86-
<include>com/itextpdf/text/pdf/fonts/cmaps/**</include>
87-
<include>**/cmap_info.txt</include>
88-
</includes>
89-
</resource>
90-
</resources>
91-
<sourceDirectory>src/main/resources</sourceDirectory>
92-
<testSourceDirectory>src/main/resources</testSourceDirectory>
93-
</build>
70+
<build>
71+
<plugins>
72+
<plugin>
73+
<artifactId>maven-compiler-plugin</artifactId>
74+
<version>3.6.1</version>
75+
<configuration>
76+
<source>${java.version}</source>
77+
<target>${java.version}</target>
78+
</configuration>
79+
</plugin>
80+
</plugins>
81+
<resources>
82+
<resource>
83+
<directory>src/main/resources</directory>
84+
<includes>
85+
<include>com/itextpdf/text/pdf/fonts/cmaps/**</include>
86+
<include>**/cmap_info.txt</include>
87+
</includes>
88+
</resource>
89+
</resources>
90+
<sourceDirectory>src/main/resources</sourceDirectory>
91+
<testSourceDirectory>src/main/resources</testSourceDirectory>
92+
</build>
9493

9594
</project>

‎itext/itext-hyph-xml.pom‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>com.itextpdf</groupId>
8-
<artifactId>itext-parent</artifactId>
9-
<version>1.0.0</version>
10-
</parent>
6+
<parent>
7+
<groupId>com.itextpdf</groupId>
8+
<artifactId>itext-parent</artifactId>
9+
<version>1.0.0</version>
10+
</parent>
1111

12-
<artifactId>itext-hyph-xml</artifactId>
13-
<version>5.1.3</version>
14-
<packaging>jar</packaging>
12+
<artifactId>itext-hyph-xml</artifactId>
13+
<version>5.1.3</version>
1514

16-
<name>iText, a Free Java-PDF library</name>
17-
<description>XML files that can be used for hyphenation</description>
18-
<url>http://www.itextpdf.com/</url>
15+
<name>iText, a Free Java-PDF library</name>
16+
<description>XML files that can be used for hyphenation</description>
17+
<url>http://www.itextpdf.com/</url>
1918

20-
<licenses>
21-
<license>
22-
<name>Various licenses (see individual files)</name>
23-
</license>
24-
</licenses>
19+
<licenses>
20+
<license>
21+
<name>Various licenses (see individual files)</name>
22+
</license>
23+
</licenses>
2524

26-
<developers>
27-
</developers>
25+
<developers>
26+
<developer>
27+
<id>itext</id>
28+
<name>iText Software</name>
29+
<email>[email protected]</email>
30+
<url>http://www.itextpdf.com</url>
31+
</developer>
32+
</developers>
2833

29-
<mailingLists>
30-
<mailingList>
31-
<name>iText on StackOverflow</name>
32-
<subscribe>
33-
http://stackoverflow.com/questions/tagged/itext
34-
</subscribe>
35-
<archive>
36-
http://stackoverflow.com/questions/tagged/itext
37-
</archive>
38-
<otherArchives>
39-
<otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
40-
<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
41-
<otherArchive>http://www.junlu.com/2.html</otherArchive>
42-
<otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
43-
<otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
44-
</otherArchives>
45-
</mailingList>
46-
</mailingLists>
34+
<mailingLists>
35+
<mailingList>
36+
<name>iText on StackOverflow</name>
37+
<subscribe>http://stackoverflow.com/questions/tagged/itext</subscribe>
38+
<archive>http://stackoverflow.com/questions/tagged/itext</archive>
39+
<otherArchives>
40+
<otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
41+
<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
42+
<otherArchive>http://www.junlu.com/2.html</otherArchive>
43+
<otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
44+
<otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
45+
</otherArchives>
46+
</mailingList>
47+
</mailingLists>
4748

48-
<scm>
49-
<connection>scm:git:[email protected]:itext/itextpdf.git</connection>
50-
<url>https://github.com/itext/itextpdf</url>
51-
</scm>
49+
<scm>
50+
<connection>scm:git:[email protected]:itext/itextpdf.git</connection>
51+
<url>https://github.com/itext/itextpdf</url>
52+
</scm>
5253

53-
<issueManagement>
54-
<system>jira</system>
55-
<url>https://jira.itextsupport.com/</url>
56-
</issueManagement>
54+
<issueManagement>
55+
<system>jira</system>
56+
<url>https://jira.itextsupport.com/</url>
57+
</issueManagement>
5758

58-
<ciManagement>
59-
<system>jenkins-ci</system>
60-
<url>http://ci.itextsupport.com/</url>
61-
</ciManagement>
59+
<ciManagement>
60+
<system>jenkins-ci</system>
61+
<url>http://ci.itextsupport.com/</url>
62+
</ciManagement>
6263

63-
<properties>
64-
<java.version>1.5</java.version>
65-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
66-
</properties>
64+
<properties>
65+
<java.version>1.5</java.version>
66+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67+
</properties>
6768

68-
<build>
69-
<plugins>
70-
<plugin>
71-
<artifactId>maven-compiler-plugin</artifactId>
72-
<version>3.3</version>
73-
<configuration>
74-
<source>${java.version}</source>
75-
<target>${java.version}</target>
76-
</configuration>
77-
</plugin>
78-
</plugins>
79-
<filters>
80-
</filters>
81-
<resources>
82-
<resource>
83-
<directory>src/main/resources</directory>
84-
<includes>
85-
<include>com/itextpdf/text/pdf/hyphenation/hyph/*.txt</include>
86-
<include>com/itextpdf/text/pdf/hyphenation/hyph/*.xml</include>
87-
</includes>
88-
</resource>
89-
</resources>
90-
<sourceDirectory>src/main/resources</sourceDirectory>
91-
<testSourceDirectory>src/main/resources</testSourceDirectory>
92-
</build>
69+
<build>
70+
<plugins>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-compiler-plugin</artifactId>
74+
<version>3.6.1</version>
75+
<configuration>
76+
<source>${java.version}</source>
77+
<target>${java.version}</target>
78+
</configuration>
79+
</plugin>
80+
</plugins>
81+
<resources>
82+
<resource>
83+
<directory>src/main/resources</directory>
84+
<includes>
85+
<include>com/itextpdf/text/pdf/hyphenation/hyph/*.txt</include>
86+
<include>com/itextpdf/text/pdf/hyphenation/hyph/*.xml</include>
87+
</includes>
88+
</resource>
89+
</resources>
90+
<sourceDirectory>src/main/resources</sourceDirectory>
91+
<testSourceDirectory>src/main/resources</testSourceDirectory>
92+
</build>
9393

9494
</project>

0 commit comments

Comments
 (0)