Skip to content

IVY-1614, IVY-1655: translate dynamic ranges to Maven-compatible formats #126

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

Open
eric-milles wants to merge 2 commits into
base: master
Choose a base branch
from
Open

IVY-1614, IVY-1655: translate dynamic ranges to Maven-compatible formats #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ecdaaf
regroup read and write steps
eric-milles Jun 23, 2026
7f0b3ae
IVY-1614, IVY-1655: translate dynamic ranges to Maven-compatible formats
eric-milles Jun 23, 2026
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
65 changes: 47 additions & 18 deletions src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,16 @@
import java.io.LineNumberReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.ivy.Ivy;
import org.apache.ivy.core.IvyContext;
Expand Down Expand Up @@ -226,6 +230,31 @@ private static void indent(PrintWriter out, int indent) {
}
}

/**
* Translates dynamic revision to Maven-compatible version string.
*/
private static String translate(String version) {
version = version.trim();
if (version.endsWith("+")) { // 1+, 1.+, 1.2+, 1.2.+
version = version.replaceFirst("\\.?\\s*\\+$", ""); // drop dot-plus

@maartenc maartenc Jun 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the \\s* ?

@eric-milles eric-milles Jun 26, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"1. +" -- spaces

@maartenc maartenc Jun 26, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does Ivy supports that ?

@eric-milles eric-milles Jun 29, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just being careful

String[] tokens = version.split("\\s*\\.\\s*"); // split on the dots
// try to increment the least-significant token; the exclusive limit
Matcher matcher = Pattern.compile("(\\D*)(\\d+)").matcher(tokens[tokens.length - 1]);
if (matcher.matches()) {
tokens[tokens.length - 1] = matcher.group(1) + new BigInteger(matcher.group(2)).add(new BigInteger("1"));
}
version = "[" + version + "," + String.join(".", tokens) + ")";
} else {
if (version.startsWith("]")) {
version = "(" + version.substring(1, version.length());
}
if (version.endsWith("[")) {
version = version.substring(0, version.length() - 1) + ")";
}
}
return version;
}

private static void printDependencies(ModuleDescriptor md, PrintWriter out,
PomWriterOptions options, int indent, boolean printDependencies) {
List<ExtraDependency> extraDeps = options.getExtraDependencies();
Expand Down Expand Up @@ -259,28 +288,29 @@ private static void printDependencies(ModuleDescriptor md, PrintWriter out,

for (DependencyDescriptor dd : dds) {
ModuleRevisionId mrid = dd.getDependencyRevisionId();
ExcludeRule[] excludes = null;
if (dd.canExclude()) {
excludes = dd.getAllExcludeRules();
}
String safer = translate(mrid.getRevision()); // IVY-1655
String scope = mapping.getScope(dd.getModuleConfigurations());
boolean optional = mapping.isOptional(dd.getModuleConfigurations());
BiConsumer<String, String> dependencyPrinter = (type, classifier) -> {
printDependency(out, indent,
mrid.getOrganisation(),
mrid.getName(),
safer,
type,
classifier,
scope,
optional,
dd.isTransitive(),
dd.canExclude() ? dd.getAllExcludeRules() : null);
};

DependencyArtifactDescriptor[] dads = dd.getAllDependencyArtifacts();
if (dads.length > 0) {
for (DependencyArtifactDescriptor dad : dads) {
String type = dad.getType();
String classifier = dad.getExtraAttribute("classifier");
String scope = mapping.getScope(dd.getModuleConfigurations());
boolean optional = mapping.isOptional(dd.getModuleConfigurations());
printDependency(out, indent, mrid.getOrganisation(), mrid.getName(),
mrid.getRevision(), type, classifier, scope, optional,
dd.isTransitive(), excludes);
dependencyPrinter.accept(dad.getType(), dad.getExtraAttribute("classifier"));
}
} else {
String scope = mapping.getScope(dd.getModuleConfigurations());
boolean optional = mapping.isOptional(dd.getModuleConfigurations());
final String classifier = dd.getExtraAttribute("classifier");
printDependency(out, indent, mrid.getOrganisation(), mrid.getName(),
mrid.getRevision(), null, classifier, scope, optional, dd.isTransitive(),
excludes);
dependencyPrinter.accept(null, dd.getExtraAttribute("classifier"));
}
}

Expand Down Expand Up @@ -460,5 +490,4 @@ public Object clone() {
throw new UnsupportedOperationException();
}
}

}
Loading