Skip to content

Commit 1bd7bb2

Browse files
slawekjaranowskislawekjaranowski
committed
[MINVOKER-368] Filter artifacts by scope before resolving in install
1 parent affa7be commit 1bd7bb2

File tree

3 files changed

+112
-9
lines changed

3 files changed

+112
-9
lines changed

‎src/it/MINVOKER-368-install-filter-scope/pom.xml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<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/maven-v4_0_0.xsd">
23+
<modelVersion>4.0.0</modelVersion>
24+
25+
<groupId>org.apache.maven.plugins.invoker</groupId>
26+
<artifactId>MINVOKER-368</artifactId>
27+
<version>1.0-SNAPSHOT</version>
28+
<packaging>pom</packaging>
29+
30+
<description>
31+
Test to check for scope filtering during installation.
32+
</description>
33+
34+
<properties>
35+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36+
</properties>
37+
38+
<dependencies>
39+
<!-- shared-utils has dependencies to commons-io:2.11.0 -->
40+
<!-- in runtime this version will be used -->
41+
<dependency>
42+
<groupId>org.apache.maven.shared</groupId>
43+
<artifactId>maven-shared-utils</artifactId>
44+
<version>3.4.2</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>commons-io</groupId>
48+
<artifactId>commons-io</artifactId>
49+
<version>2.16.1</version>
50+
<scope>test</scope>
51+
</dependency>
52+
</dependencies>
53+
54+
<build>
55+
<plugins>
56+
<plugin>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<artifactId>maven-invoker-plugin</artifactId>
59+
<version>@project.version@</version>
60+
<configuration>
61+
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
62+
</configuration>
63+
<executions>
64+
<execution>
65+
<id>integration-test</id>
66+
<phase>initialize</phase>
67+
<goals>
68+
<goal>install</goal>
69+
</goals>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
</plugins>
74+
</build>
75+
76+
</project>

‎src/it/MINVOKER-368-install-filter-scope/verify.groovy‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
21+
def expected = [
22+
'org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.pom',
23+
'org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.jar',
24+
'commons-io/commons-io/2.11.0/commons-io-2.11.0.pom',
25+
'commons-io/commons-io/2.11.0/commons-io-2.11.0.jar'
26+
]
27+
28+
def localRepo = new File(basedir, 'target/it-repo')
29+
30+
def missingFiles = expected.findAll { !new File(localRepo, it).isFile() }
31+
32+
assert missingFiles == []

‎src/main/java/org/apache/maven/plugins/invoker/InstallMojo.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
5353
import org.eclipse.aether.artifact.DefaultArtifact;
5454
import org.eclipse.aether.collection.CollectRequest;
55+
import org.eclipse.aether.graph.DefaultDependencyNode;
5556
import org.eclipse.aether.graph.Dependency;
5657
import org.eclipse.aether.graph.DependencyFilter;
5758
import org.eclipse.aether.installation.InstallRequest;
5859
import org.eclipse.aether.installation.InstallationException;
5960
import org.eclipse.aether.repository.LocalRepository;
6061
import org.eclipse.aether.repository.LocalRepositoryManager;
6162
import org.eclipse.aether.repository.RemoteRepository;
62-
import org.eclipse.aether.resolution.ArtifactDescriptorException;
6363
import org.eclipse.aether.resolution.ArtifactRequest;
6464
import org.eclipse.aether.resolution.ArtifactResolutionException;
6565
import org.eclipse.aether.resolution.ArtifactResult;
@@ -172,10 +172,7 @@ public void execute() throws MojoExecutionException {
172172
resolveExtraArtifacts(resolvedArtifacts);
173173
installArtifacts(resolvedArtifacts);
174174

175-
} catch (DependencyResolutionException
176-
| InstallationException
177-
| ArtifactDescriptorException
178-
| ArtifactResolutionException e) {
175+
} catch (DependencyResolutionException | InstallationException | ArtifactResolutionException e) {
179176
throw new MojoExecutionException(e.getMessage(), e);
180177
}
181178
}
@@ -227,6 +224,7 @@ private void resolveProjectDependencies(Map<String, Artifact> resolvedArtifacts)
227224

228225
List<Dependency> dependencies = project.getDependencies().stream()
229226
.map(d -> RepositoryUtils.toDependency(d, artifactTypeRegistry))
227+
.filter(d -> classpathFilter.accept(new DefaultDependencyNode(d), null))
230228
.collect(Collectors.toList());
231229

232230
CollectRequest collectRequest = new CollectRequest();
@@ -251,12 +249,9 @@ private void resolveProjectDependencies(Map<String, Artifact> resolvedArtifacts)
251249

252250
/**
253251
* Resolve extra artifacts.
254-
*
255-
* @return
256252
*/
257253
private void resolveExtraArtifacts(Map<String, Artifact> resolvedArtifacts)
258-
throws MojoExecutionException, DependencyResolutionException, ArtifactDescriptorException,
259-
ArtifactResolutionException {
254+
throws MojoExecutionException, DependencyResolutionException, ArtifactResolutionException {
260255

261256
if (extraArtifacts == null) {
262257
return;

0 commit comments

Comments
 (0)