From 35504dc460a3f76731ca0e3cd666e2a32bff9965 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 1 Nov 2023 09:37:41 -0400 Subject: [PATCH] Use https for primary packages server (#1476) * Use https for primary packages server * Fix okToUsePackageServer --- .../org/hl7/fhir/utilities/npm/BasePackageCacheManager.java | 2 +- .../src/main/java/org/hl7/fhir/utilities/npm/PackageServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/BasePackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/BasePackageCacheManager.java index 5afafcf2d..659e478db 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/BasePackageCacheManager.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/BasePackageCacheManager.java @@ -95,7 +95,7 @@ public abstract class BasePackageCacheManager implements IPackageCacheManager { // this is not a long term thing, but it's not clear how to release patches for // 1.4.0 private boolean okToUsePackageServer(String server, String id) { - if ("http://packages.fhir.org".equals(server) && "hl7.fhir.r2b.core".equals(id)) { + if (PackageServer.PRIMARY_SERVER.equals(server) && "hl7.fhir.r2b.core".equals(id)) { return false; } return true; diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageServer.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageServer.java index 6afd7df89..22b1143c4 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageServer.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageServer.java @@ -46,7 +46,7 @@ public class PackageServer { return url; } - public static final String PRIMARY_SERVER = "http://packages.fhir.org"; + public static final String PRIMARY_SERVER = "https://packages.fhir.org"; public static final String SECONDARY_SERVER = "https://packages2.fhir.org/packages"; public static PackageServer primaryServer() {