Skip to content

Commit c3f2468

Browse files
ctruedenctrueden
committed
Update various dependency versions
1 parent 56df36f commit c3f2468

File tree

2 files changed

+28
-78
lines changed

2 files changed

+28
-78
lines changed

‎pom.xml‎

Lines changed: 22 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>31.1.0</version>
8+
<version>37.0.0</version>
99
<relativePath />
1010
</parent>
1111

1212
<artifactId>scijava-maven-plugin</artifactId>
13-
<version>2.2.1-SNAPSHOT</version>
13+
<version>3.0.0-SNAPSHOT</version>
1414
<packaging>maven-plugin</packaging>
1515

1616
<name>SciJava plugin for Maven</name>
@@ -143,16 +143,20 @@
143143

144144
<maven.version>3.0</maven.version>
145145
<maven-core.version>3.0</maven-core.version>
146-
<maven2.version>2.2.1</maven2.version>
147-
<maven-tree.version>2.2</maven-tree.version>
146+
<maven-dependency-tree.version>2.2</maven-dependency-tree.version>
148147
<maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
149148
<maven-artifact-transfer.version>0.9.1</maven-artifact-transfer.version>
150149
<maven-common-artifact-filters.version>3.0.1</maven-common-artifact-filters.version>
151-
<plexus-container-default.version>2.1.0</plexus-container-default.version>
152150
<plexus-interpolation.version>1.24</plexus-interpolation.version>
153151
<plexus-utils.version>3.1.0</plexus-utils.version>
152+
<org.eclipse.sisu.plexus.version>0.3.0</org.eclipse.sisu.plexus.version>
154153

155154
<hamcrest.version>1.3</hamcrest.version>
155+
156+
<!--
157+
Allow org.eclipse.aether:aether-util + org.apache.maven.shared:maven-artifact-transfer.
158+
-->
159+
<scijava.allowedDuplicateClasses>org.eclipse.aether.util.*</scijava.allowedDuplicateClasses>
156160
</properties>
157161

158162
<dependencies>
@@ -171,71 +175,36 @@
171175
<groupId>org.apache.maven</groupId>
172176
<artifactId>maven-plugin-api</artifactId>
173177
<version>${maven.version}</version>
174-
<exclusions>
175-
<exclusion>
176-
<groupId>org.sonatype.sisu</groupId>
177-
<artifactId>sisu-inject-plexus</artifactId>
178-
</exclusion>
179-
</exclusions>
178+
<scope>provided</scope>
180179
</dependency>
181180
<dependency>
182181
<groupId>org.apache.maven</groupId>
183182
<artifactId>maven-artifact</artifactId>
184183
<version>${maven.version}</version>
184+
<scope>provided</scope>
185185
</dependency>
186186
<dependency>
187187
<groupId>org.apache.maven</groupId>
188188
<artifactId>maven-compat</artifactId>
189189
<version>${maven.version}</version>
190-
<exclusions>
191-
<exclusion>
192-
<groupId>org.sonatype.sisu</groupId>
193-
<artifactId>sisu-inject-plexus</artifactId>
194-
</exclusion>
195-
</exclusions>
190+
<scope>provided</scope>
196191
</dependency>
197192
<dependency>
198193
<groupId>org.apache.maven</groupId>
199194
<artifactId>maven-core</artifactId>
200-
<exclusions>
201-
<exclusion>
202-
<groupId>org.sonatype.sisu</groupId>
203-
<artifactId>sisu-inject-plexus</artifactId>
204-
</exclusion>
205-
<exclusion>
206-
<groupId>org.codehaus.plexus</groupId>
207-
<artifactId>plexus-utils</artifactId>
208-
</exclusion>
209-
</exclusions>
195+
<scope>provided</scope>
210196
</dependency>
211197
<dependency>
212198
<groupId>org.apache.maven</groupId>
213199
<artifactId>maven-model</artifactId>
214200
<version>${maven.version}</version>
201+
<scope>provided</scope>
215202
</dependency>
216203

217204
<dependency>
218205
<groupId>org.apache.maven.enforcer</groupId>
219206
<artifactId>enforcer-api</artifactId>
220207
<version>${maven-enforcer-plugin.version}</version>
221-
<exclusions>
222-
<exclusion>
223-
<groupId>classworlds</groupId>
224-
<artifactId>classworlds</artifactId>
225-
</exclusion>
226-
<exclusion>
227-
<groupId>org.apache.maven</groupId>
228-
<artifactId>maven-plugin-api</artifactId>
229-
</exclusion>
230-
<exclusion>
231-
<groupId>org.codehaus.plexus</groupId>
232-
<artifactId>plexus-utils</artifactId>
233-
</exclusion>
234-
<exclusion>
235-
<groupId>org.codehaus.plexus</groupId>
236-
<artifactId>plexus-container-default</artifactId>
237-
</exclusion>
238-
</exclusions>
239208
</dependency>
240209

241210
<dependency>
@@ -251,24 +220,13 @@
251220
<dependency>
252221
<groupId>org.apache.maven.shared</groupId>
253222
<artifactId>maven-common-artifact-filters</artifactId>
254-
<exclusions>
255-
<exclusion>
256-
<groupId>org.sonatype.sisu</groupId>
257-
<artifactId>sisu-inject-plexus</artifactId>
258-
</exclusion>
259-
</exclusions>
260223
</dependency>
261224
<dependency>
262225
<groupId>org.apache.maven.shared</groupId>
263226
<artifactId>maven-dependency-tree</artifactId>
264-
<version>${maven-tree.version}</version>
227+
<version>${maven-dependency-tree.version}</version>
265228
</dependency>
266229

267-
<dependency>
268-
<groupId>org.codehaus.plexus</groupId>
269-
<artifactId>plexus-container-default</artifactId>
270-
<version>${plexus-container-default.version}</version>
271-
</dependency>
272230
<dependency>
273231
<groupId>org.codehaus.plexus</groupId>
274232
<artifactId>plexus-interpolation</artifactId>
@@ -280,6 +238,12 @@
280238
<version>${plexus-utils.version}</version>
281239
</dependency>
282240

241+
<dependency>
242+
<groupId>org.eclipse.sisu</groupId>
243+
<artifactId>org.eclipse.sisu.plexus</artifactId>
244+
<version>${org.eclipse.sisu.plexus.version}</version>
245+
</dependency>
246+
283247
<dependency>
284248
<groupId>org.scijava</groupId>
285249
<artifactId>scijava-common</artifactId>
@@ -342,26 +306,6 @@
342306
</plugins>
343307
</pluginManagement>
344308
<plugins>
345-
<plugin>
346-
<artifactId>maven-enforcer-plugin</artifactId>
347-
<configuration>
348-
<rules>
349-
<banDuplicateClasses>
350-
<!--
351-
NB: maven-artifact and maven-project are 2.0 artifacts
352-
that clash with maven-core 3.0.
353-
-->
354-
<ignoreClasses>
355-
<ignoreClass>org/apache/maven/artifact/*</ignoreClass>
356-
357-
<ignoreClass>org/apache/maven/project/*</ignoreClass>
358-
</ignoreClasses>
359-
<findAllDuplicates>true</findAllDuplicates>
360-
<ignoreWhenIdentical>true</ignoreWhenIdentical>
361-
</banDuplicateClasses>
362-
</rules>
363-
</configuration>
364-
</plugin>
365309
<plugin>
366310
<groupId>org.apache.maven.plugins</groupId>
367311
<artifactId>maven-plugin-plugin</artifactId>
@@ -381,7 +325,7 @@
381325
</plugin>
382326
<plugin>
383327
<artifactId>maven-invoker-plugin</artifactId>
384-
<version>1.8</version>
328+
<version>${maven-invoker-plugin.version}</version>
385329
<configuration>
386330
<!-- <debug>true</debug> -->
387331
<showErrors>true</showErrors>

‎src/test/java/org/scijava/maven/plugin/enforcer/EnforcerRuleHelperMock.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import java.io.File;
5353
import java.util.List;
5454
import java.util.Map;
55+
import java.util.function.Supplier;
5556

5657
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
5758
import org.apache.maven.plugin.logging.Log;
@@ -101,6 +102,11 @@ public Object evaluate(String variable) throws ExpressionEvaluationException {
101102
return null;
102103
}
103104

105+
@Override
106+
public Object getCache(String s, Supplier<?> supplier) {
107+
return null;
108+
}
109+
104110
@Override
105111
public <T> T getComponent(Class<T> arg0) throws ComponentLookupException {
106112
return null;

0 commit comments

Comments
 (0)