diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml index 64e0a24dc..4ae7bb32f 100644 --- a/org.hl7.fhir.publisher.cli/pom.xml +++ b/org.hl7.fhir.publisher.cli/pom.xml @@ -5,7 +5,7 @@ org.hl7.fhir.publisher org.hl7.fhir.publisher - 1.3.21-SNAPSHOT + 1.3.23-SNAPSHOT ../pom.xml 4.0.0 diff --git a/org.hl7.fhir.publisher.core/pom.xml b/org.hl7.fhir.publisher.core/pom.xml index ecf482c89..851c52899 100644 --- a/org.hl7.fhir.publisher.core/pom.xml +++ b/org.hl7.fhir.publisher.core/pom.xml @@ -5,7 +5,7 @@ org.hl7.fhir.publisher org.hl7.fhir.publisher - 1.3.21-SNAPSHOT + 1.3.23-SNAPSHOT ../pom.xml 4.0.0 diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java index bf4692489..3655f468c 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java @@ -4236,10 +4236,6 @@ private boolean checkMakeFile(byte[] bs, String path, Set outputTracker) if (allOutputs.contains(s)) throw new Error("Error generating build: the file "+path+" is being generated more than once (may differ by case)"); allOutputs.add(s); - - if (path.contains(":")) { - System.out.println("!"); - } outputTracker.add(path); File f = new CSFile(path); byte[] existing = null; diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SuppressedMessageInformation.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SuppressedMessageInformation.java index 49399b5fa..d23bf69f6 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SuppressedMessageInformation.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SuppressedMessageInformation.java @@ -50,9 +50,6 @@ public String getMessageRaw() { } public void use() { - if (messageRaw.contains("C57134")) { - System.out.println("!"); // #FIXME - } useCount++; } diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/PublicationProcess.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/PublicationProcess.java index 2657b0245..7ade4d1dd 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/PublicationProcess.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/PublicationProcess.java @@ -295,7 +295,7 @@ public List publishInner2(String source, String web, String d PublicationProcessMode mode = PublicationProcessMode.fromCode(prSrc.asString("mode")); boolean first = prSrc.asBoolean("first"); - src.needOptionalFile(Utilities.path(relDest,"package-list.json")); + src.needOptionalFile(relDest == null ? "package-list.json" : Utilities.path(relDest,"package-list.json")); if (first) { if (new File(Utilities.path(destination, "package-list.json")).exists()) { check(res, false, "Package List already exists, but the publication request says this is the first publication"); diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/WebSourceProvider.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/WebSourceProvider.java index 6148f111c..1c7ba1ad5 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/WebSourceProvider.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/WebSourceProvider.java @@ -137,7 +137,7 @@ private String stats(long length, long t) { } public void cleanFolder(String path) throws IOException { - File df = new File(Utilities.path(destination, path)); + File df = new File(path == null ? destination : Utilities.path(destination, path)); if (web) { Path target = Path.of(df.getAbsolutePath()); @@ -193,7 +193,7 @@ public void finish(String existingFilesBase, List existingFiles) throws if (web) { StringBuilder b = new StringBuilder(); for (String s : existingFiles) { - b.append(Utilities.path(existingFilesBase, s)); + b.append(existingFilesBase == null ? s : Utilities.path(existingFilesBase, s)); b.append("\r\n"); } TextFile.stringToFile(b.toString(), deleteFileName()); @@ -214,7 +214,7 @@ public void finish(String existingFilesBase, List existingFiles) throws for (String s : existingFiles) { count++; lineLength = doProgressNote(s, count, start, existingFiles.size(), lineLength); - ftp.delete(Utilities.path(existingFilesBase, s)); + ftp.delete(existingFilesBase == null ? s : Utilities.path(existingFilesBase, s)); } } System.out.println("Uploading"); diff --git a/pom.xml b/pom.xml index 65b8a4f49..208639c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - 1.3.21-SNAPSHOT + 1.3.23-SNAPSHOT - 6.0.18 + 6.0.20 3.0.0-M5 5.2.1 4.10.0 @@ -285,7 +285,7 @@ net.sourceforge.plantuml plantuml-mit - 1.2023.8 + 1.2023.9