Skip to content

Commit 48ba0a2

Browse files
ctruedenctrueden
committed
Lint the POM files
Accomplished via: mvn tidy:pom
1 parent 39c0fe7 commit 48ba0a2

File tree

14 files changed

+230
-223
lines changed

14 files changed

+230
-223
lines changed

‎pom.xml‎

Lines changed: 77 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -110,82 +110,8 @@
110110
<!-- No java source files for this project -->
111111
<maven.javadoc.skip>true</maven.javadoc.skip>
112112
</properties>
113+
113114
<build>
114-
<plugins>
115-
<plugin>
116-
<artifactId>maven-compiler-plugin</artifactId>
117-
<configuration>
118-
<annotationProcessorPaths>
119-
<path>
120-
<groupId>org.scijava</groupId>
121-
<artifactId>scijava-ops-indexer</artifactId>
122-
<version>${project.version}</version>
123-
</path>
124-
</annotationProcessorPaths>
125-
<fork>true</fork>
126-
<showWarnings>true</showWarnings>
127-
<compilerArgs>
128-
<arg>-Aparse.ops="${scijava.parse.ops}"</arg>
129-
<arg>-Aop.version="${project.version}"</arg>
130-
</compilerArgs>
131-
</configuration>
132-
</plugin>
133-
<plugin>
134-
<artifactId>maven-javadoc-plugin</artifactId>
135-
<configuration>
136-
<tagletArtifacts>
137-
<tagletArtifact>
138-
<groupId>org.scijava</groupId>
139-
<artifactId>scijava-taglets</artifactId>
140-
<version>${project.version}</version>
141-
</tagletArtifact>
142-
</tagletArtifacts>
143-
</configuration>
144-
</plugin>
145-
<plugin>
146-
<artifactId>maven-enforcer-plugin</artifactId>
147-
<dependencies>
148-
<dependency>
149-
<groupId>org.scijava</groupId>
150-
<artifactId>scijava-maven-plugin</artifactId>
151-
<version>2.2.0</version>
152-
</dependency>
153-
</dependencies>
154-
<executions>
155-
<execution>
156-
<id>enforce-no-package-cycles</id>
157-
<goals>
158-
<goal>enforce</goal>
159-
</goals>
160-
<phase>test</phase>
161-
<configuration>
162-
<rules>
163-
<NoPackageCyclesRule
164-
implementation="org.scijava.maven.plugin.enforcer.NoPackageCyclesRule" />
165-
</rules>
166-
</configuration>
167-
</execution>
168-
<execution>
169-
<id>enforce-no-subpackage-dependence</id>
170-
<goals>
171-
<goal>enforce</goal>
172-
</goals>
173-
<phase>test</phase>
174-
<configuration>
175-
<rules>
176-
<NoSubpackageDependenceRule
177-
implementation="org.scijava.maven.plugin.enforcer.NoSubpackageDependenceRule" />
178-
</rules>
179-
</configuration>
180-
</execution>
181-
</executions>
182-
</plugin>
183-
<plugin>
184-
<groupId>com.alexecollins.maven.plugin</groupId>
185-
<artifactId>script-maven-plugin</artifactId>
186-
<version>${script-maven-plugin.version}</version>
187-
</plugin>
188-
</plugins>
189115
<pluginManagement>
190116
<plugins>
191117
<plugin>
@@ -264,7 +190,83 @@
264190
</plugin>
265191
</plugins>
266192
</pluginManagement>
193+
<plugins>
194+
<plugin>
195+
<artifactId>maven-compiler-plugin</artifactId>
196+
<configuration>
197+
<annotationProcessorPaths>
198+
<path>
199+
<groupId>org.scijava</groupId>
200+
<artifactId>scijava-ops-indexer</artifactId>
201+
<version>${project.version}</version>
202+
</path>
203+
</annotationProcessorPaths>
204+
<fork>true</fork>
205+
<showWarnings>true</showWarnings>
206+
<compilerArgs>
207+
<arg>-Aparse.ops="${scijava.parse.ops}"</arg>
208+
<arg>-Aop.version="${project.version}"</arg>
209+
</compilerArgs>
210+
</configuration>
211+
</plugin>
212+
<plugin>
213+
<artifactId>maven-javadoc-plugin</artifactId>
214+
<configuration>
215+
<tagletArtifacts>
216+
<tagletArtifact>
217+
<groupId>org.scijava</groupId>
218+
<artifactId>scijava-taglets</artifactId>
219+
<version>${project.version}</version>
220+
</tagletArtifact>
221+
</tagletArtifacts>
222+
</configuration>
223+
</plugin>
224+
<plugin>
225+
<artifactId>maven-enforcer-plugin</artifactId>
226+
<dependencies>
227+
<dependency>
228+
<groupId>org.scijava</groupId>
229+
<artifactId>scijava-maven-plugin</artifactId>
230+
<version>2.2.0</version>
231+
</dependency>
232+
</dependencies>
233+
<executions>
234+
<execution>
235+
<id>enforce-no-package-cycles</id>
236+
<goals>
237+
<goal>enforce</goal>
238+
</goals>
239+
<phase>test</phase>
240+
<configuration>
241+
<rules>
242+
<NoPackageCyclesRule
243+
implementation="org.scijava.maven.plugin.enforcer.NoPackageCyclesRule" />
244+
</rules>
245+
</configuration>
246+
</execution>
247+
<execution>
248+
<id>enforce-no-subpackage-dependence</id>
249+
<goals>
250+
<goal>enforce</goal>
251+
</goals>
252+
<phase>test</phase>
253+
<configuration>
254+
<rules>
255+
<NoSubpackageDependenceRule
256+
implementation="org.scijava.maven.plugin.enforcer.NoSubpackageDependenceRule" />
257+
</rules>
258+
</configuration>
259+
</execution>
260+
</executions>
261+
</plugin>
262+
<plugin>
263+
<groupId>com.alexecollins.maven.plugin</groupId>
264+
<artifactId>script-maven-plugin</artifactId>
265+
<version>${script-maven-plugin.version}</version>
266+
</plugin>
267+
</plugins>
267268
</build>
269+
268270
<profiles>
269271
<profile>
270272
<id>benchmarks</id>

‎scijava-collections/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<license.licenseName>bsd_2</license.licenseName>
8686
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
8787
</properties>
88+
8889
<dependencies>
8990
<!-- SciJava dependencies -->
9091
<dependency>

‎scijava-concurrent/pom.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
@@ -89,23 +89,6 @@
8989
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
9090
</properties>
9191

92-
<build>
93-
<plugins>
94-
<plugin>
95-
<artifactId>maven-compiler-plugin</artifactId>
96-
<configuration>
97-
<annotationProcessorPaths>
98-
<path>
99-
<groupId>org.openjdk.jmh</groupId>
100-
<artifactId>jmh-generator-annprocess</artifactId>
101-
<version>${jmh-generator-annprocess.version}</version>
102-
</path>
103-
</annotationProcessorPaths>
104-
</configuration>
105-
</plugin>
106-
</plugins>
107-
</build>
108-
10992
<dependencies>
11093
<!-- SciJava dependencies -->
11194

@@ -138,4 +121,21 @@
138121
<scope>test</scope>
139122
</dependency>
140123
</dependencies>
124+
125+
<build>
126+
<plugins>
127+
<plugin>
128+
<artifactId>maven-compiler-plugin</artifactId>
129+
<configuration>
130+
<annotationProcessorPaths>
131+
<path>
132+
<groupId>org.openjdk.jmh</groupId>
133+
<artifactId>jmh-generator-annprocess</artifactId>
134+
<version>${jmh-generator-annprocess.version}</version>
135+
</path>
136+
</annotationProcessorPaths>
137+
</configuration>
138+
</plugin>
139+
</plugins>
140+
</build>
141141
</project>

‎scijava-function/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<name>None</name>
6161
</contributor>
6262
</contributors>
63+
6364
<mailingLists>
6465
<mailingList>
6566
<name>Image.sc Forum</name>

‎scijava-meta/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<license.licenseName>bsd_2</license.licenseName>
8686
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
8787
</properties>
88+
8889
<dependencies>
8990
<!-- SciJava dependencies -->
9091
<dependency>

‎scijava-ops-engine/pom.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -103,41 +103,6 @@
103103
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
104104
</properties>
105105

106-
<build>
107-
<plugins>
108-
<plugin>
109-
<artifactId>maven-invoker-plugin</artifactId>
110-
<version>${maven-invoker-plugin.version}</version>
111-
<configuration>
112-
<!-- <debug>true</debug> -->
113-
<showErrors>true</showErrors>
114-
<properties>
115-
<scijava-maven.version>${project.version}</scijava-maven.version>
116-
</properties>
117-
<projectsDirectory>src/it</projectsDirectory>
118-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
119-
<pomIncludes>
120-
<pomInclude>*/pom.xml</pomInclude>
121-
</pomIncludes>
122-
<settingsFile>src/it/settings.xml</settingsFile>
123-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
124-
<goals>
125-
<goal>install</goal>
126-
</goals>
127-
</configuration>
128-
<executions>
129-
<execution>
130-
<id>integration-test</id>
131-
<goals>
132-
<goal>install</goal>
133-
<goal>run</goal>
134-
</goals>
135-
</execution>
136-
</executions>
137-
</plugin>
138-
</plugins>
139-
</build>
140-
141106
<dependencies>
142107
<!-- SciJava dependencies -->
143108
<dependency>
@@ -228,4 +193,39 @@
228193
<scope>test</scope>
229194
</dependency>
230195
</dependencies>
196+
197+
<build>
198+
<plugins>
199+
<plugin>
200+
<artifactId>maven-invoker-plugin</artifactId>
201+
<version>${maven-invoker-plugin.version}</version>
202+
<configuration>
203+
<!-- <debug>true</debug> -->
204+
<showErrors>true</showErrors>
205+
<properties>
206+
<scijava-maven.version>${project.version}</scijava-maven.version>
207+
</properties>
208+
<projectsDirectory>src/it</projectsDirectory>
209+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
210+
<pomIncludes>
211+
<pomInclude>*/pom.xml</pomInclude>
212+
</pomIncludes>
213+
<settingsFile>src/it/settings.xml</settingsFile>
214+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
215+
<goals>
216+
<goal>install</goal>
217+
</goals>
218+
</configuration>
219+
<executions>
220+
<execution>
221+
<id>integration-test</id>
222+
<goals>
223+
<goal>install</goal>
224+
<goal>run</goal>
225+
</goals>
226+
</execution>
227+
</executions>
228+
</plugin>
229+
</plugins>
230+
</build>
231231
</project>

‎scijava-ops-ext-parser/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@
9999
<scijava.jvm.build.version>[11,)</scijava.jvm.build.version>
100100
</properties>
101101

102-
<repositories>
103-
<repository>
104-
<id>scijava.public</id>
105-
<url>https://maven.scijava.org/content/groups/public</url>
106-
</repository>
107-
</repositories>
108-
109102
<dependencies>
110103

111104
<!-- Third party dependencies -->
@@ -172,4 +165,11 @@
172165
</dependency>
173166
end of opencv dependencies -->
174167
</dependencies>
168+
169+
<repositories>
170+
<repository>
171+
<id>scijava.public</id>
172+
<url>https://maven.scijava.org/content/groups/public</url>
173+
</repository>
174+
</repositories>
175175
</project>

‎scijava-ops-flim/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@
9393
<flimlib.version>2.1.1</flimlib.version>
9494
</properties>
9595

96-
<repositories>
97-
<repository>
98-
<id>scijava.public</id>
99-
<url>https://maven.scijava.org/content/groups/public</url>
100-
</repository>
101-
</repositories>
102-
10396
<dependencies>
10497
<!-- FLIMLib dependencies -->
10598
<dependency>
@@ -202,4 +195,11 @@
202195
<scope>test</scope>
203196
</dependency>
204197
</dependencies>
198+
199+
<repositories>
200+
<repository>
201+
<id>scijava.public</id>
202+
<url>https://maven.scijava.org/content/groups/public</url>
203+
</repository>
204+
</repositories>
205205
</project>

0 commit comments

Comments
 (0)