Skip to content

Commit 5b3d205

Browse files
stelfrichstelfrich
committed
Merge POMs
Also bumps the parent POM to the more recent version of pom-scijava of imagej-maven-plugin. Some dependencies have to be bumped to newer versions as well, which also leads to some minor changes wrt. enforcer rules.
1 parent 08e59f0 commit 5b3d205

File tree

1 file changed

+141
-65
lines changed

1 file changed

+141
-65
lines changed

‎pom.xml‎

Lines changed: 141 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>9.0.0</version>
8+
<version>17.1.1</version>
99
<relativePath />
1010
</parent>
1111

@@ -15,7 +15,12 @@
1515

1616
<name>SciJava plugin for Maven</name>
1717
<description>A plugin for managing SciJava-based projects.</description>
18+
<url>https://github.com/scijava/scijava-maven-plugin</url>
1819
<inceptionYear>2014</inceptionYear>
20+
<organization>
21+
<name>SciJava</name>
22+
<url>http://www.scijava.org/</url>
23+
</organization>
1924
<licenses>
2025
<license>
2126
<name>Simplified BSD License</name>
@@ -37,6 +42,18 @@
3742
<role>maintainer</role>
3843
</roles>
3944
</developer>
45+
<developer>
46+
<id>stelfrich</id>
47+
<name>Stefan Helfrich</name>
48+
<url>http://imagej.net/User:Stelfrich</url>
49+
<roles>
50+
<role>developer</role>
51+
<role>debugger</role>
52+
<role>reviewer</role>
53+
<role>support</role>
54+
<role>maintainer</role>
55+
</roles>
56+
</developer>
4057
</developers>
4158
<contributors>
4259
<contributor>
@@ -52,18 +69,43 @@
5269
</contributor>
5370
</contributors>
5471

72+
<mailingLists>
73+
<mailingList>
74+
<name>ImageJ Forum</name>
75+
<archive>http://forum.imagej.net/</archive>
76+
</mailingList>
77+
</mailingLists>
78+
5579
<scm>
5680
<connection>scm:git:git://github.com/scijava/scijava-maven-plugin</connection>
5781
<developerConnection>scm:git:git@github.com:scijava/scijava-maven-plugin</developerConnection>
5882
<tag>HEAD</tag>
5983
<url>https://github.com/scijava/scijava-maven-plugin</url>
6084
</scm>
85+
<issueManagement>
86+
<system>GitHub Issues</system>
87+
<url>https://github.com/scijava/scijava-maven-plugin/issues</url>
88+
</issueManagement>
89+
<ciManagement>
90+
<system>Travis CI</system>
91+
<url>https://travis-ci.org/scijava/scijava-maven-plugin</url>
92+
</ciManagement>
6193

6294
<properties>
6395
<enforcer.version>1.3.1</enforcer.version>
96+
<license.licenseName>bsd_2</license.licenseName>
97+
<license.copyrightOwners>Board of Regents of the University of
98+
Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
99+
Institute of Molecular Cell Biology and Genetics, University of
100+
Konstanz, and KNIME GmbH.</license.copyrightOwners>
101+
<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
102+
<maven.compiler.source>1.8</maven.compiler.source>
103+
<maven.compiler.target>1.6</maven.compiler.target>
64104
<maven.version>3.0</maven.version>
65105
<maven2.version>2.2.1</maven2.version>
66106
<maven-tree.version>2.2</maven-tree.version>
107+
<package-name>org.scijava.maven</package-name>
108+
<scijava-common.version>2.66.0</scijava-common.version>
67109
</properties>
68110

69111
<dependencies>
@@ -90,48 +132,6 @@
90132
</exclusion>
91133
</exclusions>
92134
</dependency>
93-
<dependency>
94-
<groupId>org.apache.maven</groupId>
95-
<artifactId>maven-artifact</artifactId>
96-
<version>${maven2.version}</version>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>org.codehaus.plexus</groupId>
100-
<artifactId>plexus-utils</artifactId>
101-
</exclusion>
102-
</exclusions>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.apache.maven</groupId>
106-
<artifactId>maven-project</artifactId>
107-
<version>${maven2.version}</version>
108-
<exclusions>
109-
<exclusion>
110-
<groupId>org.codehaus.plexus</groupId>
111-
<artifactId>plexus-interpolation</artifactId>
112-
</exclusion>
113-
<exclusion>
114-
<groupId>org.codehaus.plexus</groupId>
115-
<artifactId>plexus-utils</artifactId>
116-
</exclusion>
117-
<exclusion>
118-
<groupId>org.apache.maven</groupId>
119-
<artifactId>maven-artifact-manager</artifactId>
120-
</exclusion>
121-
<exclusion>
122-
<groupId>org.apache.maven</groupId>
123-
<artifactId>maven-model</artifactId>
124-
</exclusion>
125-
<exclusion>
126-
<groupId>org.apache.maven</groupId>
127-
<artifactId>maven-settings</artifactId>
128-
</exclusion>
129-
<exclusion>
130-
<groupId>classworlds</groupId>
131-
<artifactId>classworlds</artifactId>
132-
</exclusion>
133-
</exclusions>
134-
</dependency>
135135
<dependency>
136136
<groupId>org.apache.maven</groupId>
137137
<artifactId>maven-plugin-api</artifactId>
@@ -166,13 +166,57 @@
166166
<dependency>
167167
<groupId>org.apache.maven.plugin-tools</groupId>
168168
<artifactId>maven-plugin-annotations</artifactId>
169-
<version>3.3</version>
169+
<version>3.5</version>
170170
</dependency>
171171
<dependency>
172172
<groupId>junit</groupId>
173173
<artifactId>junit</artifactId>
174174
<scope>test</scope>
175175
</dependency>
176+
177+
<dependency>
178+
<groupId>org.apache.maven</groupId>
179+
<artifactId>maven-artifact</artifactId>
180+
<version>${maven.version}</version>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.apache.maven</groupId>
184+
<artifactId>maven-compat</artifactId>
185+
<version>${maven.version}</version>
186+
</dependency>
187+
<dependency>
188+
<groupId>org.apache.maven</groupId>
189+
<artifactId>maven-model</artifactId>
190+
<version>${maven.version}</version>
191+
</dependency>
192+
193+
<dependency>
194+
<groupId>org.apache.maven.shared</groupId>
195+
<artifactId>maven-artifact-transfer</artifactId>
196+
<version>0.9.1</version>
197+
</dependency>
198+
<dependency>
199+
<groupId>org.apache.maven.shared</groupId>
200+
<artifactId>maven-common-artifact-filters</artifactId>
201+
<version>3.0.1</version>
202+
</dependency>
203+
204+
<dependency>
205+
<groupId>org.codehaus.plexus</groupId>
206+
<artifactId>plexus-interpolation</artifactId>
207+
<version>1.24</version>
208+
</dependency>
209+
<dependency>
210+
<groupId>org.codehaus.plexus</groupId>
211+
<artifactId>plexus-utils</artifactId>
212+
<version>3.1.0</version>
213+
</dependency>
214+
215+
<dependency>
216+
<groupId>org.scijava</groupId>
217+
<artifactId>scijava-common</artifactId>
218+
<version>${scijava-common.version}</version>
219+
</dependency>
176220
</dependencies>
177221

178222
<build>
@@ -205,33 +249,38 @@
205249
</lifecycleMappingMetadata>
206250
</configuration>
207251
</plugin>
252+
<plugin>
253+
<groupId>org.apache.maven.plugins</groupId>
254+
<artifactId>maven-enforcer-plugin</artifactId>
255+
<version>1.0</version>
256+
<dependencies>
257+
<dependency>
258+
<groupId>org.codehaus.mojo</groupId>
259+
<artifactId>extra-enforcer-rules</artifactId>
260+
<version>1.0-beta-9</version>
261+
</dependency>
262+
</dependencies>
263+
</plugin>
208264
</plugins>
209265
</pluginManagement>
210266
<plugins>
211267
<plugin>
212268
<artifactId>maven-enforcer-plugin</artifactId>
213269
<configuration>
214270
<rules>
215-
<banClasses>
271+
<banDuplicateClasses>
216272
<!--
217273
NB: maven-artifact and maven-project are 2.0 artifacts
218274
that clash with maven-core 3.0.
219275
-->
220-
<dependencies>
221-
<dependency>
222-
<artifactId>maven-artifact</artifactId>
223-
<ignoreClasses>
224-
<ignoreClass>org/apache/maven/artifact/*</ignoreClass>
225-
</ignoreClasses>
226-
</dependency>
227-
<dependency>
228-
<artifactId>maven-project</artifactId>
229-
<ignoreClasses>
230-
<ignoreClass>org/apache/maven/project/*</ignoreClass>
231-
</ignoreClasses>
232-
</dependency>
233-
</dependencies>
234-
</banClasses>
276+
<ignoreClasses>
277+
<ignoreClass>org/apache/maven/artifact/*</ignoreClass>
278+
279+
<ignoreClass>org/apache/maven/project/*</ignoreClass>
280+
</ignoreClasses>
281+
<findAllDuplicates>true</findAllDuplicates>
282+
<ignoreWhenIdentical>true</ignoreWhenIdentical>
283+
</banDuplicateClasses>
235284
</rules>
236285
</configuration>
237286
</plugin>
@@ -253,13 +302,40 @@
253302
</executions>
254303
</plugin>
255304
<plugin>
256-
<groupId>org.codehaus.mojo</groupId>
257-
<artifactId>license-maven-plugin</artifactId>
305+
<artifactId>maven-invoker-plugin</artifactId>
306+
<version>1.8</version>
258307
<configuration>
259-
<licenseName>bsd_2</licenseName>
260-
<organizationName>Board of Regents of the University of
261-
Wisconsin-Madison.</organizationName>
308+
<!-- <debug>true</debug> -->
309+
<showErrors>true</showErrors>
310+
<streamLogs>true</streamLogs>
311+
<properties>
312+
<scijava-maven.version>${project.version}</scijava-maven.version>
313+
</properties>
314+
<projectsDirectory>src/it</projectsDirectory>
315+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
316+
<pomIncludes>
317+
<pomInclude>*/pom.xml</pomInclude>
318+
</pomIncludes>
319+
<settingsFile>src/it/settings.xml</settingsFile>
320+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
321+
<preBuildHookScript>setup.bsh</preBuildHookScript>
322+
<postBuildHookScript>verify.bsh</postBuildHookScript>
323+
<goals>
324+
<goal>install</goal>
325+
</goals>
262326
</configuration>
327+
<executions>
328+
<execution>
329+
<id>integration-test</id>
330+
<goals>
331+
<goal>install</goal>
332+
<goal>run</goal>
333+
</goals>
334+
</execution>
335+
</executions>
336+
</plugin>
337+
<plugin>
338+
<artifactId>maven-release-plugin</artifactId>
263339
</plugin>
264340
</plugins>
265341
</build>

0 commit comments

Comments
 (0)