Skip to content

[MNG-2961] Remove workaround for fixed bug #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elharo merged 3 commits into from
Oct 19, 2024
Merged

[MNG-2961] Remove workaround for fixed bug #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8bfc6a
Remove workaround for fixed bug
elharo Oct 14, 2024
0fe7788
one more workaround
elharo Oct 17, 2024
f43ffc0
javadoc
elharo Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,6 @@ private void writeDependencyXML(Set<Artifact> artifacts) {
PrettyPrintXMLWriter writer = new PrettyPrintXMLWriter(out);

for (Artifact artifact : artifacts) {
// called because artifact will set the version to -SNAPSHOT only if I do this. MNG-2961
artifact.isSnapshot();

writer.startElement("dependency");
writer.startElement("groupId");
writer.writeText(artifact.getGroupId());
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ public String getExclusionKey(Exclusion ex) {
/**
* Calculate the mismatches between the DependencyManagement and resolved artifacts
*
* @param depMgtMap contains the Dependency.GetManagementKey as the keyset for quick lookup.
* @param allDependencyArtifacts contains the set of all artifacts to compare.
* @return a map containing the resolved artifact as the key and the listed dependency as the value.
* @param depMgtMap a keyset of the Dependency.GetManagementKey for quick lookup
* @param allDependencyArtifacts the set of all artifacts to compare
* @return a map containing the resolved artifact as the key and the listed dependency as the value
*/
public Map<Artifact, Dependency> getMismatch(
Map<String, Dependency> depMgtMap, Set<Artifact> allDependencyArtifacts) {
Expand All @@ -223,9 +223,6 @@ public Map<Artifact, Dependency> getMismatch(
for (Artifact dependencyArtifact : allDependencyArtifacts) {
Dependency depFromDepMgt = depMgtMap.get(getArtifactManagementKey(dependencyArtifact));
if (depFromDepMgt != null) {
// workaround for MNG-2961
dependencyArtifact.isSnapshot();

if (depFromDepMgt.getVersion() != null
&& !depFromDepMgt.getVersion().equals(dependencyArtifact.getBaseVersion())) {
mismatchMap.put(dependencyArtifact, depFromDepMgt);
Expand Down