Skip to content

Commit

Permalink
upgrade dependencies, fix publish github actions, use List.of instead…
Browse files Browse the repository at this point in the history
… of Arrays.asList
  • Loading branch information
wetret committed May 27, 2024
1 parent 5a25816 commit 538447b
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
pull_request:
types: [closed]
branches: [develop]
release:
types: [published]

jobs:
publish:
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<compileSource>17</compileSource>
<compileTarget>17</compileTarget>

<dsf.version>1.5.0</dsf.version>
<dsf.version>1.5.1</dsf.version>
<testSetup.location>../mii-processes-test-setup</testSetup.location>
</properties>

Expand Down Expand Up @@ -45,13 +45,13 @@
<dependency>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-processes-common</artifactId>
<version>1.0.1.0-SNAPSHOT</version>
<version>1.0.1.0</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.12</version>
<version>2.0.13</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -82,7 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<source>${compileSource}</source>
<target>${compileTarget}</target>
Expand All @@ -96,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifest>
Expand All @@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -214,12 +214,12 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.3.1</version>
<version>4.8.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.2</version>
<version>3.22.0</version>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package de.medizininformatik_initiative.process.data_transfer;

import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -72,9 +71,8 @@ public Map<String, List<String>> getFhirResourcesByProcessId()

return Map.of( //
ConstantsDataTransfer.PROCESS_NAME_FULL_DATA_RECEIVE, //
Arrays.asList(aReceive, cCrypto, cDaSeSt, cDaTr, eDaSeStEr, nPrId, sSend, vCrypto, vDaSeStRe, vDaTr), //
List.of(aReceive, cCrypto, cDaSeSt, cDaTr, eDaSeStEr, nPrId, sSend, vCrypto, vDaSeStRe, vDaTr), //
ConstantsDataTransfer.PROCESS_NAME_FULL_DATA_SEND, //
Arrays.asList(aSend, cDaSeSt, cDaTr, eDaSeStEr, nPrId, sStatus, sSendStart, tSendStart, vDaSeStSe,
vDaTr));
List.of(aSend, cDaSeSt, cDaTr, eDaSeStEr, nPrId, sStatus, sSendStart, tSendStart, vDaSeStSe, vDaTr));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.junit.Assert.assertTrue;

import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;

import org.hl7.fhir.r4.model.ActivityDefinition;
import org.junit.ClassRule;
Expand All @@ -28,7 +28,7 @@ public class ActivityDefinitionProfileTest
@ClassRule
public static final ValidationSupportRule validationRule = new ValidationSupportRule(
DataTransferProcessPluginDefinition.VERSION, DataTransferProcessPluginDefinition.RELEASE_DATE,
Arrays.asList("dsf-activity-definition-1.0.0.xml", "dsf-extension-process-authorization-1.0.0.xml",
List.of("dsf-activity-definition-1.0.0.xml", "dsf-extension-process-authorization-1.0.0.xml",
"dsf-extension-process-authorization-organization-1.0.0.xml",
"dsf-extension-process-authorization-organization-practitioner-1.0.0.xml",
"dsf-extension-process-authorization-parent-organization-role-1.0.0.xml",
Expand All @@ -43,9 +43,9 @@ public class ActivityDefinitionProfileTest
"dsf-coding-process-authorization-remote-all-1.0.0.xml",
"dsf-coding-process-authorization-remote-parent-organization-role-1.0.0.xml",
"dsf-coding-process-authorization-remote-organization-1.0.0.xml"),
Arrays.asList("dsf-organization-role-1.0.0.xml", "dsf-practitioner-role-1.0.0.xml",
List.of("dsf-organization-role-1.0.0.xml", "dsf-practitioner-role-1.0.0.xml",
"dsf-process-authorization-1.0.0.xml", "dsf-read-access-tag-1.0.0.xml"),
Arrays.asList("dsf-organization-role-1.0.0.xml", "dsf-practitioner-role-1.0.0.xml",
List.of("dsf-organization-role-1.0.0.xml", "dsf-practitioner-role-1.0.0.xml",
"dsf-process-authorization-recipient-1.0.0.xml", "dsf-process-authorization-requester-1.0.0.xml",
"dsf-read-access-tag-1.0.0.xml"));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import static org.junit.Assert.assertEquals;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;

import org.hl7.fhir.r4.model.Identifier;
Expand Down Expand Up @@ -38,11 +38,11 @@ public class TaskProfileTest
@ClassRule
public static final ValidationSupportRule validationRule = new ValidationSupportRule(def.getResourceVersion(),
def.getResourceReleaseDate(),
Arrays.asList("dsf-task-base-1.0.0.xml", "extension-data-set-status-error.xml", "task-data-send-start.xml",
List.of("dsf-task-base-1.0.0.xml", "extension-data-set-status-error.xml", "task-data-send-start.xml",
"task-data-send.xml", "task-data-status.xml"),
Arrays.asList("dsf-read-access-tag-1.0.0.xml", "dsf-bpmn-message-1.0.0.xml", "data-transfer.xml",
List.of("dsf-read-access-tag-1.0.0.xml", "dsf-bpmn-message-1.0.0.xml", "data-transfer.xml",
"mii-cryptography.xml", "mii-data-set-status.xml"),
Arrays.asList("dsf-read-access-tag-1.0.0.xml", "dsf-bpmn-message-1.0.0.xml", "data-transfer.xml",
List.of("dsf-read-access-tag-1.0.0.xml", "dsf-bpmn-message-1.0.0.xml", "data-transfer.xml",
"mii-cryptography.xml", "mii-data-set-status-receive.xml", "mii-data-set-status-send.xml"));

private final ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
Expand Down

0 comments on commit 538447b

Please sign in to comment.