(daffodil-sbt) branch flowerpress created (now 5a8da2c)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jadams-tresys pushed a change to branch flowerpress
in repository https://gitbox.apache.org/repos/asf/daffodil-sbt.git


      at 5a8da2c  !fixup

This branch includes the following new commits:

     new 5a8da2c  !fixup

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(daffodil-sbt) 01/01: !fixup

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jadams-tresys pushed a commit to branch flowerpress
in repository https://gitbox.apache.org/repos/asf/daffodil-sbt.git

commit 5a8da2c84f7572bbfd6fd48d8db8e7a11b24952c
Author: Josh Adams <ja...@owlcyberdefense.com>
AuthorDate: Sat May 23 20:12:12 2026 -0400

    !fixup
    
    Actually fix windows issues
---
 VERSION                                                 | 2 +-
 src/main/scala/org/apache/daffodil/DaffodilPlugin.scala | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index bd8bf88..c4954f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.0
+1.8.0-SNAPSHOT
diff --git a/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala b/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
index a3f8a35..ef4e123 100644
--- a/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
+++ b/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
@@ -676,14 +676,14 @@ object DaffodilPlugin extends AutoPlugin {
       val classLoader = new URLClassLoader((resourceDirURLs ++ allClasspathURLs).toArray)
 
       val referenceRegexes = daffodilFlattenResourceReferencePatterns.value
-      val jarRegex = "(.*/(.*).jar)!(.*)".r
+      val jarRegex = "jar:file:(.*/(.*).jar)!(.*)".r
       val jarFileSystems = scala.collection.mutable.Map[String, FileSystem]()
 
       def getRootPath(path: URI) = {
         path.getScheme match {
           case "file" => {
             (Compile / resourceDirectories).value
-              .find(dir => path.getPath.startsWith(dir.getPath))
+              .find(dir => Paths.get(path).startsWith(dir.getPath))
               .get
               .toPath
           }
@@ -711,7 +711,7 @@ object DaffodilPlugin extends AutoPlugin {
             contextURI.toString match {
               case jarRegex(jarPath, jarName, path) => {
                 val fs = jarFileSystems.getOrElseUpdate(
-                  Paths.get(jarPath).toString,
+                  jarPath.replaceAll("/+", "/"),
                   FileSystems.newFileSystem(contextURI, new java.util.HashMap[String, Any]())
                 )
                 val cPath = fs.getPath(path)
@@ -733,7 +733,7 @@ object DaffodilPlugin extends AutoPlugin {
               path,
               Paths.get(
                 flatDir.toString,
-                root.relativize(path).toString.replaceAll("/", "__")
+                root.relativize(path).toString.replaceAllLiterally(File.separator, "__")
               )
             )
           }