Skip to content

Commit aea6cdb

Browse files
amedeeamedee
committed
Remove POM stanzas that are also defined in root POM
1 parent 39c7c26 commit aea6cdb

File tree

1 file changed

+26
-134
lines changed

1 file changed

+26
-134
lines changed

‎pom.xml‎

Lines changed: 26 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.itextpdf</groupId>
77
<artifactId>root</artifactId>
88
<version>7.1.0-SNAPSHOT</version>
9-
<relativePath/>
9+
<relativePath />
1010
</parent>
1111

1212
<artifactId>html2pdf</artifactId>
@@ -44,17 +44,17 @@
4444
<dependencies>
4545
<dependency>
4646
<groupId>com.itextpdf</groupId>
47-
<artifactId>layout</artifactId>
47+
<artifactId>forms</artifactId>
4848
<version>${itext.version}</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.itextpdf</groupId>
52-
<artifactId>forms</artifactId>
52+
<artifactId>layout</artifactId>
5353
<version>${itext.version}</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.itextpdf</groupId>
57-
<artifactId>pdftest</artifactId>
57+
<artifactId>hyph</artifactId>
5858
<version>${itext.version}</version>
5959
<scope>test</scope>
6060
</dependency>
@@ -66,7 +66,7 @@
6666
</dependency>
6767
<dependency>
6868
<groupId>com.itextpdf</groupId>
69-
<artifactId>hyph</artifactId>
69+
<artifactId>pdftest</artifactId>
7070
<version>${itext.version}</version>
7171
<scope>test</scope>
7272
</dependency>
@@ -90,12 +90,9 @@
9090
</resources>
9191
<plugins>
9292
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-surefire-plugin</artifactId>
95-
<version>2.19.1</version>
96-
<configuration>
97-
<groups>${unittests}</groups>
98-
</configuration>
93+
<groupId>external.atlassian.jgitflow</groupId>
94+
<artifactId>jgitflow-maven-plugin</artifactId>
95+
<version>1.0-m5.1</version>
9996
</plugin>
10097
<plugin>
10198
<groupId>org.apache.maven.plugins</groupId>
@@ -108,41 +105,6 @@
108105
<groups>${integrationtests}</groups>
109106
</configuration>
110107
</plugin>
111-
<plugin>
112-
<groupId>org.pitest</groupId>
113-
<artifactId>pitest-maven</artifactId>
114-
<version>1.1.11</version>
115-
<configuration>
116-
<skip>true</skip>
117-
</configuration>
118-
</plugin>
119-
<plugin>
120-
<groupId>org.apache.maven.plugins</groupId>
121-
<artifactId>maven-source-plugin</artifactId>
122-
<version>3.0.1</version>
123-
<executions>
124-
<execution>
125-
<id>attach-sources</id>
126-
<phase>verify</phase>
127-
<goals>
128-
<goal>jar-no-fork</goal>
129-
</goals>
130-
</execution>
131-
</executions>
132-
</plugin>
133-
<plugin>
134-
<groupId>org.revapi</groupId>
135-
<artifactId>revapi-maven-plugin</artifactId>
136-
<version>0.8.2</version>
137-
<configuration>
138-
<skip>true</skip>
139-
</configuration>
140-
</plugin>
141-
<plugin>
142-
<groupId>external.atlassian.jgitflow</groupId>
143-
<artifactId>jgitflow-maven-plugin</artifactId>
144-
<version>1.0-m5.1</version>
145-
</plugin>
146108
<plugin>
147109
<groupId>org.apache.maven.plugins</groupId>
148110
<artifactId>maven-javadoc-plugin</artifactId>
@@ -161,113 +123,43 @@
161123
</configuration>
162124
</plugin>
163125
<plugin>
164-
<groupId>org.apache.felix</groupId>
165-
<artifactId>maven-bundle-plugin</artifactId>
166-
<version>3.2.0</version>
167-
<extensions>true</extensions>
126+
<groupId>org.apache.maven.plugins</groupId>
127+
<artifactId>maven-source-plugin</artifactId>
128+
<version>3.0.1</version>
168129
<executions>
169130
<execution>
170-
<id>bundle-manifest</id>
171-
<phase>process-classes</phase>
131+
<id>attach-sources</id>
132+
<phase>verify</phase>
172133
<goals>
173-
<goal>manifest</goal>
134+
<goal>jar-no-fork</goal>
174135
</goals>
175136
</execution>
176137
</executions>
177-
<configuration>
178-
<unpackBundle>true</unpackBundle>
179-
</configuration>
180138
</plugin>
181139
<plugin>
182-
<groupId>com.github.ekryd.sortpom</groupId>
183-
<artifactId>sortpom-maven-plugin</artifactId>
184-
<version>2.4.0</version>
185-
<executions>
186-
<execution>
187-
<phase>verify</phase>
188-
<goals>
189-
<goal>sort</goal>
190-
</goals>
191-
</execution>
192-
</executions>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-surefire-plugin</artifactId>
142+
<version>2.19.1</version>
193143
<configuration>
194-
<lineSeparator>\n</lineSeparator>
195-
<encoding>${project.build.sourceEncoding}</encoding>
196-
<sortProperties>true</sortProperties>
197-
<keepBlankLines>true</keepBlankLines>
198-
<expandEmptyElements>false</expandEmptyElements>
199-
<nrOfIndentSpace>2</nrOfIndentSpace>
200-
<sortDependencies>scope</sortDependencies>
201-
<skip>${skipSortPom}</skip>
144+
<groups>${unittests}</groups>
202145
</configuration>
203146
</plugin>
204147
<plugin>
205-
<groupId>org.codehaus.mojo</groupId>
206-
<artifactId>tidy-maven-plugin</artifactId>
207-
<version>1.0.0</version>
208-
<executions>
209-
<execution>
210-
<phase>verify</phase>
211-
<goals>
212-
<goal>pom</goal>
213-
</goals>
214-
</execution>
215-
</executions>
216-
</plugin>
217-
<plugin>
218-
<groupId>org.apache.felix</groupId>
219-
<artifactId>maven-bundle-plugin</artifactId>
220-
<version>3.2.0</version>
221-
<extensions>true</extensions>
222-
<executions>
223-
<execution>
224-
<id>bundle-manifest</id>
225-
<phase>process-classes</phase>
226-
<goals>
227-
<goal>manifest</goal>
228-
</goals>
229-
</execution>
230-
</executions>
148+
<groupId>org.pitest</groupId>
149+
<artifactId>pitest-maven</artifactId>
150+
<version>1.1.11</version>
231151
<configuration>
232-
<unpackBundle>true</unpackBundle>
152+
<skip>true</skip>
233153
</configuration>
234154
</plugin>
235155
<plugin>
236-
<groupId>com.github.ekryd.sortpom</groupId>
237-
<artifactId>sortpom-maven-plugin</artifactId>
238-
<version>2.4.0</version>
239-
<executions>
240-
<execution>
241-
<phase>verify</phase>
242-
<goals>
243-
<goal>sort</goal>
244-
</goals>
245-
</execution>
246-
</executions>
156+
<groupId>org.revapi</groupId>
157+
<artifactId>revapi-maven-plugin</artifactId>
158+
<version>0.8.2</version>
247159
<configuration>
248-
<lineSeparator>\n</lineSeparator>
249-
<encoding>${project.build.sourceEncoding}</encoding>
250-
<sortProperties>true</sortProperties>
251-
<keepBlankLines>true</keepBlankLines>
252-
<expandEmptyElements>false</expandEmptyElements>
253-
<nrOfIndentSpace>2</nrOfIndentSpace>
254-
<sortDependencies>scope</sortDependencies>
255-
<skip>${skipSortPom}</skip>
160+
<skip>true</skip>
256161
</configuration>
257162
</plugin>
258-
<plugin>
259-
<groupId>org.codehaus.mojo</groupId>
260-
<artifactId>tidy-maven-plugin</artifactId>
261-
<version>1.0.0</version>
262-
<executions>
263-
<execution>
264-
<phase>verify</phase>
265-
<goals>
266-
<goal>pom</goal>
267-
</goals>
268-
</execution>
269-
</executions>
270-
</plugin>
271163
</plugins>
272164
</build>
273165
</project>

0 commit comments

Comments
 (0)