Skip to content

Commit

Permalink
Merge pull request #348 from aloubyansky/better-version-property-mapping
Browse files Browse the repository at this point in the history 
Better version property mapping
  • Loading branch information
@aloubyansky
aloubyansky committed Sep 23, 2024
2 parents cba7e73 + 9ef9fd9 commit 0bb96d5
Showing 1 changed file with 35 additions and 37 deletions.
72 changes: 35 additions & 37 deletions ...rc/main/java/io/quarkus/bom/decomposer/maven/platformgen/GeneratePlatformProjectMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public class GeneratePlatformProjectMojo extends AbstractMojo {
private static final String PLATFORM_STREAM_PROP = "platform.stream";
private static final String PLATFORM_RELEASE_PROP = "platform.release";
private static final String DEPENDENCIES_TO_BUILD = "dependenciesToBuild";
private static final String COLON = ":";

@Component
RepositorySystem repoSystem;
Expand Down Expand Up @@ -631,7 +632,7 @@ private void generateExtensionChangesModule(Model parentPom) throws MojoExecutio
final Xpp3Dom config = new Xpp3Dom("configuration");
exec.setConfiguration(config);
config.addChild(textDomElement("bom",
m.getConfiguredPlatformBom().getGroupId() + ":" + m.getConfiguredPlatformBom().getArtifactId() + ":"
m.getConfiguredPlatformBom().getGroupId() + COLON + m.getConfiguredPlatformBom().getArtifactId() + COLON
+ getDependencyVersion(pom, m.descriptorCoords())));
config.addChild(
textDomElement("outputFile",
Expand Down Expand Up @@ -719,7 +720,7 @@ private void generateDepsToBuildModule(Model parentPom, String artifactId, Strin
final Xpp3Dom config = new Xpp3Dom("configuration");
exec.setConfiguration(config);
config.addChild(textDomElement("bom",
m.getConfiguredPlatformBom().getGroupId() + ":" + m.getConfiguredPlatformBom().getArtifactId() + ":"
m.getConfiguredPlatformBom().getGroupId() + COLON + m.getConfiguredPlatformBom().getArtifactId() + COLON
+ getDependencyVersion(pom, m.descriptorCoords())));
config.addChild(
textDomElement("outputFile",
Expand Down Expand Up @@ -1026,8 +1027,8 @@ private void updatePreviousMemberRelease(PlatformMemberImpl member, int membersI
buf.append(l.charAt(i));
}
var generatedBom = member.getAlignedDecomposedBom().bomArtifact();
buf.append(" <lastDetectedBomUpdate>").append(generatedBom.getGroupId()).append(":")
.append(generatedBom.getArtifactId()).append(":")
buf.append(" <lastDetectedBomUpdate>").append(generatedBom.getGroupId()).append(COLON)
.append(generatedBom.getArtifactId()).append(COLON)
.append(generatedBom.getVersion()).append("</lastDetectedBomUpdate>");
int prevIndex = pomLineContaining("<lastDetectedBomUpdate>", releaseIndex, releaseEnd);
if (prevIndex < 0) {
Expand Down Expand Up @@ -1227,7 +1228,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
pom.setProperties(new Properties());
for (Map.Entry<?, ?> originalProp : originalProps.entrySet()) {
final String propName = originalProp.getKey().toString();
if (getTestArtifactGroupIdForProperty(propName) == null) {
if (!project.getOriginalModel().getProperties().containsKey(propName)) {
pom.getProperties().setProperty(propName, originalProp.getValue().toString());
}
}
Expand Down Expand Up @@ -1828,7 +1829,7 @@ private void generateMemberIntegrationTestsModule(PlatformMemberImpl member, Pla
if (testConfig == null) {
testConfig = new PlatformMemberTestConfig();
testConfig.setArtifact(
testCoords.getGroupId() + ":" + testCoords.getArtifactId() + ":" + testCoords.getVersion());
testCoords.getGroupId() + COLON + testCoords.getArtifactId() + COLON + testCoords.getVersion());
testConfigs.put(testCoords.getKey(), testConfig);
}
}
Expand Down Expand Up @@ -1924,7 +1925,7 @@ private void generateIntegrationTestModule(String moduleName, ArtifactCoords tes
addDependencies(pom, testConfig.getTestDependencies(), true);

final Xpp3Dom depsToScan = new Xpp3Dom("dependenciesToScan");
depsToScan.addChild(textDomElement("dependency", testArtifact.getGroupId() + ":" + testArtifact.getArtifactId()));
depsToScan.addChild(textDomElement("dependency", testArtifact.getGroupId() + COLON + testArtifact.getArtifactId()));

if (!testConfig.isSkipJvm()) {
final Build build = new Build();
Expand Down Expand Up @@ -2054,7 +2055,7 @@ private void generateIntegrationTestModule(String moduleName, ArtifactCoords tes
config.addChild(textDomElement("skip", "true"));
}
config.addChild(textDomElement("appArtifact",
testArtifact.getGroupId() + ":" + testArtifact.getArtifactId() + ":" + testArtifactVersion));
testArtifact.getGroupId() + COLON + testArtifact.getArtifactId() + COLON + testArtifactVersion));
}

Utils.disablePlugin(pom, "maven-jar-plugin", "default-jar");
Expand Down Expand Up @@ -2165,7 +2166,7 @@ private String getTestArtifactVersion(String artifactGroupId, String version) {
return version;
}
if (versionProp.isEmpty()) {
versionProp = pomPropsByValues.get(artifactGroupId + ":" + version);
versionProp = pomPropsByValues.get(artifactGroupId + COLON + version);
if (versionProp == null) {
return version;
}
Expand All @@ -2179,44 +2180,50 @@ private void mapProjectProperties(Properties props) {
final String value = prop.getValue().toString();
final String previous = pomPropsByValues.putIfAbsent(value, name);
if (previous != null) {
final String groupId = getTestArtifactGroupIdForProperty(name);
if (groupId == null) {
Collection<String> groupIds = getArtifactGroupIdsForVersionProperty(name);
if (groupIds.isEmpty()) {
continue;
}
for (var groupId : groupIds) {
pomPropsByValues.put(groupId + COLON + value, name);
}
if (previous.isEmpty()) {
pomPropsByValues.putIfAbsent(groupId + ":" + value, name);
continue;
}
final String previousGroupId = getTestArtifactGroupIdForProperty(previous);
if (previousGroupId == null) {
pomPropsByValues.putIfAbsent(value, name);
groupIds = getArtifactGroupIdsForVersionProperty(previous);
for (var groupId : groupIds) {
pomPropsByValues.put(groupId + COLON + value, previous);
}

pomPropsByValues.put(value, "");
pomPropsByValues.put(previousGroupId + ":" + value, previous);
pomPropsByValues.putIfAbsent(groupId + ":" + value, name);
}
}
}

private String getTestArtifactGroupIdForProperty(final String versionProperty) {
private Collection<String> getArtifactGroupIdsForVersionProperty(final String versionProperty) {
var propExpr = "${" + versionProperty + "}";
Set<String> result = new HashSet<>();
for (String s : pomLines()) {
int coordsEnd = s.indexOf(versionProperty);
if (coordsEnd < 0) {
int coordsEnd = s.indexOf(propExpr);
// looking for <p>propExpr</p>, min length will be propExpr.length() + 3 + 4
if (coordsEnd < 0
|| s.length() < propExpr.length() + 7) {
continue;
}
coordsEnd = s.indexOf("</artifact>", coordsEnd);
coordsEnd = s.indexOf("</", coordsEnd);
if (coordsEnd < 0) {
continue;
}
int coordsStart = s.indexOf("<artifact>");
int coordsStart = s.indexOf(">");
if (coordsStart < 0) {
continue;
}
coordsStart += "<artifact>".length();
return ArtifactCoords.fromString(s.substring(coordsStart, coordsEnd)).getGroupId();
var coords = s.substring(coordsStart + 1, coordsEnd);
var arr = coords.split(COLON);
if (arr.length > 2 && arr.length < 6) {
result.add(arr[0]);
}
}
return null;
return result;
}

private void addDependencies(final Model pom, List<String> dependencies, boolean test) {
Expand Down Expand Up @@ -2543,8 +2550,8 @@ private void generatePlatformDescriptorModule(ArtifactCoords descriptorCoords, M
if (member != null) {
// Update last-bom-update
var lastUpdatedBom = member.latestBomRelease();
pom.getProperties().setProperty(MEMBER_LAST_BOM_UPDATE_PROP, lastUpdatedBom.getGroupId() + ":"
+ lastUpdatedBom.getArtifactId() + ":" + lastUpdatedBom.getVersion());
pom.getProperties().setProperty(MEMBER_LAST_BOM_UPDATE_PROP, lastUpdatedBom.getGroupId() + COLON
+ lastUpdatedBom.getArtifactId() + COLON + lastUpdatedBom.getVersion());
if (overrides == null) {
overrides = CatalogMapperHelper.mapper().createObjectNode();
}
Expand Down Expand Up @@ -3165,15 +3172,6 @@ public String getVersionProperty() {
if (versionProperty == null) {
final Artifact quarkusBom = quarkusCore.getInputBom();
versionProperty = getTestArtifactVersion(quarkusBom.getGroupId(), quarkusBom.getVersion());
if (versionProperty.equals(quarkusBom.getVersion())) {
final String ga = quarkusBom.getGroupId() + ":" + quarkusBom.getArtifactId() + ":";
for (String l : pomLines()) {
if (l.startsWith(ga)) {
versionProperty = ArtifactCoords.fromString(l).getVersion();
break;
}
}
}
}
return versionProperty;
}
Expand Down

0 comments on commit 0bb96d5

Please sign in to comment.