Skip to content

Commit fbb2461

Browse files
michaeldemeymichaeldemey
committed
Merge branch 'release/1.1.0'
2 parents 7817bcb + f366e2b commit fbb2461

File tree

50 files changed

+1915
-251
lines changed

Some content is hidden

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

50 files changed

+1915
-251
lines changed

‎pom.xml‎

Lines changed: 186 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,195 @@
1-
<?xml version="1.0"?>
1+
<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<parent>
6-
<groupId>com.itextpdf</groupId>
7-
<artifactId>root</artifactId>
8-
<version>7.0.3</version>
9-
<relativePath />
10-
</parent>
5+
<parent>
6+
<groupId>com.itextpdf</groupId>
7+
<artifactId>root</artifactId>
8+
<version>7.0.5</version>
9+
<relativePath />
10+
</parent>
1111

12-
<artifactId>cleanup</artifactId>
13-
<version>1.0.2</version>
14-
<name>pdfSweep</name>
15-
<url>http://itextpdf.com/</url>
12+
<artifactId>cleanup</artifactId>
13+
<version>1.1.0</version>
1614

17-
<properties>
18-
<itext.version>${project.parent.version}</itext.version>
19-
</properties>
15+
<name>pdfSweep</name>
16+
<url>http://itextpdf.com/</url>
2017

21-
<dependencies>
22-
<dependency>
23-
<groupId>com.itextpdf</groupId>
24-
<artifactId>io</artifactId>
25-
<version>${itext.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>com.itextpdf</groupId>
29-
<artifactId>kernel</artifactId>
30-
<version>${itext.version}</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.itextpdf</groupId>
34-
<artifactId>layout</artifactId>
35-
<version>${itext.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>com.itextpdf</groupId>
39-
<artifactId>pdftest</artifactId>
40-
<version>${itext.version}</version>
41-
<scope>test</scope>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.apache.commons</groupId>
45-
<artifactId>commons-imaging</artifactId>
46-
<version>1.0-SNAPSHOT</version>
47-
</dependency>
48-
</dependencies>
18+
<properties>
19+
<itext.version>${project.parent.version}</itext.version>
20+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21+
</properties>
4922

50-
<repositories>
51-
<repository>
52-
<id>itext-snapshot</id>
53-
<name>iText Repository - snapshots</name>
54-
<url>https://repo.itextsupport.com/snapshot</url>
55-
</repository>
56-
<repository>
57-
<id>itext-releases</id>
58-
<name>iText Repository - releases</name>
59-
<url>https://repo.itextsupport.com/releases</url>
60-
</repository>
61-
<repository>
62-
<id>apache.snapshots</id>
63-
<name>Apache Development Snapshot Repository</name>
64-
<url>https://repository.apache.org/content/repositories/snapshots/</url>
65-
<releases>
66-
<enabled>false</enabled>
67-
</releases>
68-
<snapshots>
69-
<enabled>true</enabled>
70-
</snapshots>
71-
</repository>
72-
</repositories>
23+
<repositories>
24+
<repository>
25+
<releases>
26+
<enabled>false</enabled>
27+
</releases>
28+
<snapshots>
29+
<enabled>true</enabled>
30+
</snapshots>
31+
<id>itext-snapshot</id>
32+
<name>iText Repository - snapshots</name>
33+
<url>https://repo.itextsupport.com/snapshot</url>
34+
</repository>
35+
<repository>
36+
<releases>
37+
<enabled>true</enabled>
38+
</releases>
39+
<snapshots>
40+
<enabled>false</enabled>
41+
</snapshots>
42+
<id>itext-releases</id>
43+
<name>iText Repository - releases</name>
44+
<url>https://repo.itextsupport.com/releases</url>
45+
</repository>
46+
<repository>
47+
<releases>
48+
<enabled>false</enabled>
49+
</releases>
50+
<snapshots>
51+
<enabled>true</enabled>
52+
</snapshots>
53+
<id>apache.snapshots</id>
54+
<name>Apache Development Snapshot Repository</name>
55+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
56+
</repository>
57+
</repositories>
7358

74-
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-surefire-plugin</artifactId>
79-
<version>2.19.1</version>
80-
<configuration>
81-
<groups>${unittests}</groups>
82-
<argLine>${env.SUREFIRE_OPTS}</argLine>
83-
</configuration>
84-
</plugin>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-failsafe-plugin</artifactId>
88-
<version>2.19.1</version>
89-
<configuration>
90-
<includes>
91-
<include>**/*Test.java</include>
92-
</includes>
93-
<groups>${integrationtests}</groups>
94-
<argLine>${env.SUREFIRE_OPTS}</argLine>
95-
</configuration>
96-
</plugin>
97-
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-source-plugin</artifactId>
100-
<version>3.0.0</version>
101-
<configuration>
102-
<excludes>
103-
<exclude>**</exclude>
104-
</excludes>
105-
</configuration>
106-
</plugin>
107-
<plugin>
108-
<groupId>org.apache.maven.plugins</groupId>
109-
<artifactId>maven-javadoc-plugin</artifactId>
110-
<version>${javadoc.version}</version>
111-
<configuration>
112-
<subpackages>com.itextpdf.pdfcleanup</subpackages>
113-
</configuration>
114-
<executions>
115-
<execution>
116-
<id>attach-javadocs</id>
117-
<phase>package</phase>
118-
<goals>
119-
<goal>jar</goal>
120-
</goals>
121-
</execution>
122-
</executions>
123-
</plugin>
124-
</plugins>
125-
</build>
59+
<dependencies>
60+
<dependency>
61+
<groupId>com.itextpdf</groupId>
62+
<artifactId>io</artifactId>
63+
<version>${itext.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.itextpdf</groupId>
67+
<artifactId>kernel</artifactId>
68+
<version>${itext.version}</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>com.itextpdf</groupId>
72+
<artifactId>layout</artifactId>
73+
<version>${itext.version}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.itextpdf</groupId>
77+
<artifactId>pdftest</artifactId>
78+
<version>${itext.version}</version>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.apache.commons</groupId>
83+
<artifactId>commons-imaging</artifactId>
84+
<version>1.0-SNAPSHOT</version>
85+
</dependency>
86+
</dependencies>
12687

88+
<build>
89+
<plugins>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-surefire-plugin</artifactId>
93+
<version>${surefire.version}</version>
94+
<configuration>
95+
<groups>${unittests}</groups>
96+
<argLine>${env.SUREFIRE_OPTS}</argLine>
97+
</configuration>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-failsafe-plugin</artifactId>
102+
<version>${failsafe.version}</version>
103+
<configuration>
104+
<includes>
105+
<include>**/*Test.java</include>
106+
</includes>
107+
<groups>${integrationtests}</groups>
108+
<argLine>${env.SUREFIRE_OPTS}</argLine>
109+
</configuration>
110+
</plugin>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-source-plugin</artifactId>
114+
<version>3.0.0</version>
115+
<configuration>
116+
<excludes>
117+
<exclude>**</exclude>
118+
</excludes>
119+
</configuration>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-javadoc-plugin</artifactId>
124+
<version>${javadoc.version}</version>
125+
<executions>
126+
<execution>
127+
<id>attach-javadocs</id>
128+
<phase>package</phase>
129+
<goals>
130+
<goal>jar</goal>
131+
</goals>
132+
</execution>
133+
</executions>
134+
<configuration>
135+
<quiet>true</quiet>
136+
<failOnError>true</failOnError>
137+
<subpackages>com.itextpdf.pdfcleanup</subpackages>
138+
</configuration>
139+
</plugin>
140+
<plugin>
141+
<groupId>org.apache.felix</groupId>
142+
<artifactId>maven-bundle-plugin</artifactId>
143+
<version>3.2.0</version>
144+
<extensions>true</extensions>
145+
<executions>
146+
<execution>
147+
<id>bundle-manifest</id>
148+
<phase>process-classes</phase>
149+
<goals>
150+
<goal>manifest</goal>
151+
</goals>
152+
</execution>
153+
</executions>
154+
<configuration>
155+
<unpackBundle>true</unpackBundle>
156+
</configuration>
157+
</plugin>
158+
<plugin>
159+
<groupId>com.github.ekryd.sortpom</groupId>
160+
<artifactId>sortpom-maven-plugin</artifactId>
161+
<version>2.4.0</version>
162+
<executions>
163+
<execution>
164+
<phase>verify</phase>
165+
<goals>
166+
<goal>sort</goal>
167+
</goals>
168+
</execution>
169+
</executions>
170+
<configuration>
171+
<lineSeparator>\n</lineSeparator>
172+
<encoding>${project.build.sourceEncoding}</encoding>
173+
<sortProperties>true</sortProperties>
174+
<keepBlankLines>true</keepBlankLines>
175+
<expandEmptyElements>false</expandEmptyElements>
176+
<nrOfIndentSpace>2</nrOfIndentSpace>
177+
<sortDependencies>scope</sortDependencies>
178+
</configuration>
179+
</plugin>
180+
<plugin>
181+
<groupId>org.codehaus.mojo</groupId>
182+
<artifactId>tidy-maven-plugin</artifactId>
183+
<version>1.0.0</version>
184+
<executions>
185+
<execution>
186+
<phase>verify</phase>
187+
<goals>
188+
<goal>pom</goal>
189+
</goals>
190+
</execution>
191+
</executions>
192+
</plugin>
193+
</plugins>
194+
</build>
127195
</project>

0 commit comments

Comments
 (0)