From 441585a35c3e00b949a1d5a7661cae30d976eb53 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 29 Jun 2023 16:52:04 -0400 Subject: [PATCH 01/11] Bump plantuml dependency (#717) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65b8a4f4..82f7bccb 100644 --- a/pom.xml +++ b/pom.xml @@ -285,7 +285,7 @@ net.sourceforge.plantuml plantuml-mit - 1.2023.8 + 1.2023.9 From f6b53e6db7b44062ad9790d4a57c83d74ec48b25 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 30 Jun 2023 15:34:33 +1000 Subject: [PATCH 02/11] Fix bug in THO release process? --- .../main/java/org/hl7/fhir/igtools/web/PublicationProcess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2657b024..7ade4d1d 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"); From c10949e3f47b04fc87c3f3b9b42257bb360229c1 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 30 Jun 2023 15:34:38 +1000 Subject: [PATCH 03/11] Fix bug in THO release process? --- .../java/org/hl7/fhir/igtools/web/WebSourceProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6148f111..1c7ba1ad 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"); From db9677c517e7c8946d11250cf19a37a1f8ca51db Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 30 Jun 2023 15:56:18 +1000 Subject: [PATCH 04/11] update core --- RELEASE_NOTES.md | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e69de29b..aa9100c7 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -0,0 +1,2 @@ +* Fix for SPDX not-open-source in code +* Fix bug in THO release process? diff --git a/pom.xml b/pom.xml index 65b8a4f4..d93daee6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.3.21-SNAPSHOT - 6.0.18 + 6.0.19 3.0.0-M5 5.2.1 4.10.0 From 25e063d7eeef0061f35788c34df3b708fbbd5fe9 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 30 Jun 2023 06:02:03 +0000 Subject: [PATCH 05/11] Release: v1.3.21 * Fix for SPDX not-open-source in code * Fix bug in THO release process? ***NO_CI*** --- org.hl7.fhir.publisher.cli/pom.xml | 2 +- org.hl7.fhir.publisher.core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml index 68d3b0b7..fc7bfcfc 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.21 ../pom.xml 4.0.0 diff --git a/org.hl7.fhir.publisher.core/pom.xml b/org.hl7.fhir.publisher.core/pom.xml index ecf482c8..ebecc1b6 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.21 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ae62582e..b8dbab4f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ - 1.3.21-SNAPSHOT + 1.3.21 6.0.19 From 0d94614acd9b9c01b912e4d184a75d557173a7c5 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 30 Jun 2023 06:14:07 +0000 Subject: [PATCH 06/11] Updating version to: 1.3.22-SNAPSHOT --- RELEASE_NOTES.md | 2 -- org.hl7.fhir.publisher.cli/pom.xml | 2 +- org.hl7.fhir.publisher.core/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index aa9100c7..e69de29b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,2 +0,0 @@ -* Fix for SPDX not-open-source in code -* Fix bug in THO release process? diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml index fc7bfcfc..3984a242 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 + 1.3.22-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 ebecc1b6..1aeea3b2 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 + 1.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index b8dbab4f..f332ee66 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ - 1.3.21 + 1.3.22-SNAPSHOT 6.0.19 From dd942250f474d99dab8301136b6589577955a7e6 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 30 Jun 2023 16:32:15 +1000 Subject: [PATCH 07/11] remove fixmes --- .../main/java/org/hl7/fhir/igtools/publisher/Publisher.java | 4 ---- .../fhir/igtools/publisher/SuppressedMessageInformation.java | 3 --- 2 files changed, 7 deletions(-) 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 bf469248..3655f468 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 49399b5f..d23bf69f 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++; } From a4c47e804354d83bf3b984c7cdfa93ea15256a15 Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Fri, 30 Jun 2023 23:23:33 +0000 Subject: [PATCH 08/11] Updating core library dependency to v6.0.20 ***NO_CI*** --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f332ee66..eab57249 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.3.22-SNAPSHOT - 6.0.19 + 6.0.20 3.0.0-M5 5.2.1 4.10.0 From b3460db8505c3d896cacde7e93b81d12ec43faa9 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 1 Jul 2023 09:36:13 +1000 Subject: [PATCH 09/11] release notes --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e69de29b..11f08464 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -0,0 +1,3 @@ +* Fix for SPDX not-open-source in code +* Fix bug in THO release process? +* Fix bug in template package installation From ea50516d7440045b42ab9259264e4e7ec67b4081 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 30 Jun 2023 23:42:18 +0000 Subject: [PATCH 10/11] Release: v1.3.22 * Fix for SPDX not-open-source in code * Fix bug in THO release process? * Fix bug in template package installation ***NO_CI*** --- org.hl7.fhir.publisher.cli/pom.xml | 2 +- org.hl7.fhir.publisher.core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml index 3984a242..3eec941e 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.22-SNAPSHOT + 1.3.22 ../pom.xml 4.0.0 diff --git a/org.hl7.fhir.publisher.core/pom.xml b/org.hl7.fhir.publisher.core/pom.xml index 1aeea3b2..2fddce5d 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.22-SNAPSHOT + 1.3.22 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index eab57249..ff929df0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ - 1.3.22-SNAPSHOT + 1.3.22 6.0.20 From c8f7b59f1dd8765e6efca3eeb476081ebad5503c Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 30 Jun 2023 23:54:54 +0000 Subject: [PATCH 11/11] Updating version to: 1.3.23-SNAPSHOT --- RELEASE_NOTES.md | 3 --- org.hl7.fhir.publisher.cli/pom.xml | 2 +- org.hl7.fhir.publisher.core/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 11f08464..e69de29b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +0,0 @@ -* Fix for SPDX not-open-source in code -* Fix bug in THO release process? -* Fix bug in template package installation diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml index 3eec941e..eb28d915 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.22 + 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 2fddce5d..851c5289 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.22 + 1.3.23-SNAPSHOT ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ff929df0..208639c2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ - 1.3.22 + 1.3.23-SNAPSHOT 6.0.20