Merge branch 'master' into do-20230629-test-exec-with-ig

HL7 · Jul 4, 2023 · 4f710d4 · 4f710d4
2 parents 5d9231a + c8f7b59
commit 4f710d4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.hl7.fhir.publisher</artifactId>
         <groupId>org.hl7.fhir.publisher</groupId>
-        <version>1.3.21-SNAPSHOT</version>
+        <version>1.3.23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/org.hl7.fhir.publisher.core/pom.xml b/org.hl7.fhir.publisher.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hl7.fhir.publisher</groupId>
         <artifactId>org.hl7.fhir.publisher</artifactId>
-        <version>1.3.21-SNAPSHOT</version>
+        <version>1.3.23-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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
@@ -4236,10 +4236,6 @@ private boolean checkMakeFile(byte[] bs, String path, Set<String> 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/...isher.core/src/main/java/org/hl7/fhir/igtools/publisher/SuppressedMessageInformation.java b/...isher.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
@@ -295,7 +295,7 @@ public List<ValidationMessage> 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
@@ -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<String> 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<String> 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
@@ -21,10 +21,10 @@
 <!--        <version>5.3.14</version>-->
 <!--    </parent>-->
 
-    <version>1.3.21-SNAPSHOT</version> <!-- See the note above -->
+    <version>1.3.23-SNAPSHOT</version> <!-- See the note above -->
 
     <properties>
-        <core_version>6.0.18</core_version>
+        <core_version>6.0.20</core_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>
         <apache_poi_version>5.2.1</apache_poi_version>
         <okhttp.version>4.10.0</okhttp.version>
@@ -285,7 +285,7 @@
         <dependency>
           <groupId>net.sourceforge.plantuml</groupId>
           <artifactId>plantuml-mit</artifactId>
-          <version>1.2023.8</version>
+          <version>1.2023.9</version>
         </dependency>
     </dependencies>