Skip to content

Commit 87a0028

Browse files
amedeeamedee
committed
Upgrade Surefire and Failsafe
QA-960
1 parent e6a336c commit 87a0028

37 files changed

+60
-4025
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ nbactions*.xml
151151
.pmdruleset.xml
152152

153153
# Ignore generated files
154-
filmfestival.log
154+
*.log
155155

156156
.vagrant/
157+
.vscode/

‎styled-xml-parser/Jenkinsfile renamed to ‎Jenkinsfile

File renamed without changes.

‎barcodes/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>barcodes</artifactId>
1010
<name>iText 7 - barcodes</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>com.itextpdf</groupId>

‎font-asian/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<artifactId>font-asian</artifactId>
1010
<name>iText 7 - Asian fonts</name>
1111
<description>iText Asian fonts for use in conjunction with iText 7, a free Java-PDF library</description>
12-
<url>http://itextpdf.com/</url>
12+
<url>https://itextpdf.com/</url>
1313
<licenses>
1414
<license>
1515
<name>Various licenses (see individual files)</name>

‎forms/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>forms</artifactId>
1010
<name>iText 7 - forms</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>com.itextpdf</groupId>

‎hyph/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<artifactId>hyph</artifactId>
1010
<name>iText 7 - hyph</name>
1111
<description>XML files that can be used for hyphenation</description>
12-
<url>http://itextpdf.com/</url>
12+
<url>https://itextpdf.com/</url>
1313
<licenses>
1414
<license>
1515
<name>Various licenses (see individual files)</name>

‎io/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>io</artifactId>
1010
<name>iText 7 - io</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>com.itextpdf</groupId>

‎itextcore/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<packaging>pom</packaging>
88
<name>iText 7 Core</name>
99
<description>A Free Java-PDF library</description>
10-
<url>http://itextpdf.com/</url>
10+
<url>https://itextpdf.com/</url>
1111
<inceptionYear>1998</inceptionYear>
1212
<organization>
1313
<name>iText Group NV</name>
14-
<url>http://itextpdf.com/</url>
14+
<url>https://itextpdf.com/</url>
1515
</organization>
1616
<licenses>
1717
<license>
@@ -24,14 +24,14 @@
2424
<id>itext</id>
2525
<name>iText Software</name>
2626
<email>[email protected]</email>
27-
<url>http://www.itextpdf.com</url>
27+
<url>https://www.itextpdf.com</url>
2828
</developer>
2929
</developers>
3030
<mailingLists>
3131
<mailingList>
3232
<name>iText on StackOverflow</name>
33-
<subscribe>http://stackoverflow.com/questions/tagged/itext7</subscribe>
34-
<archive>http://stackoverflow.com/questions/tagged/itext7</archive>
33+
<subscribe>https://stackoverflow.com/questions/tagged/itext7</subscribe>
34+
<archive>https://stackoverflow.com/questions/tagged/itext7</archive>
3535
<otherArchives>
3636
<otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
3737
<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
@@ -51,7 +51,7 @@
5151
</issueManagement>
5252
<ciManagement>
5353
<system>jenkins-ci</system>
54-
<url>http://ci.itextsupport.com/</url>
54+
<url>https://jenkins.itextsupport.com/</url>
5555
</ciManagement>
5656
<dependencies>
5757
<dependency>

‎kernel/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>kernel</artifactId>
1010
<name>iText 7 - kernel</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>com.itextpdf</groupId>

‎layout/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>layout</artifactId>
1010
<name>iText 7 - layout</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>com.itextpdf</groupId>

‎pdfa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>pdfa</artifactId>
1010
<name>iText 7 - pdfa</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>com.itextpdf</groupId>

‎pdftest/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<artifactId>pdftest</artifactId>
1010
<name>iText 7 - pdftest</name>
11-
<url>http://itextpdf.com/</url>
11+
<url>https://itextpdf.com/</url>
1212
<dependencies>
1313
<dependency>
1414
<groupId>ch.qos.logback</groupId>

‎pom.xml

+38-35
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<packaging>pom</packaging>
88
<name>iText 7</name>
99
<description>A Free Java-PDF library</description>
10-
<url>http://itextpdf.com/</url>
10+
<url>https://itextpdf.com/</url>
1111
<inceptionYear>1998</inceptionYear>
1212
<organization>
1313
<name>iText Group NV</name>
14-
<url>http://itextpdf.com/</url>
14+
<url>https://itextpdf.com/</url>
1515
</organization>
1616
<licenses>
1717
<license>
@@ -24,14 +24,14 @@
2424
<id>itext</id>
2525
<name>iText Software</name>
2626
<email>[email protected]</email>
27-
<url>http://www.itextpdf.com</url>
27+
<url>https://www.itextpdf.com</url>
2828
</developer>
2929
</developers>
3030
<mailingLists>
3131
<mailingList>
3232
<name>iText on StackOverflow</name>
33-
<subscribe>http://stackoverflow.com/questions/tagged/itext7</subscribe>
34-
<archive>http://stackoverflow.com/questions/tagged/itext7</archive>
33+
<subscribe>https://stackoverflow.com/questions/tagged/itext7</subscribe>
34+
<archive>https://stackoverflow.com/questions/tagged/itext7</archive>
3535
<otherArchives>
3636
<otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
3737
<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
@@ -66,25 +66,29 @@
6666
</issueManagement>
6767
<ciManagement>
6868
<system>jenkins-ci</system>
69-
<url>http://ci.itextsupport.com/</url>
69+
<url>https://jenkins.itextsupport.com/</url>
7070
</ciManagement>
7171
<properties>
7272
<argLine>-Xmx1024m</argLine>
7373
<bouncycastle.version>1.49</bouncycastle.version>
7474
<checkstyle.version>2.15</checkstyle.version>
75-
<failsafe.version>2.18.1</failsafe.version>
75+
<failsafe.version>3.0.0-M3</failsafe.version>
7676
<fb-contrib.version>6.2.1</fb-contrib.version>
7777
<findbugs.version>3.0.1</findbugs.version>
7878
<hsqldb.version>2.3.3</hsqldb.version>
7979
<integrationtests>com.itextpdf.test.annotations.type.IntegrationTest</integrationtests>
8080
<itext.legacy.version>5.5.8</itext.legacy.version>
8181
<jacoco.version>0.7.9</jacoco.version>
8282
<java.version>1.7</java.version>
83-
<javadoc.version>3.0.0</javadoc.version>
83+
<javadoc.version>3.0.1</javadoc.version>
84+
<javadoc-additionalOptions />
85+
<javadoc-link>https://docs.oracle.com/javase/8/docs/api/</javadoc-link>
8486
<jfreechart.version>1.0.19</jfreechart.version>
8587
<junit.version>4.12</junit.version>
8688
<junitparams.version>1.0.4</junitparams.version>
8789
<logback.version>1.1.3</logback.version>
90+
<maven.compiler.source>1.7</maven.compiler.source>
91+
<maven.compiler.target>1.7</maven.compiler.target>
8892
<performancetests>com.itextpdf.test.annotations.type.PerformanceTest</performancetests>
8993
<pitest.version>1.1.11</pitest.version>
9094
<pmd.version>3.5</pmd.version>
@@ -95,7 +99,7 @@
9599
<slf4j.version>1.7.13</slf4j.version>
96100
<slowtests>com.itextpdf.test.annotations.type.SlowTest</slowtests>
97101
<sonar.clirr.reportPath>${project.build.directory}/clirr-report.txt</sonar.clirr.reportPath>
98-
<surefire.version>2.18.1</surefire.version>
102+
<surefire.version>3.0.0-M3</surefire.version>
99103
<unittests>com.itextpdf.test.annotations.type.UnitTest</unittests>
100104
</properties>
101105
<repositories>
@@ -287,33 +291,14 @@
287291
<configuration>
288292
<additionalparam>${javadoc.doclint.none}</additionalparam>
289293
<quiet>true</quiet>
294+
<failOnError>true</failOnError>
295+
<source>7</source>
296+
<additionalOptions>${javadoc-additionalOptions}</additionalOptions>
297+
<links>
298+
<link>${javadoc-link}</link>
299+
</links>
290300
</configuration>
291301
</plugin>
292-
<!--
293-
<plugin>
294-
<groupId>com.soebes.maven.plugins.dmg</groupId>
295-
<artifactId>doxygen-maven-plugin</artifactId>
296-
<version>1.0.1</version>
297-
<configuration>
298-
<projectName>${project.name}</projectName>
299-
<projectNumber>${project.version}</projectNumber>
300-
<optimizeOutputJava>true</optimizeOutputJava>
301-
<extractAll>true</extractAll>
302-
<extractStatic>true</extractStatic>
303-
<recursive>true</recursive>
304-
<exclude>.git</exclude>
305-
<excludePatterns>*/test/*</excludePatterns>
306-
<inlineSources>true</inlineSources>
307-
<referencedByRelation>true</referencedByRelation>
308-
<referencesRelation>true</referencesRelation>
309-
<hideUndocRelations>false</hideUndocRelations>
310-
<umlLook>true</umlLook>
311-
<callGraph>true</callGraph>
312-
<callerGraph>true</callerGraph>
313-
<generateLatex>false</generateLatex>
314-
</configuration>
315-
</plugin>
316-
-->
317302
<plugin>
318303
<groupId>org.apache.maven.plugins</groupId>
319304
<artifactId>maven-jxr-plugin</artifactId>
@@ -385,6 +370,16 @@
385370
<javadoc.doclint.none>-Xdoclint:none</javadoc.doclint.none>
386371
</properties>
387372
</profile>
373+
<profile>
374+
<id>java9+</id>
375+
<activation>
376+
<jdk>[9,)</jdk>
377+
</activation>
378+
<properties>
379+
<javadoc-additionalOptions>-html5</javadoc-additionalOptions>
380+
<javadoc-link>https://docs.oracle.com/javase/9/docs/api/</javadoc-link>
381+
</properties>
382+
</profile>
388383
<profile>
389384
<id>develop</id>
390385
<activation>
@@ -661,7 +656,7 @@
661656
<quiet>true</quiet>
662657
<failOnError>false</failOnError>
663658
<detectLinks>true</detectLinks>
664-
<subpackages>com.itextpdf.barcodes:com.itextpdf.forms:com.itextpdf.io:com.itextpdf.kernel:com.itextpdf.layout:com.itextpdf.pdfa:com.itextpdf.signatures:com.itextpdf.test</subpackages>
659+
<subpackages>com.itextpdf.barcodes:com.itextpdf.forms:com.itextpdf.io:com.itextpdf.kernel:com.itextpdf.layout:com.itextpdf.pdfa:com.itextpdf.signatures:com.itextpdf.styled-xml-parser:com.itextpdf.svg:com.itextpdf.test</subpackages>
665660
<groups>
666661
<group>
667662
<title>Barcodes</title>
@@ -699,6 +694,14 @@
699694
<title>Signatures</title>
700695
<packages>com.itextpdf.signatures*</packages>
701696
</group>
697+
<group>
698+
<title>Styled XML Parser</title>
699+
<packages>com.itextpdf.styled-xml-parser*</packages>
700+
</group>
701+
<group>
702+
<title>SVG</title>
703+
<packages>com.itextpdf.svg*</packages>
704+
</group>
702705
</groups>
703706
</configuration>
704707
</plugin>

‎sign/pom.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
</parent>
99
<artifactId>sign</artifactId>
1010
<name>iText 7 - sign</name>
11-
<url>http://itextpdf.com/</url>
12-
<properties>
13-
14-
</properties>
11+
<url>https://itextpdf.com/</url>
1512
<dependencies>
1613
<dependency>
1714
<groupId>com.itextpdf</groupId>

‎svg/sonar-project.properties renamed to ‎sonar-project.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
sonar.projectKey=svg
2-
sonar.projectName=svg
1+
sonar.projectKey=itext7
2+
sonar.projectName=itext7
33
sonar.sourceEncoding=UTF-8
44
sonar.language=java
55
sonar.sources=.

‎styled-xml-parser/.gitattributes

-43
This file was deleted.

0 commit comments

Comments
 (0)