Skip to content

Commit

Permalink
enh: introduced system property to disable project-local resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
lprimak committed Sep 13, 2024
1 parent e73c691 commit edf90bb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ ShrinkWrap Resolvers allows you to override any programmatic configuration via S

- `maven.legacyLocalRepo`: Flag whether to ignore origin tracking for artifacts present in local repository.
- `org.jboss.shrinkwrap.resolver.maven.skipCompilation`: Flag to skip compilation of resolved artifacts (true/false) - default is false.
- `org.jboss.shrinkwrap.resolver.maven.disableProjectLocal`: Flag to disable Maven 4 project-local repository (true/false) - default is false.


## Embedded Maven
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,18 @@ public Collection<MavenResolvedArtifact> resolveDependencies(final MavenResoluti

final List<RemoteRepository> repos = this.getRemoteRepositories();

Set<MavenDependency> allDependencies = new LinkedHashSet<>(depsForResolution);
Collection<ArtifactResult> projectLocalDependencies = resolveProjectLocal(depsForResolution, allDependencies);
List<MavenDependency> unresolvedLocally = filterFromLocal(
allDependencies.stream().collect(Collectors.toList()), projectLocalDependencies);
List<MavenDependency> resolveFromRepository;
Collection<ArtifactResult> projectLocalDependencies = Collections.emptyList();
if (Boolean.getBoolean("org.jboss.shrinkwrap.resolver.maven.disableProjectLocal")) {
resolveFromRepository = depsForResolution;
} else {
Set<MavenDependency> allDependencies = new LinkedHashSet<>(depsForResolution);
projectLocalDependencies = resolveProjectLocal(depsForResolution, allDependencies);
resolveFromRepository = filterFromLocal(
allDependencies.stream().collect(Collectors.toList()), projectLocalDependencies);
}

final CollectRequest request = new CollectRequest(MavenConverter.asDependencies(unresolvedLocally,
final CollectRequest request = new CollectRequest(MavenConverter.asDependencies(resolveFromRepository,
getSession().getArtifactTypeRegistry()),
MavenConverter.asDependencies(depManagement, getSession().getArtifactTypeRegistry()), repos);

Expand Down

0 comments on commit edf90bb

Please sign in to comment.