Skip to content

Commit 8b8bef4

Browse files
amedeeamedee
committed
🔖 Merge branch 'release/1.0.1'
DEVSIX-1411
2 parents 6b5a4b8 + f86ee85 commit 8b8bef4

File tree

2,531 files changed

+67315
-2372
lines changed

Some content is hidden

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

2,531 files changed

+67315
-2372
lines changed

‎pom.xml‎

Lines changed: 152 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -2,138 +2,164 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>com.itextpdf</groupId>
9-
<artifactId>root</artifactId>
10-
<version>7.0.2</version>
11-
<relativePath />
12-
</parent>
7+
<parent>
8+
<groupId>com.itextpdf</groupId>
9+
<artifactId>root</artifactId>
10+
<version>7.0.4</version>
11+
<relativePath/>
12+
</parent>
1313

14-
<artifactId>html2pdf</artifactId>
15-
<version>1.0.0</version>
14+
<artifactId>html2pdf</artifactId>
15+
<version>1.0.1</version>
1616

17-
<name>pdfHTML</name>
18-
<url>http://itextpdf.com/</url>
17+
<name>pdfHTML</name>
18+
<description>pdfHTML is an iText 7 add-on that lets you to parse (X)HTML snippets and the associated CSS and converts
19+
them to PDF.
20+
</description>
21+
<url>http://itextpdf.com/</url>
1922

20-
<properties>
21-
<itext.version>7.0.2</itext.version>
22-
</properties>
23+
<properties>
24+
<itext.version>${project.parent.version}</itext.version>
25+
<javadoc.version>2.10.4</javadoc.version>
26+
</properties>
2327

24-
<dependencies>
25-
<dependency>
26-
<groupId>com.itextpdf</groupId>
27-
<artifactId>layout</artifactId>
28-
<version>${itext.version}</version>
29-
</dependency>
30-
<dependency>
31-
<groupId>com.itextpdf</groupId>
32-
<artifactId>pdftest</artifactId>
33-
<version>${itext.version}</version>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>com.itextpdf</groupId>
38-
<artifactId>pdfa</artifactId>
39-
<version>${itext.version}</version>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>com.itextpdf</groupId>
44-
<artifactId>hyph</artifactId>
45-
<version>${itext.version}</version>
46-
<scope>test</scope>
47-
</dependency>
48-
</dependencies>
28+
<dependencies>
29+
<dependency>
30+
<groupId>com.itextpdf</groupId>
31+
<artifactId>layout</artifactId>
32+
<version>${itext.version}</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.itextpdf</groupId>
36+
<artifactId>pdftest</artifactId>
37+
<version>${itext.version}</version>
38+
<scope>test</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.itextpdf</groupId>
42+
<artifactId>pdfa</artifactId>
43+
<version>${itext.version}</version>
44+
<scope>test</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.itextpdf</groupId>
48+
<artifactId>hyph</artifactId>
49+
<version>${itext.version}</version>
50+
<scope>test</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.itextpdf</groupId>
54+
<artifactId>forms</artifactId>
55+
<version>${itext.version}</version>
56+
</dependency>
57+
</dependencies>
4958

50-
<repositories>
51-
<repository>
52-
<id>itext-snapshot</id>
53-
<name>iText Repository - snapshots</name>
54-
<url>https://repo.itextsupport.com/snapshot</url>
55-
<snapshots>
56-
<enabled>true</enabled>
57-
</snapshots>
58-
</repository>
59-
<repository>
60-
<id>itext-releases</id>
61-
<name>iText Repository - releases</name>
62-
<url>https://repo.itextsupport.com/releases</url>
63-
<snapshots>
64-
<enabled>false</enabled>
65-
</snapshots>
66-
</repository>
67-
</repositories>
59+
<repositories>
60+
<repository>
61+
<id>itext-snapshot</id>
62+
<name>iText Repository - snapshots</name>
63+
<url>https://repo.itextsupport.com/snapshot</url>
64+
<snapshots>
65+
<enabled>true</enabled>
66+
</snapshots>
67+
</repository>
68+
<repository>
69+
<id>itext-releases</id>
70+
<name>iText Repository - releases</name>
71+
<url>https://repo.itextsupport.com/releases</url>
72+
<snapshots>
73+
<enabled>false</enabled>
74+
</snapshots>
75+
</repository>
76+
</repositories>
6877

69-
<build>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-surefire-plugin</artifactId>
74-
<version>2.19.1</version>
75-
<configuration>
76-
<groups>${unittests}</groups>
77-
</configuration>
78-
</plugin>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-failsafe-plugin</artifactId>
82-
<version>2.19.1</version>
83-
<configuration>
84-
<includes>
85-
<include>**/*Test.java</include>
86-
</includes>
87-
<groups>${integrationtests}</groups>
88-
</configuration>
89-
</plugin>
90-
<plugin>
91-
<groupId>org.pitest</groupId>
92-
<artifactId>pitest-maven</artifactId>
93-
<version>1.1.11</version>
94-
<configuration>
95-
<skip>true</skip>
96-
</configuration>
97-
</plugin>
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-source-plugin</artifactId>
101-
<version>3.0.0</version>
102-
<configuration>
103-
<excludes>
104-
<exclude>**</exclude>
105-
</excludes>
106-
</configuration>
107-
</plugin>
108-
<plugin>
109-
<groupId>org.revapi</groupId>
110-
<artifactId>revapi-maven-plugin</artifactId>
111-
<version>0.8.2</version>
112-
<configuration>
113-
<skip>true</skip>
114-
</configuration>
115-
</plugin>
116-
<plugin>
117-
<groupId>external.atlassian.jgitflow</groupId>
118-
<artifactId>jgitflow-maven-plugin</artifactId>
119-
<version>1.0-m5.1</version>
120-
</plugin>
121-
</plugins>
122-
<resources>
123-
<resource>
124-
<directory>src/main/java</directory>
125-
<includes>
126-
<include>**/*.properties</include>
127-
</includes>
128-
</resource>
129-
<resource>
130-
<directory>src/main/resources</directory>
131-
<includes>
132-
<include>**/*.css</include>
133-
<include>**/*.ttf</include>
134-
</includes>
135-
</resource>
136-
</resources>
137-
</build>
78+
<build>
79+
<plugins>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-surefire-plugin</artifactId>
83+
<version>2.19.1</version>
84+
<configuration>
85+
<groups>${unittests}</groups>
86+
</configuration>
87+
</plugin>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-failsafe-plugin</artifactId>
91+
<version>2.19.1</version>
92+
<configuration>
93+
<includes>
94+
<include>**/*Test.java</include>
95+
</includes>
96+
<groups>${integrationtests}</groups>
97+
</configuration>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.pitest</groupId>
101+
<artifactId>pitest-maven</artifactId>
102+
<version>1.1.11</version>
103+
<configuration>
104+
<skip>true</skip>
105+
</configuration>
106+
</plugin>
107+
<plugin>
108+
<groupId>org.apache.maven.plugins</groupId>
109+
<artifactId>maven-source-plugin</artifactId>
110+
<version>3.0.0</version>
111+
<configuration>
112+
<excludes>
113+
<exclude>**</exclude>
114+
</excludes>
115+
</configuration>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.revapi</groupId>
119+
<artifactId>revapi-maven-plugin</artifactId>
120+
<version>0.8.2</version>
121+
<configuration>
122+
<skip>true</skip>
123+
</configuration>
124+
</plugin>
125+
<plugin>
126+
<groupId>external.atlassian.jgitflow</groupId>
127+
<artifactId>jgitflow-maven-plugin</artifactId>
128+
<version>1.0-m5.1</version>
129+
</plugin>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-javadoc-plugin</artifactId>
133+
<version>${javadoc.version}</version>
134+
<configuration>
135+
<quiet>true</quiet>
136+
<failOnError>true</failOnError>
137+
</configuration>
138+
<executions>
139+
<execution>
140+
<id>attach-javadocs</id>
141+
<goals>
142+
<goal>jar</goal>
143+
</goals>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
</plugins>
148+
<resources>
149+
<resource>
150+
<directory>src/main/java</directory>
151+
<includes>
152+
<include>**/*.properties</include>
153+
</includes>
154+
</resource>
155+
<resource>
156+
<directory>src/main/resources</directory>
157+
<includes>
158+
<include>**/*.css</include>
159+
<include>**/*.ttf</include>
160+
</includes>
161+
</resource>
162+
</resources>
163+
</build>
138164

139165
</project>

0 commit comments

Comments
 (0)