From 665b2adb6c1adb6c40cae3bc5bda86682abe513a Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 5 Jul 2023 07:22:19 +1000 Subject: [PATCH 1/2] #715 fix confluence link --- .../src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3655f468..22211672 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 @@ -11365,7 +11365,7 @@ public static void main(String[] args) throws Exception { System.out.println("the publisher also supports the param -proxy=[address]:[port] for if you use a proxy (stupid java won't pick up the system settings)"); System.out.println("or you can configure the proxy using -Dhttp.proxyHost= -Dhttp.proxyPort= -Dhttps.proxyHost= -Dhttps.proxyPort="); System.out.println(""); - System.out.println("For additional information, see http://wiki.hl7.org/index.php?title=Proposed_new_FHIR_IG_build_Process"); + System.out.println("For additional information, see https://confluence.hl7.org/display/FHIR/IG+Publisher+Documentation"); } else if (hasNamedParam(args, "-convert")) { // convert a igpack.zip to a package.tgz IGPack2NpmConvertor conv = new IGPack2NpmConvertor(); From e4bc8e101cd6f60a3690e7b439a747c63c8d92f0 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 6 Jul 2023 23:12:55 +1000 Subject: [PATCH 2/2] fix issue with relative path --- .../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 7ade4d1d..916e8ccd 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(relDest == null ? "package-list.json" : Utilities.path(relDest,"package-list.json")); + src.needOptionalFile(Utilities.noString(relDest) ? "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");