-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MASSEMBLY-1008] Fix transitive dependencies resolving with required …
…scope (#166) This IT demonstrates how assembly plugin (among others) does wrongly, the code probably originates from Maven2 times. What happens: * "single" mojo resolves test project dependencies * then it reads assembly descriptor * then uses project dependencies to deliver descriptor contents But, here is a problem that IT demonstrates: the delivered list of files are NOT runtime scoped, they are "test scope filtered for runtime leaves" which is not the same thing. By the way, dependency plugin demonstrates same behaviour, wrongly assumes that "test" graph is larger "runtime" tree, but that is not true nor was never true since Maven3 (resolver), it was true ONLY in Maven2 times. --------- Co-authored-by: Slawomir Jaranowski <[email protected]>
- Loading branch information
1 parent
091e87f
commit 36ebace
Showing
6 changed files
with
335 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <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/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.apache.maven.plugin.assembly.test</groupId> | ||
| <artifactId>it-project-parent</artifactId> | ||
| <version>1</version> | ||
| </parent> | ||
|
|
||
| <groupId>test</groupId> | ||
| <artifactId>massembly-1008</artifactId> | ||
| <version>1</version> | ||
|
|
||
| <url>https://issues.apache.org/jira/browse/MASSEMBLY-1008</url> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.google.inject</groupId> | ||
| <artifactId>guice</artifactId> | ||
| <version>6.0.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
| <artifactId>guava</artifactId> | ||
| <version>31.0.1-jre</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>assembly</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>src/main/assembly/bin.xml</descriptor> | ||
| </descriptors> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
33 changes: 33 additions & 0 deletions
33
src/it/projects/dependency-sets/massembly-1008/src/main/assembly/bin.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <assembly> | ||
| <id>bin</id> | ||
| <formats> | ||
| <format>dir</format> | ||
| </formats> | ||
| <includeBaseDirectory>false</includeBaseDirectory> | ||
| <dependencySets> | ||
| <dependencySet> | ||
| <unpack>false</unpack> | ||
| <scope>runtime</scope> | ||
| <outputDirectory></outputDirectory> | ||
| <useProjectArtifact>false</useProjectArtifact> | ||
| </dependencySet> | ||
| </dependencySets> | ||
| </assembly> |
48 changes: 48 additions & 0 deletions
48
src/it/projects/dependency-sets/massembly-1008/verify.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import java.io.*; | ||
|
|
||
| def expectedFilenames = [ | ||
| "aopalliance-1.0.jar", | ||
| "checker-qual-3.12.0.jar", | ||
| "error_prone_annotations-2.7.1.jar", | ||
| "failureaccess-1.0.1.jar", | ||
| "guava-31.0.1-jre.jar", | ||
| "guice-6.0.0.jar", | ||
| "j2objc-annotations-1.3.jar", | ||
| "jakarta.inject-api-2.0.1.jar", | ||
| "javax.inject-1.jar", | ||
| "jsr305-3.0.2.jar", | ||
| "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" | ||
| ] | ||
|
|
||
| File assemblyBasedir = new File( basedir, "target/massembly-1008-1-bin/" ) | ||
|
|
||
| assert assemblyBasedir.listFiles().length == expectedFilenames.size() | ||
|
|
||
| for ( fileName in expectedFilenames ) | ||
| { | ||
| File file = new File( assemblyBasedir, fileName ) | ||
| assert file.isFile() // exists and is file | ||
| } | ||
|
|
||
| // defined set vs listed set: same cardinality and all present: OK | ||
|
|
||
| return true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.