From 85f2c8fd7b7bf0ef546875a7e3d0e502226369b1 Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Thu, 19 Oct 2023 09:55:40 -0400
Subject: [PATCH] Updated version to 1.7.5-SNAPSHOT. WIP fix for new Gradle
 maven-metadata.xml layout.

---
 .../bld/dependencies/Xml2MavenMetadata.java   | 23 +++++++++++--------
 src/main/resources/BLD_VERSION                |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java b/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
index 3a21b0c..e94a36a 100644
--- a/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
+++ b/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
@@ -25,6 +25,7 @@ public class Xml2MavenMetadata extends Xml2Data implements MavenMetadata {
 
     private StringBuilder characterData_ = null;
 
+    private boolean isSnapshot_ = false;
     private String snapshotTimestamp_ = 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 "timestamp" -> snapshotTimestamp_ = characterData_.toString();
             case "buildNumber" -> snapshotBuildNumber_ = Integer.parseInt(characterData_.toString());
-            case "snapshot" -> {
-                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);
-                }
-            }
+            case "snapshot" -> isSnapshot_ = true;
         }
 
         characterData_ = null;
@@ -88,6 +80,17 @@ public class Xml2MavenMetadata extends Xml2Data implements MavenMetadata {
 
     public void endDocument()
     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
         var filtered_versions = new TreeSet<>(versions_.stream()
                 .filter(v -> {
diff --git a/src/main/resources/BLD_VERSION b/src/main/resources/BLD_VERSION
index 3511591..fc42daf 100644
--- a/src/main/resources/BLD_VERSION
+++ b/src/main/resources/BLD_VERSION
@@ -1 +1 @@
-1.7.4
\ No newline at end of file
+1.7.5-SNAPSHOT
\ No newline at end of file