Merge branch 'hapifhir:master' into master

hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java

@@ -48,10 +48,10 @@ public class MdmLinkExpandSvc implements IMdmLinkExpandSvc {
 	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private IMdmLinkDao myMdmLinkDao;
+	IMdmLinkDao myMdmLinkDao;
 
 	@Autowired
-	private IIdHelperService myIdHelperService;
+	IIdHelperService myIdHelperService;
 
 	public MdmLinkExpandSvc() {}
 

hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvcTest.java

@@ -8,6 +8,7 @@ import ca.uhn.fhir.mdm.dao.IMdmLinkDao;
 import ca.uhn.fhir.mdm.model.MdmPidTuple;
 import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId;
 import jakarta.annotation.Nonnull;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -57,6 +58,13 @@ class MdmLinkExpandSvcTest {
 	@InjectMocks
 	private MdmLinkExpandSvc mySubject;
 
+	@BeforeEach
+	public void beforeEach() {
+		mySubject.myMdmLinkDao = myIMdmLinkDao;
+		mySubject.myIdHelperService = myIdHelperService;
+	}
+
+
 	void beforeEachExpand() {
 		final Answer<Set<String>> answer = invocation -> {
 			final Set<IResourcePersistentId<?>> param = invocation.getArgument(0);

snapshot-pipeline.yml

@@ -47,6 +47,8 @@ steps:
 
   # 3. Import keys into gpg
   - bash: |
+      apt update
+      apt install -y gpg
       gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/public.key
       gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/private.key
       gpg --list-keys --keyid-format LONG