Skip to content

Commit 4f89561

Browse files
authored
Merge pull request #191 from dmatej/commons-io-incompatible
Narrowed and fixed dependencies
2 parents 1cab1f1 + 61da01c commit 4f89561

File tree

2 files changed

+30
-13
lines changed

2 files changed

+30
-13
lines changed

pom.xml

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,34 @@
232232
</build>
233233

234234
<dependencies>
235+
<!-- Used by FeatureSetDependenciesMojo -->
236+
<dependency>
237+
<groupId>org.codehaus.plexus</groupId>
238+
<artifactId>plexus-archiver</artifactId>
239+
<version>4.9.2</version>
240+
</dependency>
241+
242+
<!-- 4.0.0 is not compatible with Maven 3.9.x -->
243+
<dependency>
244+
<groupId>org.codehaus.plexus</groupId>
245+
<artifactId>plexus-utils</artifactId>
246+
<version>3.5.1</version>
247+
</dependency>
248+
249+
<!-- Two older conflicting transitive versions -->
250+
<dependency>
251+
<groupId>commons-io</groupId>
252+
<artifactId>commons-io</artifactId>
253+
<version>2.16.1</version>
254+
<scope>runtime</scope>
255+
</dependency>
256+
<dependency>
257+
<groupId>org.apache.commons</groupId>
258+
<artifactId>commons-lang3</artifactId>
259+
<version>3.14.0</version>
260+
</dependency>
261+
262+
<!-- Provided dependencies have lower priority than compile+runtime, affects transitive deps -->
235263
<dependency>
236264
<groupId>org.apache.maven</groupId>
237265
<artifactId>maven-core</artifactId>
@@ -245,17 +273,6 @@
245273
<scope>provided</scope>
246274
</dependency>
247275

248-
<dependency>
249-
<groupId>org.apache.maven</groupId>
250-
<artifactId>maven-archiver</artifactId>
251-
<version>3.6.2</version>
252-
</dependency>
253-
<dependency>
254-
<groupId>org.apache.maven.shared</groupId>
255-
<artifactId>maven-shared-utils</artifactId>
256-
<version>3.4.2</version>
257-
</dependency>
258-
259276
<dependency>
260277
<groupId>org.junit.jupiter</groupId>
261278
<artifactId>junit-jupiter-engine</artifactId>

src/main/java/org/glassfish/build/FeatureSetsDependenciesMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023 Contributors to the Eclipse Foundation
2+
* Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
33
* Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
44
*
55
* This program and the accompanying materials are made available under the
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727
import java.util.Set;
2828

29+
import org.apache.commons.lang3.StringUtils;
2930
import org.apache.maven.plugin.AbstractMojo;
3031
import org.apache.maven.plugin.MojoExecutionException;
3132
import org.apache.maven.plugin.logging.Log;
@@ -35,7 +36,6 @@
3536
import org.apache.maven.plugins.annotations.Parameter;
3637
import org.apache.maven.plugins.annotations.ResolutionScope;
3738
import org.apache.maven.project.MavenProject;
38-
import org.apache.maven.shared.utils.StringUtils;
3939
import org.codehaus.plexus.archiver.ArchiverException;
4040
import org.codehaus.plexus.archiver.UnArchiver;
4141
import org.codehaus.plexus.archiver.manager.ArchiverManager;

0 commit comments

Comments
 (0)