rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 08:17:11 -07:00
Code Activity

Updated version to 1.7.5-SNAPSHOT.

Browse source 
WIP fix for new Gradle maven-metadata.xml layout.
This commit is contained in:
Geert Bevin 2023-10-19 09:55:40 -04:00
parent 1a243efb66
commit 85f2c8fd7b
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
View file

@ -25,6 +25,7 @@ public class Xml2MavenMetadata extends Xml2Data implements MavenMetadata {
private StringBuilder characterData_ = null; private StringBuilder characterData_ = null;
private boolean isSnapshot_ = false;
private String snapshotTimestamp_ = null; private String snapshotTimestamp_ = null;
private Integer snapshotBuildNumber_ = null; private Integer snapshotBuildNumber_ = null;
@ -67,16 +68,7 @@ public class Xml2MavenMetadata extends Xml2Data implements MavenMetadata {
case "version" -> versions_.add(VersionNumber.parse(characterData_.toString())); case "version" -> versions_.add(VersionNumber.parse(characterData_.toString()));
case "timestamp" -> snapshotTimestamp_ = characterData_.toString(); case "timestamp" -> snapshotTimestamp_ = characterData_.toString();
case "buildNumber" -> snapshotBuildNumber_ = Integer.parseInt(characterData_.toString()); case "buildNumber" -> snapshotBuildNumber_ = Integer.parseInt(characterData_.toString());
case "snapshot" -> { case "snapshot" -> isSnapshot_ = true;
if (!versions_.isEmpty()) {
var version = versions_.get(0);
var qualifier = VersionNumber.SNAPSHOT_QUALIFIER;
if (snapshotTimestamp_ != null && snapshotBuildNumber_ != null) {
qualifier = snapshotTimestamp_ + "-" + snapshotBuildNumber_;
}
snapshot_ = new VersionNumber(version.major(), version.minor(), version.revision(), qualifier);
}
}
} }
characterData_ = null; characterData_ = null;
@ -88,6 +80,17 @@ public class Xml2MavenMetadata extends Xml2Data implements MavenMetadata {
public void endDocument() public void endDocument()
throws SAXException { throws SAXException {
if (isSnapshot_) {
if (!versions_.isEmpty()) {
var version = versions_.get(0);
var qualifier = VersionNumber.SNAPSHOT_QUALIFIER;
if (snapshotTimestamp_ != null && snapshotBuildNumber_ != null) {
qualifier = snapshotTimestamp_ + "-" + snapshotBuildNumber_;
}
snapshot_ = new VersionNumber(version.major(), version.minor(), version.revision(), qualifier);
}
}
// determine latest stable version by removing pre-release qualifiers // determine latest stable version by removing pre-release qualifiers
var filtered_versions = new TreeSet<>(versions_.stream() var filtered_versions = new TreeSet<>(versions_.stream()
.filter(v -> { .filter(v -> {

2
src/main/resources/BLD_VERSION
View file

@ -1 +1 @@
1.7.4 1.7.5-SNAPSHOT