From 439217d1d122eca5910f4fb9274dbc5e97aee3ec Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 10 Feb 2025 20:53:49 +0100 Subject: [PATCH 01/38] Adds :exact modifier to usage of Subscription.criteria search parameter Fixes #272 for DSF 2.0 --- .../main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java | 4 ++-- .../dsf/fhir/authorization/SubscriptionAuthorizationRule.java | 2 +- .../dsf-bpmn-questionnaire-response-subscription.xml.post | 2 +- .../fhir/Subscription/dsf-bpmn-task-subscription.xml.post | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java index 7be0cfd35..d1e0adcfe 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java @@ -110,11 +110,11 @@ public class PropertiesConfig implements InitializingBean private boolean webserviceClientLocalVerbose; @Documentation(description = "Subscription to receive notifications about task resources from the DSF FHIR server") - @Value("${dev.dsf.bpe.fhir.task.subscription.search.parameter:?criteria=Task%3Fstatus%3Drequested&status=active&type=websocket&payload=application/fhir%2Bjson}") + @Value("${dev.dsf.bpe.fhir.task.subscription.search.parameter:?criteria:exact=Task%3Fstatus%3Drequested&status=active&type=websocket&payload=application/fhir%2Bjson}") private String taskSubscriptionSearchParameter; @Documentation(description = "Subscription to receive notifications about questionnaire response resources from the DSF FHIR server") - @Value("${dev.dsf.bpe.fhir.questionnaire.response.subscription.search.parameter:?criteria=QuestionnaireResponse%3Fstatus%3Dcompleted&status=active&type=websocket&payload=application/fhir%2Bjson}") + @Value("${dev.dsf.bpe.fhir.questionnaire.response.subscription.search.parameter:?criteria:exact=QuestionnaireResponse%3Fstatus%3Dcompleted&status=active&type=websocket&payload=application/fhir%2Bjson}") private String questionnaireResponseSubscriptionSearchParameter; @Documentation(description = "Number of retries until a websocket connection can be established with the DSF FHIR server, `-1` means infinite number of retries") diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java index c1e1c978f..66651cd68 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java @@ -128,7 +128,7 @@ private Optional newResourceOk(Connection connection, Subscription newRe @Override protected boolean resourceExists(Connection connection, Subscription newResource) { - Map> queryParameters = Map.of("criteria", + Map> queryParameters = Map.of("criteria:exact", Collections.singletonList(newResource.getCriteria()), "type", Collections.singletonList(newResource.getChannel().getType().toCode()), "payload", Collections.singletonList(newResource.getChannel().getPayload())); diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-questionnaire-response-subscription.xml.post b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-questionnaire-response-subscription.xml.post index e305c959b..5bd7dd61b 100644 --- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-questionnaire-response-subscription.xml.post +++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-questionnaire-response-subscription.xml.post @@ -1 +1 @@ -criteria=QuestionnaireResponse%3Fstatus%3Dcompleted&status=active&type=websocket&payload=application/fhir%2Bjson \ No newline at end of file +criteria:exact=QuestionnaireResponse%3Fstatus%3Dcompleted&status=active&type=websocket&payload=application/fhir%2Bjson \ No newline at end of file diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-task-subscription.xml.post b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-task-subscription.xml.post index 44827415c..8102916d3 100644 --- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-task-subscription.xml.post +++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/Subscription/dsf-bpmn-task-subscription.xml.post @@ -1 +1 @@ -criteria=Task%3Fstatus%3Drequested&status=active&type=websocket&payload=application/fhir%2Bjson \ No newline at end of file +criteria:exact=Task%3Fstatus%3Drequested&status=active&type=websocket&payload=application/fhir%2Bjson \ No newline at end of file From 82cad09d13f3fa993bce7d90971b26e1b4da0639 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 17 Feb 2025 00:53:58 +0100 Subject: [PATCH 02/38] fixed handling of channel.payload in auth rule and db unique function Fixes additional issue of #272 for DSF 2.0 --- .../SubscriptionAuthorizationRule.java | 23 +--- .../dev/dsf/fhir/dao/SubscriptionDao.java | 3 + .../fhir/dao/jdbc/SubscriptionDaoJdbc.java | 24 ++++ .../subscriptions_unique.sql | 5 +- .../ParallelCreateIntegrationTest.java | 118 +++++++++++++++--- .../SubscriptionIntegrationTest.java | 29 +++++ 6 files changed, 162 insertions(+), 40 deletions(-) diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java index 66651cd68..73b40c855 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/SubscriptionAuthorizationRule.java @@ -3,9 +3,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -25,7 +23,6 @@ import dev.dsf.fhir.dao.provider.DaoProvider; import dev.dsf.fhir.help.ParameterConverter; import dev.dsf.fhir.search.PageAndCount; -import dev.dsf.fhir.search.PartialResult; import dev.dsf.fhir.search.SearchQuery; import dev.dsf.fhir.search.SearchQueryParameterError; import dev.dsf.fhir.service.ReferenceResolver; @@ -128,26 +125,10 @@ private Optional newResourceOk(Connection connection, Subscription newRe @Override protected boolean resourceExists(Connection connection, Subscription newResource) { - Map> queryParameters = Map.of("criteria:exact", - Collections.singletonList(newResource.getCriteria()), "type", - Collections.singletonList(newResource.getChannel().getType().toCode()), "payload", - Collections.singletonList(newResource.getChannel().getPayload())); - SubscriptionDao dao = getDao(); - SearchQuery query = dao.createSearchQueryWithoutUserFilter(PageAndCount.exists()) - .configureParameters(queryParameters); - - List uQp = query.getUnsupportedQueryParameters(); - if (!uQp.isEmpty()) - { - logger.warn("Unable to search for Subscription: Unsupported query parameters: {}", uQp); - - throw new IllegalStateException("Unable to search for Subscription: Unsupported query parameters"); - } - try { - PartialResult result = dao.searchWithTransaction(connection, query); - return result.getTotal() >= 1; + return getDao().existsByCriteriaChannelTypeAndChannelPayload(newResource.getCriteria(), + newResource.getChannel().getType().toCode(), newResource.getChannel().getPayload()); } catch (SQLException e) { diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/SubscriptionDao.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/SubscriptionDao.java index 9bfa023f4..c7029299a 100755 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/SubscriptionDao.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/SubscriptionDao.java @@ -9,4 +9,7 @@ public interface SubscriptionDao extends ResourceDao { List readByStatus(SubscriptionStatus status) throws SQLException; + + boolean existsByCriteriaChannelTypeAndChannelPayload(String criteria, String channelType, String channelPayload) + throws SQLException; } diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/jdbc/SubscriptionDaoJdbc.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/jdbc/SubscriptionDaoJdbc.java index 641a872d0..0a561f9d3 100755 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/jdbc/SubscriptionDaoJdbc.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/jdbc/SubscriptionDaoJdbc.java @@ -66,4 +66,28 @@ public List readByStatus(Subscription.SubscriptionStatus status) t } } } + + @Override + public boolean existsByCriteriaChannelTypeAndChannelPayload(String criteria, String channelType, + String channelPayload) throws SQLException + { + try (Connection connection = getDataSource().getConnection(); + PreparedStatement statement = connection + .prepareStatement("SELECT count(*) FROM current_subscriptions WHERE " + + "subscription->>'criteria' = ? AND subscription->'channel'->>'type' = ? AND " + + (channelPayload == null ? "NOT subscription->'channel' ?? 'payload'" + : "subscription->'channel'->>'payload' = ?"))) + { + statement.setString(1, criteria); + statement.setString(2, channelType); + + if (channelPayload != null) + statement.setString(3, channelPayload); + + try (ResultSet result = statement.executeQuery()) + { + return result.next() && result.getInt(1) > 0; + } + } + } } diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/db/unique_trigger_functions/subscriptions_unique.sql b/dsf-fhir/dsf-fhir-server/src/main/resources/db/unique_trigger_functions/subscriptions_unique.sql index 95b391275..8f967bd56 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/db/unique_trigger_functions/subscriptions_unique.sql +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/db/unique_trigger_functions/subscriptions_unique.sql @@ -1,10 +1,11 @@ CREATE OR REPLACE FUNCTION subscriptions_unique() RETURNS TRIGGER AS $$ BEGIN - PERFORM pg_advisory_xact_lock(hashtext((NEW.subscription->>'criteria') || (NEW.subscription->'channel'->>'type') || (NEW.subscription->'channel'->>'payload'))); + PERFORM pg_advisory_xact_lock(hashtext((NEW.subscription->>'criteria') || (NEW.subscription->'channel'->>'type'))); IF EXISTS (SELECT 1 FROM current_subscriptions WHERE subscription_id <> NEW.subscription_id AND subscription->>'criteria' = NEW.subscription->>'criteria' AND subscription->'channel'->>'type' = NEW.subscription->'channel'->>'type' - AND subscription->'channel'->>'payload' = NEW.subscription->'channel'->>'payload') THEN + AND ((subscription->'channel'->>'payload' = NEW.subscription->'channel'->>'payload') + OR (NOT subscription->'channel' ? 'payload' AND NOT NEW.subscription->'channel' ? 'payload'))) THEN RAISE EXCEPTION 'Conflict: Not inserting Subscription with criteria %, channel.type % and channel.payload %, resource already exists with given criteria, channel type and channel payload', NEW.subscription->>'criteria', NEW.subscription->'channel'->>'type', NEW.subscription->'channel'->>'payload' USING ERRCODE = 'unique_violation'; ELSE diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java index 0574bfedb..fa59828d1 100644 --- a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java +++ b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java @@ -311,17 +311,33 @@ public void testCreateDuplicateStructureDefinitionsViaBatchBundle() throws Excep } @Test - public void testCreateDuplicateSubscriptionsViaTransactionBundle() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadViaTransactionBundle() throws Exception { - Bundle bundle = createBundle(BundleType.TRANSACTION, createSubscription(), null, 2); + Bundle bundle = createBundle(BundleType.TRANSACTION, createSubscription(true), null, 2); expectForbidden(() -> getWebserviceClient().postBundle(bundle)); } @Test - public void testCreateDuplicateSubscriptionsViaBatchBundle() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadViaBatchBundle() throws Exception { - Bundle bundle = createBundle(BundleType.BATCH, createSubscription(), null, 2); + Bundle bundle = createBundle(BundleType.BATCH, createSubscription(true), null, 2); + + checkReturnBatchBundle(getWebserviceClient().postBundle(bundle)); + } + + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadViaTransactionBundle() throws Exception + { + Bundle bundle = createBundle(BundleType.TRANSACTION, createSubscription(false), null, 2); + + expectForbidden(() -> getWebserviceClient().postBundle(bundle)); + } + + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadViaBatchBundle() throws Exception + { + Bundle bundle = createBundle(BundleType.BATCH, createSubscription(false), null, 2); checkReturnBatchBundle(getWebserviceClient().postBundle(bundle)); } @@ -585,9 +601,9 @@ public void testCreateDuplicateStructureDefinitionsViaBatchBundleWithIfNoneExist } @Test - public void testCreateDuplicateSubscriptionsViaTransactionBundleWithIfNoneExists() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadViaTransactionBundleWithIfNoneExists() throws Exception { - Bundle bundle = createBundle(BundleType.TRANSACTION, createSubscription(), + Bundle bundle = createBundle(BundleType.TRANSACTION, createSubscription(true), (s, r) -> r .setIfNoneExist("criteria=" + s.getCriteria() + "&type=" + s.getChannel().getType().toCode()), 2); @@ -596,9 +612,31 @@ public void testCreateDuplicateSubscriptionsViaTransactionBundleWithIfNoneExists } @Test - public void testCreateDuplicateSubscriptionsViaBatchBundleWithIfNoneExists() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadViaBatchBundleWithIfNoneExists() throws Exception { - Bundle bundle = createBundle(BundleType.BATCH, createSubscription(), + Bundle bundle = createBundle(BundleType.BATCH, createSubscription(true), + (s, r) -> r + .setIfNoneExist("criteria=" + s.getCriteria() + "&type=" + s.getChannel().getType().toCode()), + 2); + + testCreateDuplicatesViaBundleWithIfNoneExists(bundle, BundleType.BATCHRESPONSE); + } + + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadViaTransactionBundleWithIfNoneExists() throws Exception + { + Bundle bundle = createBundle(BundleType.TRANSACTION, createSubscription(false), + (s, r) -> r + .setIfNoneExist("criteria=" + s.getCriteria() + "&type=" + s.getChannel().getType().toCode()), + 2); + + testCreateDuplicatesViaBundleWithIfNoneExists(bundle, BundleType.TRANSACTIONRESPONSE); + } + + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadViaBatchBundleWithIfNoneExists() throws Exception + { + Bundle bundle = createBundle(BundleType.BATCH, createSubscription(false), (s, r) -> r .setIfNoneExist("criteria=" + s.getCriteria() + "&type=" + s.getChannel().getType().toCode()), 2); @@ -825,11 +863,11 @@ public void testCreateDuplicateStructureDefinitionsParallelDirect() throws Excep } @Test - public void testCreateDuplicateSubscriptionsParallelDirect() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadParallelDirect() throws Exception { testCreateDuplicatesParallel(() -> { - Subscription returnS = getWebserviceClient().create(createSubscription()); + Subscription returnS = getWebserviceClient().create(createSubscription(true)); assertNotNull(returnS); }, SubscriptionDao.class, s -> SUBSCRIPTION_CRITERIA.equals(s.getCriteria()) @@ -837,6 +875,17 @@ public void testCreateDuplicateSubscriptionsParallelDirect() throws Exception && SUBSCRIPTION_CHANNEL_PAYLOAD.equals(s.getChannel().getPayload())); } + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadParallelDirect() throws Exception + { + testCreateDuplicatesParallel(() -> + { + Subscription returnS = getWebserviceClient().create(createSubscription(false)); + assertNotNull(returnS); + }, SubscriptionDao.class, s -> SUBSCRIPTION_CRITERIA.equals(s.getCriteria()) + && SUBSCRIPTION_CHANNEL_TYPE.equals(s.getChannel().getType()) && s.getChannel().getPayload() == null); + } + @Test public void testCreateDuplicateTasksParallelDirect() throws Exception { @@ -1235,12 +1284,12 @@ public void testCreateDuplicateStructureDefinitionsParallelBatchBundle() throws } @Test - public void testCreateDuplicateSubscriptionsParallelTransactionBundle() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadParallelTransactionBundle() throws Exception { testCreateDuplicatesParallel(() -> { Bundle returnBundle = getWebserviceClient() - .postBundle(createBundle(BundleType.TRANSACTION, createSubscription(), null, 1)); + .postBundle(createBundle(BundleType.TRANSACTION, createSubscription(true), null, 1)); assertNotNull(returnBundle); }, SubscriptionDao.class, s -> SUBSCRIPTION_CRITERIA.equals(s.getCriteria()) @@ -1249,12 +1298,12 @@ public void testCreateDuplicateSubscriptionsParallelTransactionBundle() throws E } @Test - public void testCreateDuplicateSubscriptionsParallelBatchBundle() throws Exception + public void testCreateDuplicateSubscriptionsWithPayloadParallelBatchBundle() throws Exception { testCreateDuplicatesParallel(() -> { Bundle returnBundle = getWebserviceClient() - .postBundle(createBundle(BundleType.BATCH, createSubscription(), null, 1)); + .postBundle(createBundle(BundleType.BATCH, createSubscription(true), null, 1)); assertNotNull(returnBundle); assertNotNull(returnBundle.getEntry()); @@ -1270,6 +1319,38 @@ public void testCreateDuplicateSubscriptionsParallelBatchBundle() throws Excepti && SUBSCRIPTION_CHANNEL_PAYLOAD.equals(s.getChannel().getPayload())); } + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadParallelTransactionBundle() throws Exception + { + testCreateDuplicatesParallel(() -> + { + Bundle returnBundle = getWebserviceClient() + .postBundle(createBundle(BundleType.TRANSACTION, createSubscription(false), null, 1)); + assertNotNull(returnBundle); + }, SubscriptionDao.class, s -> SUBSCRIPTION_CRITERIA.equals(s.getCriteria()) + && SUBSCRIPTION_CHANNEL_TYPE.equals(s.getChannel().getType()) && s.getChannel().getPayload() == null); + } + + @Test + public void testCreateDuplicateSubscriptionsWithoutPayloadParallelBatchBundle() throws Exception + { + testCreateDuplicatesParallel(() -> + { + Bundle returnBundle = getWebserviceClient() + .postBundle(createBundle(BundleType.BATCH, createSubscription(false), null, 1)); + assertNotNull(returnBundle); + + assertNotNull(returnBundle.getEntry()); + assertEquals(1, returnBundle.getEntry().size()); + assertNotNull(returnBundle.getEntry().get(0).getResponse()); + assertNotNull(returnBundle.getEntry().get(0).getResponse().getStatus()); + + if ("403 Forbidden".equals(returnBundle.getEntry().get(0).getResponse().getStatus())) + throw new WebApplicationException(403); + }, SubscriptionDao.class, s -> SUBSCRIPTION_CRITERIA.equals(s.getCriteria()) + && SUBSCRIPTION_CHANNEL_TYPE.equals(s.getChannel().getType()) && s.getChannel().getPayload() == null); + } + @Test public void testCreateDuplicateTasksParallelTransactionBundle() throws Exception { @@ -1574,11 +1655,14 @@ private StructureDefinition createStructureDefinition() return sD; } - private Subscription createSubscription() + private Subscription createSubscription(boolean withPayload) { Subscription s = new Subscription().setStatus(SubscriptionStatus.ACTIVE).setReason("some reason") - .setCriteria(SUBSCRIPTION_CRITERIA).setChannel(new SubscriptionChannelComponent() - .setType(SUBSCRIPTION_CHANNEL_TYPE).setPayload(SUBSCRIPTION_CHANNEL_PAYLOAD)); + .setCriteria(SUBSCRIPTION_CRITERIA) + .setChannel(new SubscriptionChannelComponent().setType(SUBSCRIPTION_CHANNEL_TYPE)); + + if (withPayload) + s.getChannel().setPayload(SUBSCRIPTION_CHANNEL_PAYLOAD); getReadAccessHelper().addAll(s); diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/SubscriptionIntegrationTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/SubscriptionIntegrationTest.java index 0bf6dc68f..85b541217 100644 --- a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/SubscriptionIntegrationTest.java +++ b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/SubscriptionIntegrationTest.java @@ -61,6 +61,35 @@ public void testCreateOkNoPayload() throws Exception assertEquals("1", created.getMeta().getVersionId()); } + @Test + public void testCreateOkNoPayloadAllreadyExistsWithPayload() throws Exception + { + Subscription t = newSubscription("Task?status=completed"); + + SubscriptionDao dao = getSpringWebApplicationContext().getBean(SubscriptionDao.class); + dao.create(t); + + t = newSubscription("Task?status=completed"); + t.getChannel().setPayload(null); + + Subscription created = getWebserviceClient().create(t); + assertNotNull(created); + assertTrue(created.getIdElement().hasValue()); + assertEquals("1", created.getMeta().getVersionId()); + } + + @Test + public void testCreateNotOkNoPayloadAllreadyExistsWithoutPayload() throws Exception + { + Subscription t = newSubscription("Task?status=completed"); + t.getChannel().setPayload(null); + + SubscriptionDao dao = getSpringWebApplicationContext().getBean(SubscriptionDao.class); + dao.create(t); + + expectForbidden(() -> getWebserviceClient().create(t)); + } + @Test public void testCreateInvalid() throws Exception { From 4fd1d13f9c698ee01c2635a54a7666ec39643c41 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 17 Feb 2025 11:06:56 +0100 Subject: [PATCH 03/38] typo fix --- .../java/dev/dsf/bpe/spring/config/PropertiesConfig.java | 2 +- .../dev/dsf/fhir/service/ValidationSupportWithCache.java | 6 +++--- .../config-templates/java-test-bpe-config.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java index d1e0adcfe..56e7f6a01 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java @@ -126,7 +126,7 @@ public class PropertiesConfig implements InitializingBean private long websocketRetrySleepMillis; @Documentation(description = "Directory containing the DSF BPE process plugins for deployment on startup of the DSF BPE server", recommendation = "Change only if you don't use the provided directory structure from the installation guide or made changes to tit") - @Value("${dev.dsf.bpe.process.plugin.directroy:process}") + @Value("${dev.dsf.bpe.process.plugin.directory:process}") private String processPluginDirectory; @Documentation(description = "List of process names that should be excluded from deployment during startup of the DSF BPE server; comma or space separated list, YAML block scalars supported", recommendation = "Only deploy processes that can be started depending on your organization's roles in the Allow-List", example = "dsfdev_updateAllowList|1.0, another_process|x.y") diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithCache.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithCache.java index d8a42acb3..4cc42f9ce 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithCache.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithCache.java @@ -266,7 +266,7 @@ public List fetchAllStructureDefinitions() @Override public IBaseResource fetchStructureDefinition(String url) { - logger.trace("Fetiching structure-definition '{}'", url); + logger.trace("Fetching structure-definition '{}'", url); if (url == null || url.isBlank()) return null; @@ -283,7 +283,7 @@ public boolean isCodeSystemSupported(ValidationSupportContext theRootValidationS @Override public IBaseResource fetchCodeSystem(String url) { - logger.trace("Fetiching code-system '{}'", url); + logger.trace("Fetching code-system '{}'", url); if (url == null || url.isBlank()) return null; @@ -300,7 +300,7 @@ public boolean isValueSetSupported(ValidationSupportContext theRootValidationSup @Override public IBaseResource fetchValueSet(String url) { - logger.trace("Fetiching value-set '{}'", url); + logger.trace("Fetching value-set '{}'", url); if (url == null || url.isBlank()) return null; diff --git a/dsf-tools/dsf-tools-test-data-generator/src/main/resources/config-templates/java-test-bpe-config.properties b/dsf-tools/dsf-tools-test-data-generator/src/main/resources/config-templates/java-test-bpe-config.properties index ef8b9420f..e86dd4134 100644 --- a/dsf-tools/dsf-tools-test-data-generator/src/main/resources/config-templates/java-test-bpe-config.properties +++ b/dsf-tools/dsf-tools-test-data-generator/src/main/resources/config-templates/java-test-bpe-config.properties @@ -29,7 +29,7 @@ dev.dsf.bpe.fhir.server.base.url=https://localhost:8001/fhir #dev.dsf.bpe.fhir.task.subscription.retry.max=-1 #dev.dsf.bpe.fhir.task.subscription.retry.sleep=5000 -#dev.dsf.bpe.process.plugin.directroy=process +#dev.dsf.bpe.process.plugin.directory=process #dev.dsf.bpe.process.excluded= #dev.dsf.bpe.process.retired= #dev.dsf.bpe.process.fhir.server.retry.max=-1 From b8ebde112c394becdc2861bd669d48bc51546b4d Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 24 Mar 2025 13:19:22 +0100 Subject: [PATCH 04/38] .secret property special case, updated documentation oidc code flow * The DocumentationGenerator now generates "or ..._FILE" headings also for properties ending in .secret * Update the recommendation for dev.dsf.server.auth.oidc.authorization.code.flow to reflect the generator change. --- .../main/java/dev/dsf/common/config/AbstractJettyConfig.java | 2 +- .../java/dev/dsf/tools/generator/DocumentationGenerator.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/config/AbstractJettyConfig.java b/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/config/AbstractJettyConfig.java index f38dfea00..a5204fc62 100644 --- a/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/config/AbstractJettyConfig.java +++ b/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/config/AbstractJettyConfig.java @@ -123,7 +123,7 @@ public abstract class AbstractJettyConfig @Value("${dev.dsf.server.certificate.key.password:#{null}}") private char[] serverCertificateKeyFilePassword; - @Documentation(description = "Set to `true` to enable OIDC authorization code flow", recommendation = "Requires *DEV_DSF_SERVER_AUTH_OIDC_PROVIDER_REALM_BASE_URL*, *DEV_DSF_SERVER_AUTH_OIDC_CLIENT_ID* and *DEV_DSF_SERVER_AUTH_OIDC_CLIENT_SECRET* to be specified") + @Documentation(description = "Set to `true` to enable OIDC authorization code flow", recommendation = "Requires *DEV_DSF_SERVER_AUTH_OIDC_PROVIDER_REALM_BASE_URL*, *DEV_DSF_SERVER_AUTH_OIDC_CLIENT_ID* and *DEV_DSF_SERVER_AUTH_OIDC_CLIENT_SECRET* or *DEV_DSF_SERVER_AUTH_OIDC_CLIENT_SECRET_FILE* to be specified") @Value("${dev.dsf.server.auth.oidc.authorization.code.flow:false}") private boolean oidcAuthorizationCodeFlowEnabled; diff --git a/dsf-tools/dsf-tools-documentation-generator/src/main/java/dev/dsf/tools/generator/DocumentationGenerator.java b/dsf-tools/dsf-tools-documentation-generator/src/main/java/dev/dsf/tools/generator/DocumentationGenerator.java index 8ebbe3a54..74763837e 100644 --- a/dsf-tools/dsf-tools-documentation-generator/src/main/java/dev/dsf/tools/generator/DocumentationGenerator.java +++ b/dsf-tools/dsf-tools-documentation-generator/src/main/java/dev/dsf/tools/generator/DocumentationGenerator.java @@ -223,7 +223,7 @@ private Function processDocumentationGenerator(List dsfDocumentationGenerator() String property = getDocumentationString("Property", initialProperty); String initialEnvironment = initialProperty.replace(".", "_").toUpperCase(); - String environment = initialProperty.endsWith(".password") + String environment = initialProperty.endsWith(".password") || initialProperty.endsWith(".secret") ? String.format("%s or %s_FILE", initialEnvironment, initialEnvironment) : initialEnvironment; From 1029c7837d14eee12ed457bd19501f01748c9fdc Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sun, 23 Mar 2025 19:11:53 +0100 Subject: [PATCH 05/38] fixed wrong "if non exists" url, should be back-ported to DSF 1.7.1 --- .../StructureDefinition/dsf-activity-definition-1.0.0.xml.post | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-1.0.0.xml.post b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-1.0.0.xml.post index aa1d48fa1..9f25fda92 100644 --- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-1.0.0.xml.post +++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-1.0.0.xml.post @@ -1 +1 @@ -url=http://dsf.dev/fhir/StructureDefinition/code-system&version=1.0.0 \ No newline at end of file +url=http://dsf.dev/fhir/StructureDefinition/activity-definition&version=1.0.0 \ No newline at end of file From 70aa78b8944c6ad2cf88b66342d560e7b7f6fdc7 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 24 Mar 2025 15:18:29 +0100 Subject: [PATCH 06/38] dependency and maven plugin version upgrades --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index fd598ed8e..2d6ada635 100755 --- a/pom.xml +++ b/pom.xml @@ -21,13 +21,13 @@ ${project.basedir} - 2.0.16 + 2.0.17 2.24.3 - 11.0.24 + 11.0.25 3.1.10 2.2.0 - 6.2.2 - 2.18.2 + 6.2.5 + 2.18.3 7.22.0 5.1.0 1.80 @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.1 org.bouncycastle @@ -156,7 +156,7 @@ org.liquibase liquibase-core - 4.31.0 + 4.31.1 org.postgresql @@ -180,7 +180,7 @@ com.auth0 java-jwt - 4.4.0 + 4.5.0 @@ -417,7 +417,7 @@ com.google.code.gson gson - 2.11.0 + 2.12.1 org.thymeleaf @@ -433,7 +433,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 @@ -455,7 +455,7 @@ org.yaml snakeyaml - 2.3 + 2.4 @@ -489,7 +489,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 org.apache.maven.plugins @@ -557,12 +557,12 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.0 + 3.4.1 net.revelc.code.formatter formatter-maven-plugin - 2.24.1 + 2.26.0 net.revelc.code @@ -602,12 +602,12 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.6 + 4.9.3.0 org.apache.maven.plugins maven-project-info-reports-plugin - 3.8.0 + 3.9.0 org.apache.maven.plugins From 41445d61e9e1069c876197f61e5dbb0167802758 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 24 Mar 2025 16:21:59 +0100 Subject: [PATCH 07/38] version management for remaining jackson dependencies --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 2d6ada635..aebb71422 100755 --- a/pom.xml +++ b/pom.xml @@ -260,6 +260,16 @@ jackson-annotations ${jackson.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jakarta-xmlbind-annotations + ${jackson.version} + From bffc318dc9150994236c1a40d0e6b736d4ec81f4 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 24 Mar 2025 18:28:28 +0100 Subject: [PATCH 08/38] 1.7.1 release --- CITATION.cff | 2 +- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 26c0c1b62..9d28a9d99 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -25,7 +25,7 @@ preferred-citation: type: proceedings title: "Data Sharing Framework (DSF)" version: 1.7.1 -date-released: 2025-01-22 +date-released: 2025-03-24 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 9073f2f0e..1ba2f82f5 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index 7b59bcc5e..d34fcea0d 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index ea3fbbb31..2d64808b0 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index dbe45c764..ed19490d6 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 30ed248fa..721bea3d2 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index 4d4bd52d4..e48a5f201 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index f04c440da..28706209c 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index bbdc0a7ea..3b13655c0 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,6 +6,6 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 \ No newline at end of file diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index c54ec4abc..8022cc48f 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 9f0f819e6..588d42292 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index 9919b7fdc..0bcc47f12 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index c6e44dc38..e12efc679 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index ec417e2fd..33f741b67 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index e35db6b8f..6446893d9 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index 95f16c03e..be5504c97 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 73854350a..8165d1118 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 7f5e15fd2..89f45d9a2 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 @@ -104,7 +104,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 141fbf734..4647a58d4 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index 4855a3257..af0a32984 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index b2ad3ea6d..c2685e381 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 6b68277b4..a384f099b 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index abdb1aefa..1a8cfdebd 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index ee1aa4cdb..8d69f9d89 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index 2621edadd..991d78678 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index ca2defd21..5a9043c0c 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 9a9f7e409..e4bd0fa08 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index 029042356..f741bfa15 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 31500b049..e34290a2a 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 16a562f5f..9171446ab 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1-SNAPSHOT + 1.7.1 diff --git a/pom.xml b/pom.xml index aebb71422..bd8437d3c 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.7.1-SNAPSHOT + 1.7.1 pom From b97fc6fc209a5784cce076feaaa714b8de98811b Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sat, 17 May 2025 15:30:48 +0200 Subject: [PATCH 09/38] version to 1.7.2-SNAPSHOT --- CITATION.cff | 4 ++-- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 9d28a9d99..091cc446a 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ preferred-citation: doi: 10.3233/SHTI210060 type: proceedings title: "Data Sharing Framework (DSF)" -version: 1.7.1 -date-released: 2025-03-24 +version: 1.7.2 +date-released: 2025-05-17 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 1ba2f82f5..7c2f89c75 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index d34fcea0d..fde973f59 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 2d64808b0..28b67351b 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index ed19490d6..ab62620a8 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 721bea3d2..44903dc40 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index e48a5f201..0ceb1ed3e 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index 28706209c..b607369eb 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index 3b13655c0..c0b49b4a9 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,6 +6,6 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT \ No newline at end of file diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index 8022cc48f..c602d4deb 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 588d42292..f085f2782 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index 0bcc47f12..6206c34f8 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index e12efc679..dad5f024e 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 33f741b67..f431f2ccb 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 6446893d9..15e87f11a 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index be5504c97..bf7e3d581 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 8165d1118..e5175faf7 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 89f45d9a2..0e234ed48 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT @@ -104,7 +104,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 4647a58d4..ec2b140ef 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index af0a32984..f640b3207 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index c2685e381..f319d735d 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index a384f099b..28e69e58c 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index 1a8cfdebd..62986fa42 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 8d69f9d89..783269150 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index 991d78678..c2e829786 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index 5a9043c0c..92f72fd4b 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index e4bd0fa08..25d737d18 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index f741bfa15..abe0cde24 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index e34290a2a..86139e395 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 9171446ab..9105c4fd6 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.1 + 1.7.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index bd8437d3c..005b36fe8 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.7.1 + 1.7.2-SNAPSHOT pom From 302c332fb9675f374dbf0f7a76c9658c4bbcb662 Mon Sep 17 00:00:00 2001 From: Reto Wettstein Date: Fri, 16 May 2025 14:59:08 +0200 Subject: [PATCH 10/38] add check if row exists cherry-picked from DSF 2.0.0 (a74efbec6bac13ecf35523133996ecf3da24ca69) --- .../src/main/resources/static/form.js | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js index 9814b85d6..19c80dfc8 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js @@ -722,24 +722,27 @@ function getValueOfDifferential(differentials, path, property) { function modifyTaskInputRow(definition) { const id = definition.typeSystem + "|" + definition.typeCode const row = document.querySelector(`div.row[for="${CSS.escape(id)}"]`) - const span = row.querySelector('span.cardinalities') - span.innerText = `[${definition.min}..${definition.max}]` - if (definition.max !== "1") { - const plusIcon = htmlToElement('') - const plusIconSvg = htmlToElement('Add additional input') + if (row) { + const span = row.querySelector('span.cardinalities') + span.innerText = `[${definition.min}..${definition.max}]` - plusIconSvg.addEventListener("click", event => { - appendInputRowAfter(id) - event.preventDefault() - }) + if (definition.max !== "1") { + const plusIcon = htmlToElement('') + const plusIconSvg = htmlToElement('Add additional input') - plusIcon.appendChild(plusIconSvg) - span.appendChild(plusIcon) - } + plusIconSvg.addEventListener("click", event => { + appendInputRowAfter(id) + event.preventDefault() + }) - if (definition.min < 1 || definition.min === undefined) - row.setAttribute("optional", "") + plusIcon.appendChild(plusIconSvg) + span.appendChild(plusIcon) + } + + if (definition.min < 1 || definition.min === undefined) + row.setAttribute("optional", "") + } } function modifyQuestionnaireInputRow(item) { From 77b99dc9a729f4f2af071b09742d65f6daab719b Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sat, 17 May 2025 15:37:32 +0200 Subject: [PATCH 11/38] downgrade postgresql to 42.7.3, see #298 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 005b36fe8..78e5bc6ab 100755 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ org.postgresql postgresql - 42.7.5 + 42.7.3 From c592fd78fcaa8def141bfcb89820b4f3ec2ffbad Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sun, 18 May 2025 00:01:03 +0200 Subject: [PATCH 12/38] sonatype central config, some github workflow optimizations resolves #308 for DSF 1.x --- .github/workflows/codeql.yml | 2 +- .github/workflows/maven-build.yml | 2 +- .github/workflows/maven-publish.yml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 5 +++ pom.xml | 53 +++++++++++++++++--------- 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d2e704b9d..203e1304b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -41,7 +41,7 @@ jobs: - name: Compile with Maven if: ${{ matrix.language == 'java-kotlin' }} - run: mvn --batch-mode --fail-at-end --threads 1C -Dmaven.javadoc.skip=true -Dimpsort.skip=true -Dformatter.skip=true -Dgpg.skip -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests clean package + run: mvn --batch-mode --fail-at-end --threads 1C -Dimpsort.skip=true -Dformatter.skip=true -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests -DskipShadePlugin=true -P!generate-source-and-javadoc-jars clean package - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 07e9cf265..397dad26a 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -16,4 +16,4 @@ jobs: java-version: 17 cache: 'maven' - name: Build with Maven - run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 -Dgpg.skip clean verify + run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean verify diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 7102be434..748715745 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -25,4 +25,4 @@ jobs: - name: Publish with Maven env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 -Dgpg.skip clean deploy + run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean deploy diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index abe0cde24..289bf8781 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -8,6 +8,10 @@ dsf-tools-pom 1.7.2-SNAPSHOT + + + false + @@ -75,6 +79,7 @@ false + ${skipShadePlugin} diff --git a/pom.xml b/pom.xml index 78e5bc6ab..3a26c28e7 100755 --- a/pom.xml +++ b/pom.xml @@ -624,6 +624,11 @@ maven-pmd-plugin 3.26.0 + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 + @@ -746,19 +751,6 @@ java,* - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - org.apache.maven.plugins maven-enforcer-plugin @@ -788,11 +780,6 @@ - - sonatype - Sonatype Nexus release repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - github @@ -905,6 +892,36 @@ + + publish-to-maven-central + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.central + central-publishing-maven-plugin + true + + central + DSF 1.x + + + + + From c4d34ee7fc4bfc0f506d20fe80a8d49b3c0472c9 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sun, 18 May 2025 19:14:22 +0200 Subject: [PATCH 13/38] renamed workflows, build on pull requests, codeql on 1x branches only --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/maven-build.yml | 6 ++++-- .github/workflows/maven-publish.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 203e1304b..3b2cd96d2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,10 +1,10 @@ -name: "CodeQL" +name: DSF 1.x CodeQL on: push: - branches: [ "main", "develop", "hotfix/*", "release/*" ] + branches: [ "main", "develop", "hotfix/1*", "release/1*" ] pull_request: - branches: [ "main", "develop", "hotfix/*", "release/*" ] + branches: [ "main", "develop", "hotfix/1*", "release/1*" ] schedule: - cron: '21 15 * * 0' # Sundays, 15:21 diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 397dad26a..681ceea43 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -1,6 +1,8 @@ -name: Java CI Build with Maven +name: DSF 1.x Java CI Build with Maven -on: push +on: + pull_request: + branches: develop jobs: build: diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 748715745..797662cfb 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,4 +1,4 @@ -name: Java CI Publish with Maven +name: DSF 1.x Java CI Publish with Maven on: pull_request: From c9ee0908a6c2c344f6a38d984d3c9d8b56934622 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Fri, 30 May 2025 02:41:39 +0200 Subject: [PATCH 14/38] depdendency and plugin version upgrades --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 3a26c28e7..86d4be182 100755 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ 11.0.25 3.1.10 2.2.0 - 6.2.5 - 2.18.3 + 6.2.7 + 2.19.0 7.22.0 5.1.0 1.80 @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.16.1 + 5.18.0 org.bouncycastle @@ -156,12 +156,12 @@ org.liquibase liquibase-core - 4.31.1 + 4.32.0 org.postgresql postgresql - 42.7.3 + 42.7.6 @@ -407,7 +407,7 @@ org.apache.commons commons-text - 1.13.0 + 1.13.1 org.apache.commons @@ -427,7 +427,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.1 org.thymeleaf @@ -438,7 +438,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 commons-codec @@ -531,12 +531,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 org.apache.maven.plugins maven-failsafe-plugin - 3.5.2 + 3.5.3 org.apache.maven.plugins From 5f009c85a2b4d630b86e4d76abe24a59c1feb6e2 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Fri, 30 May 2025 02:42:40 +0200 Subject: [PATCH 15/38] camunda version upgrade 7.22 -> 7.23 --- .../camunda/postgres_engine_7.22_to_7.23.sql | 25 +++++++++++++++++++ .../db/db.camunda_engine.changelog-1.8.0.xml | 12 +++++++++ .../src/main/resources/db/db.changelog.xml | 2 ++ pom.xml | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.22_to_7.23.sql create mode 100644 dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.8.0.xml diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.22_to_7.23.sql b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.22_to_7.23.sql new file mode 100644 index 000000000..4f51ae734 --- /dev/null +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.22_to_7.23.sql @@ -0,0 +1,25 @@ +-- +-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH +-- under one or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information regarding copyright +-- ownership. Camunda licenses this file to you under the Apache License, +-- Version 2.0; you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +insert into ACT_GE_SCHEMA_LOG +values ('1200', CURRENT_TIMESTAMP, '7.23.0'); + +alter table ACT_HI_COMMENT + add column REV_ integer not null + default 1; + +alter table ACT_RU_EXECUTION add column PROC_DEF_KEY_ varchar(255); diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.8.0.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.8.0.xml new file mode 100644 index 000000000..79fb1674d --- /dev/null +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.8.0.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml index 865d2bd97..2885e3f16 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml @@ -19,4 +19,6 @@ + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 86d4be182..a6691e165 100755 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.2.0 6.2.7 2.19.0 - 7.22.0 + 7.23.0 5.1.0 1.80 From f71d52ce399be2d88738d34d4ba5ed66b63a8708 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Fri, 30 May 2025 02:57:34 +0200 Subject: [PATCH 16/38] version to 1.8.0-SNAPSHOT --- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 7c2f89c75..8ea9c7f4b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index fde973f59..27cf766ce 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 28b67351b..930deeca1 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index ab62620a8..a28d3ad35 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 44903dc40..6b3725ff1 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index 0ceb1ed3e..bb6132d4e 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index b607369eb..51ebdbe9e 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index c0b49b4a9..ef8f51a25 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,6 +6,6 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT \ No newline at end of file diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index c602d4deb..861ce5e9d 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index f085f2782..7e1a37e19 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index 6206c34f8..a76da4fc6 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index dad5f024e..8880791c4 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index f431f2ccb..93b62204b 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 15e87f11a..3f9da3944 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index bf7e3d581..e3eb80d8d 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index e5175faf7..e5df40948 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 0e234ed48..e9aa885a1 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT @@ -104,7 +104,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index ec2b140ef..f97793df1 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index f640b3207..865f4d63b 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index f319d735d..eb0e508cc 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 28e69e58c..4c9adc8b4 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index 62986fa42..db589de39 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 783269150..5aef18198 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index c2e829786..aad17cfee 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index 92f72fd4b..f194fc521 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 25d737d18..8d3785174 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index 289bf8781..e8ac92db7 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 86139e395..10b345ad6 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 9105c4fd6..f7db2d617 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index a6691e165..272177207 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.7.2-SNAPSHOT + 1.8.0-SNAPSHOT pom From a0b2cb4b95edac7201bf36a531fe5e84b957f616 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sat, 31 May 2025 17:24:42 +0200 Subject: [PATCH 17/38] adds missing not null check - fixes #323 - should be ported to 2.0.0 --- dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js index 19c80dfc8..6346221f6 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js @@ -177,7 +177,7 @@ function newTaskInputBoolean(type, id, checkedTrue, checkedFalse, optional) { addError(errorListElement, "Input mandatory") } - if (value) { + if (value !== null) { return { input: { type: type, From f48e976d291dce355c52a4ef71a78f280bd62187 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 2 Jun 2025 00:11:51 +0200 Subject: [PATCH 18/38] added maven project names for maven central deployment via sonatype --- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 4 +++- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 ++ dsf-bpe/dsf-bpe-server/pom.xml | 2 ++ dsf-bpe/pom.xml | 2 ++ dsf-common/dsf-common-auth/pom.xml | 6 +++-- dsf-common/dsf-common-config/pom.xml | 2 ++ dsf-common/dsf-common-db/pom.xml | 2 ++ dsf-common/dsf-common-documentation/pom.xml | 2 ++ dsf-common/dsf-common-jetty/pom.xml | 12 +++++----- dsf-common/dsf-common-status/pom.xml | 4 +++- dsf-common/dsf-common-ui/pom.xml | 4 +++- dsf-common/pom.xml | 10 +++++---- dsf-fhir/dsf-fhir-auth/pom.xml | 2 ++ dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 ++ dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 ++ dsf-fhir/dsf-fhir-server/pom.xml | 2 ++ dsf-fhir/dsf-fhir-validation/pom.xml | 2 ++ dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 ++ dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 ++ dsf-fhir/pom.xml | 6 +++-- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 ++ dsf-tools/dsf-tools-bundle-generator/pom.xml | 4 +++- dsf-tools/dsf-tools-db-migration/pom.xml | 2 ++ .../pom.xml | 22 ++++++++++--------- .../dsf-tools-docker-secrets-reader/pom.xml | 2 ++ .../dsf-tools-documentation-generator/pom.xml | 2 ++ dsf-tools/dsf-tools-proxy-test/pom.xml | 4 +++- .../dsf-tools-test-data-generator/pom.xml | 4 +++- dsf-tools/pom.xml | 2 ++ pom.xml | 2 +- 30 files changed, 88 insertions(+), 30 deletions(-) diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 8ea9c7f4b..3637e059d 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -8,7 +8,9 @@ dsf-bpe-pom 1.8.0-SNAPSHOT - + + DSF BPE Process API v1 + dev.dsf diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index 27cf766ce..2cce36edf 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF BPE Server Jetty + dev.dsf diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 930deeca1..5c3282a68 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF BPE Server + dev.dsf diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index a28d3ad35..468b76bfd 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -20,6 +20,8 @@ ${project.basedir}/../.. + DSF BPE Parent POM + camunda-bpm diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 6b3725ff1..ed92f5ff7 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Common Auth + ca.uhn.hapi.fhir @@ -18,7 +20,7 @@ org.yaml snakeyaml - + jakarta.servlet jakarta.servlet-api @@ -31,7 +33,7 @@ jakarta.annotation jakarta.annotation-api - + org.springframework spring-beans diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index bb6132d4e..94093d6fc 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Common Config + org.springframework diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index 51ebdbe9e..aa23d4604 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Common DB + org.apache.commons diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index ef8f51a25..f989958d2 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -8,4 +8,6 @@ dsf-common-pom 1.8.0-SNAPSHOT + + DSF Common Documentation \ No newline at end of file diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index 861ce5e9d..f2917755e 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -8,23 +8,25 @@ dsf-common-pom 1.8.0-SNAPSHOT - + + DSF Common Jetty + dev.dsf - dsf-common-auth + dsf-common-auth dev.dsf - dsf-common-config + dsf-common-config dev.dsf - dsf-common-documentation + dsf-common-documentation dev.dsf - dsf-tools-docker-secrets-reader + dsf-tools-docker-secrets-reader org.eclipse.jetty diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 7e1a37e19..1ee4c0ccd 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -8,7 +8,9 @@ dsf-common-pom 1.8.0-SNAPSHOT - + + DSF Common Status + jakarta.servlet diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index a76da4fc6..778c34b3d 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -8,7 +8,9 @@ dsf-common-pom 1.8.0-SNAPSHOT - + + DSF Common UI + jakarta.ws.rs diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index 8880791c4..22c558c4b 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -9,7 +9,7 @@ dsf-pom 1.8.0-SNAPSHOT - + dsf-common-auth dsf-common-config @@ -19,11 +19,13 @@ dsf-common-status dsf-common-ui - + ${project.basedir}/../.. - + + DSF Common Parent POM + @@ -38,7 +40,7 @@ test - + diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 93b62204b..260ae07d6 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Auth + dev.dsf diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 3f9da3944..2ced96bb7 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Rest Adapter + ca.uhn.hapi.fhir diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index e3eb80d8d..5304b6aaa 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Server Jetty + dev.dsf diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index e5df40948..65f0c115a 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Server + dev.dsf diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index e9aa885a1..610b9d8c7 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Validation + ca.uhn.hapi.fhir diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index f97793df1..901324f3d 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Webservice Client + dev.dsf diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index 865f4d63b..f7a0e364e 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF FHIR Websocket Client + ca.uhn.hapi.fhir diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index eb0e508cc..21f2f2c91 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -19,11 +19,13 @@ dsf-fhir-validation dsf-fhir-auth - + ${project.basedir}/../.. + DSF FHIR Parent POM + @@ -107,7 +109,7 @@ dsf-tools-documentation-generator ${project.version} - + dev.dsf dsf-common-auth diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 4c9adc8b4..22bdaa19c 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Tools Build Info Reader + org.slf4j diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index db589de39..d60434a60 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Tools Bundle Generator + ca.uhn.hapi.fhir @@ -36,7 +38,7 @@ ca.uhn.hapi.fhir hapi-fhir-validation-resources-r5 - + org.apache.logging.log4j log4j-core diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 5aef18198..cf1ed272c 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Tools DB Migration + org.postgresql diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index aad17cfee..d7a677239 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -1,20 +1,22 @@ - 4.0.0 + 4.0.0 - dsf-tools-default-ca-files-generator + dsf-tools-default-ca-files-generator - - dev.dsf - dsf-tools-pom - 1.8.0-SNAPSHOT - - - + + dev.dsf + dsf-tools-pom + 1.8.0-SNAPSHOT + + + DSF Tools Default CA Files Generator + + de.hs-heilbronn.mi crypto-utils - + org.apache.logging.log4j log4j-core diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index f194fc521..ca6eded7d 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Tools Docker Secrets Reader + org.springframework diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 8d3785174..1e3137752 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -10,6 +10,8 @@ 1.8.0-SNAPSHOT + DSF Tools Documentation Generator + org.apache.maven diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index e8ac92db7..c862c3a32 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -8,11 +8,13 @@ dsf-tools-pom 1.8.0-SNAPSHOT - + false + DSF Tools Proxy Test + dev.dsf diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 10b345ad6..5cbdcb66a 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -9,6 +9,8 @@ 1.8.0-SNAPSHOT + DSF Tools Test Data Generator + de.hs-heilbronn.mi @@ -32,7 +34,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-r4 - + org.apache.logging.log4j log4j-core diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index f7db2d617..6277d917d 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -25,6 +25,8 @@ ${project.basedir}/../.. + DSF Tools Parent POM + diff --git a/pom.xml b/pom.xml index 272177207..85c40fbbc 100755 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.80 - DSF + DSF Parent POM Data Sharing Framework (DSF) https://dsf.dev From 1c5223d0deacece57326b719ba254d8e21ad338c Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 2 Jun 2025 00:18:52 +0200 Subject: [PATCH 19/38] added javadoc and source jar goals to publish-to-maven-central profile --- pom.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pom.xml b/pom.xml index 85c40fbbc..da4be2737 100755 --- a/pom.xml +++ b/pom.xml @@ -897,6 +897,30 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-gpg-plugin From 841772e2a9744c41f80103dfd44e6b67678d58ec Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sun, 1 Jun 2025 23:11:55 +0200 Subject: [PATCH 20/38] 1.8.0 release --- CITATION.cff | 4 ++-- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 091cc446a..0e5270539 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ preferred-citation: doi: 10.3233/SHTI210060 type: proceedings title: "Data Sharing Framework (DSF)" -version: 1.7.2 -date-released: 2025-05-17 +version: 1.8.0 +date-released: 2025-06-01 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 3637e059d..bc09cc36b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF BPE Process API v1 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index 2cce36edf..c37b29c49 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF BPE Server Jetty diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 5c3282a68..ba0d8a20f 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF BPE Server diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 468b76bfd..a0a7b7915 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0-SNAPSHOT + 1.8.0 diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index ed92f5ff7..8bc5aa851 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common Auth diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index 94093d6fc..3b4090af8 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common Config diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index aa23d4604..33f78960b 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common DB diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index f989958d2..da4a29a5c 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common Documentation diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index f2917755e..ee6c0b2df 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common Jetty diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 1ee4c0ccd..4533c3daa 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common Status diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index 778c34b3d..64ac4b943 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Common UI diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index 22c558c4b..a9a03d17a 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0-SNAPSHOT + 1.8.0 diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 260ae07d6..116703d6b 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Auth diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 2ced96bb7..2547d17ee 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Rest Adapter diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index 5304b6aaa..9df53d16f 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Server Jetty diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 65f0c115a..62c7deac1 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Server diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 610b9d8c7..d7055c80f 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Validation @@ -106,7 +106,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 901324f3d..1e62d8742 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Webservice Client diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index f7a0e364e..b9eebec5d 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF FHIR Websocket Client diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index 21f2f2c91..255c95a9b 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0-SNAPSHOT + 1.8.0 diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 22bdaa19c..2383aeeb2 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools Build Info Reader diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index d60434a60..99e1b6305 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools Bundle Generator diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index cf1ed272c..95a3b3844 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools DB Migration diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index d7a677239..08575ffc5 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools Default CA Files Generator diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index ca6eded7d..cf8198e89 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools Docker Secrets Reader diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 1e3137752..fac1ace46 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools Documentation Generator diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index c862c3a32..79f518567 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 5cbdcb66a..19bc64bf2 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0-SNAPSHOT + 1.8.0 DSF Tools Test Data Generator diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 6277d917d..b7578e00c 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0-SNAPSHOT + 1.8.0 diff --git a/pom.xml b/pom.xml index da4be2737..d8bb934ce 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.8.0-SNAPSHOT + 1.8.0 pom From 54e40432d81896c6c193f7fc93124028662dd66d Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 30 Sep 2025 01:20:46 +0200 Subject: [PATCH 21/38] version to 1.9.0-SNAPSHOT --- CITATION.cff | 4 ++-- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 0e5270539..3c660e945 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ preferred-citation: doi: 10.3233/SHTI210060 type: proceedings title: "Data Sharing Framework (DSF)" -version: 1.8.0 -date-released: 2025-06-01 +version: 1.9.0 +date-released: 2025-10-14 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index bc09cc36b..444a7b764 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF BPE Process API v1 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index c37b29c49..ba1b39a46 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF BPE Server Jetty diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index ba0d8a20f..a63efc1d9 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF BPE Server diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index a0a7b7915..79ea896cb 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0 + 1.9.0-SNAPSHOT diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 8bc5aa851..1606e4717 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common Auth diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index 3b4090af8..b1c0864f5 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common Config diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index 33f78960b..0b874d97e 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common DB diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index da4a29a5c..e788b03b0 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common Documentation diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index ee6c0b2df..1f6bc7173 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common Jetty diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 4533c3daa..73cf270eb 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common Status diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index 64ac4b943..3de8f8e0e 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Common UI diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index a9a03d17a..70cef9cf4 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0 + 1.9.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 116703d6b..a5512387d 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Auth diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 2547d17ee..888d1f748 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Rest Adapter diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index 9df53d16f..fe8da7b32 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Server Jetty diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 62c7deac1..fb6c06fd4 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Server diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index d7055c80f..16d29d5cd 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Validation @@ -106,7 +106,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 1e62d8742..3d2795eca 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Webservice Client diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index b9eebec5d..adf118398 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF FHIR Websocket Client diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index 255c95a9b..c1227e785 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0 + 1.9.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 2383aeeb2..ee48f5a49 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools Build Info Reader diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index 99e1b6305..c1ef03f02 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools Bundle Generator diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 95a3b3844..513ff5630 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools DB Migration diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index 08575ffc5..22952cae2 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools Default CA Files Generator diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index cf8198e89..ea54fb0e9 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools Docker Secrets Reader diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index fac1ace46..57e361911 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools Documentation Generator diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index 79f518567..cd004a688 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 19bc64bf2..b573e7d55 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.8.0 + 1.9.0-SNAPSHOT DSF Tools Test Data Generator diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index b7578e00c..1b76e675d 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.8.0 + 1.9.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index d8bb934ce..fe616f4fb 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.8.0 + 1.9.0-SNAPSHOT pom From fdd67c90e11c16e20e4f81b5fc2728c1c96e9f52 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 30 Sep 2025 20:24:13 +0200 Subject: [PATCH 22/38] builder image upgrade, apt cache mount, removed not needed signal trap * Builder image upgrade debian:buster-slim -> debian:trixie-slim * Removed adduser command from builder image, not needed if we use gid * Added cache mount for apt file * Removed not needed SIGINT signal trap from startup sh script, docker does not use SIGINT to stop containers --- dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile | 15 ++++++++------- .../dsf-bpe-server-jetty/docker/dsf_bpe_start.sh | 6 +++--- dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile | 15 ++++++++------- .../docker/dsf_fhir_start.sh | 4 ++-- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile b/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile index c872c741c..98a4e7066 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile +++ b/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile @@ -1,11 +1,10 @@ -FROM debian:buster-slim AS builder -RUN adduser --system --no-create-home --group --uid 2202 java +FROM debian:trixie-slim AS builder WORKDIR /opt/bpe -COPY --chown=root:java ./ ./ -RUN chown root:java ./ && \ +COPY --chown=root:2202 ./ ./ +RUN chown root:2202 ./ && \ chmod 750 ./ ./ca ./conf ./lib ./lib_external ./process ./ui ./dsf_bpe_start.sh ./healthcheck.sh && \ - chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./dsf_bpe.jar ./lib/*.jar && \ - chmod 1775 ./log + chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./dsf_bpe.jar ./lib/*.jar && \ + chmod 1775 ./log FROM azul/zulu-openjdk:17-jre-headless @@ -15,8 +14,10 @@ LABEL org.opencontainers.image.licenses="Apache License, Version 2.0" EXPOSE 8080 -RUN adduser --system --no-create-home --group --uid 2202 java && \ +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt update && apt dist-upgrade -y && apt install curl -y +RUN adduser --system --no-create-home --group --uid 2202 java WORKDIR /opt/bpe COPY --from=builder /opt/bpe ./ diff --git a/dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe_start.sh b/dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe_start.sh index 5e170a148..d73b28fa3 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe_start.sh +++ b/dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe_start.sh @@ -3,11 +3,11 @@ echo "Executing DSF BPE with" java --version -trap 'kill -TERM $PID' TERM INT -java $EXTRA_JVM_ARGS -Djdk.tls.acknowledgeCloseNotify=true -cp lib/*:lib_external/*:dsf_bpe.jar dev.dsf.bpe.BpeJettyServer & +trap 'kill -TERM $PID' TERM +java $EXTRA_JVM_ARGS -Djdk.tls.acknowledgeCloseNotify=true -cp lib/*:lib_external/*:dsf_bpe.jar dev.dsf.bpe.BpeJettyServer PID=$! wait $PID -trap - TERM INT +trap - TERM wait $PID JAVA_EXIT=$? diff --git a/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile b/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile index 36f67ecce..b838cf2c2 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile +++ b/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile @@ -1,11 +1,10 @@ -FROM debian:buster-slim AS builder -RUN adduser --system --no-create-home --group --uid 2101 java +FROM debian:trixie-slim AS builder WORKDIR /opt/fhir -COPY --chown=root:java ./ ./ -RUN chown root:java ./ && \ +COPY --chown=root:2101 ./ ./ +RUN chown root:2101 ./ && \ chmod 750 ./ ./ca ./conf ./lib ./ui ./dsf_fhir_start.sh ./healthcheck.sh && \ - chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./conf/bundle.xml ./dsf_fhir.jar ./lib/*.jar && \ - chmod 1775 ./log + chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./conf/bundle.xml ./dsf_fhir.jar ./lib/*.jar && \ + chmod 1775 ./log FROM azul/zulu-openjdk:17-jre-headless @@ -15,8 +14,10 @@ LABEL org.opencontainers.image.licenses="Apache License, Version 2.0" EXPOSE 8080 -RUN adduser --system --no-create-home --group --uid 2101 java && \ +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt update && apt dist-upgrade -y && apt install curl -y +RUN adduser --system --no-create-home --group --uid 2101 java WORKDIR /opt/fhir COPY --from=builder /opt/fhir ./ diff --git a/dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir_start.sh b/dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir_start.sh index 7dc01d914..dea5775ba 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir_start.sh +++ b/dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir_start.sh @@ -3,11 +3,11 @@ echo "Executing DSF FHIR with" java --version -trap 'kill -TERM $PID' TERM INT +trap 'kill -TERM $PID' TERM java $EXTRA_JVM_ARGS -Djdk.tls.acknowledgeCloseNotify=true -cp lib/*:dsf_fhir.jar dev.dsf.fhir.FhirJettyServer & PID=$! wait $PID -trap - TERM INT +trap - TERM wait $PID JAVA_EXIT=$? From e83f923f44c01f4922035856ce06cd8f4301330c Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 30 Sep 2025 20:27:53 +0200 Subject: [PATCH 23/38] added README.md --- dsf-docker/bpe_proxy/.dockerignore | 3 ++- dsf-docker/fhir_proxy/.dockerignore | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dsf-docker/bpe_proxy/.dockerignore b/dsf-docker/bpe_proxy/.dockerignore index 31bb6829b..d8f9c0ff1 100644 --- a/dsf-docker/bpe_proxy/.dockerignore +++ b/dsf-docker/bpe_proxy/.dockerignore @@ -1,3 +1,4 @@ ca/README.md .dockerignore -Dockerfile \ No newline at end of file +Dockerfile +README.md \ No newline at end of file diff --git a/dsf-docker/fhir_proxy/.dockerignore b/dsf-docker/fhir_proxy/.dockerignore index 31bb6829b..d8f9c0ff1 100644 --- a/dsf-docker/fhir_proxy/.dockerignore +++ b/dsf-docker/fhir_proxy/.dockerignore @@ -1,3 +1,4 @@ ca/README.md .dockerignore -Dockerfile \ No newline at end of file +Dockerfile +README.md \ No newline at end of file From 745ae19ef69575f960faa2765d1b13ebad02dc16 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 30 Sep 2025 20:35:00 +0200 Subject: [PATCH 24/38] apk cache mount, httpd non root, minimal healthcheck, start.sh cleanup * httpd now runs a non root user (apache) with uid/gid 4101 for the fhir_proxy image and uid/gid 4202 for the bpe_proxy image * Added cache mount for apk files * Indentation cleanup start.sh file * Start of httpd-foreground now via "exec httpd-foreground" to run as PID 1 for direct signal handling * Removed the "Not creating ... , file exists" log message, as a second or further start of the contained would always produce this message --- dsf-docker/bpe_proxy/Dockerfile | 19 +++++++++++------ dsf-docker/bpe_proxy/start.sh | 36 ++++++++++++++++---------------- dsf-docker/fhir_proxy/Dockerfile | 19 +++++++++++------ dsf-docker/fhir_proxy/start.sh | 36 ++++++++++++++++---------------- 4 files changed, 62 insertions(+), 48 deletions(-) diff --git a/dsf-docker/bpe_proxy/Dockerfile b/dsf-docker/bpe_proxy/Dockerfile index b57eb7443..53da4bb89 100644 --- a/dsf-docker/bpe_proxy/Dockerfile +++ b/dsf-docker/bpe_proxy/Dockerfile @@ -3,13 +3,18 @@ LABEL org.opencontainers.image.source=https://github.com/datasharingframework/ds LABEL org.opencontainers.image.description="DSF BPE Reverse Proxy" LABEL org.opencontainers.image.licenses="Apache License, Version 2.0" +RUN --mount=type=cache,target=/etc/apk/cache \ + apk update && apk upgrade && apk -q add libcap && \ + setcap 'cap_net_bind_service=+ep' /usr/local/apache2/bin/httpd && \ + addgroup -g 4202 apache && adduser -S -H -u 4202 -G apache apache + WORKDIR /usr/local/apache2 COPY ./ ./ -RUN chown daemon:daemon ./ca/ && \ - chmod 750 ./ca/ ./start.sh && \ - chmod 440 ./ca/client_cert_ca_chains.pem ./ca/client_cert_issuing_cas.pem && \ - chmod 644 ./conf/httpd.conf ./conf/extra/host.conf ./conf/extra/host-ssl.conf ./conf/extra/httpd-ssl.conf && \ - apk update && apk upgrade && rm -vrf /var/cache/apk/* + +RUN chmod 750 ./ca/ ./start.sh && \ + chmod 440 ./ca/client_cert_ca_chains.pem ./ca/client_cert_issuing_cas.pem && \ + chmod 640 ./conf/httpd.conf ./conf/extra/host.conf ./conf/extra/host-ssl.conf ./conf/extra/httpd-ssl.conf && \ + chown -hR apache:apache /usr/local/apache2/ # setting non existing default values, see host-ssl.conf IfFile tests ENV SSL_CERTIFICATE_CHAIN_FILE="/does/not/exist" @@ -44,4 +49,6 @@ ENV PROXY_PASS_CONNECTION_TIMEOUT_WS=30 # server context path: / character at start, no / character at end ENV SERVER_CONTEXT_PATH="/bpe" -ENTRYPOINT [ "sh", "./start.sh" ] \ No newline at end of file +USER apache +ENTRYPOINT [ "sh", "./start.sh" ] +HEALTHCHECK --interval=10s --timeout=15s --start-period=10s --retries=5 CMD nc -zv localhost 80 && nc -zv localhost 443 || exit 1 \ No newline at end of file diff --git a/dsf-docker/bpe_proxy/start.sh b/dsf-docker/bpe_proxy/start.sh index 1f83dc1c8..38dcd2b51 100644 --- a/dsf-docker/bpe_proxy/start.sh +++ b/dsf-docker/bpe_proxy/start.sh @@ -1,39 +1,39 @@ #!/bin/sh is_comma_separated_list() { - echo "$1" | grep -qE "^(\'[^\']+\')(,\s*\'[^\']+\')*$" + echo "$1" | grep -qE "^(\'[^\']+\')(,\s*\'[^\']+\')*$" } if [ -z "$SSL_EXPECTED_CLIENT_S_DN_C_VALUES" ]; then - echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES environment variable not set" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES environment variable not set" + exit 1 fi if ! is_comma_separated_list "$SSL_EXPECTED_CLIENT_S_DN_C_VALUES"; then - echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES must be a comma-separated list of strings in single quotation marks" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES must be a comma-separated list of strings in single quotation marks" + exit 1 fi if [ -z "$SSL_EXPECTED_CLIENT_I_DN_CN_VALUES" ]; then - echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES environment variable not set" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES environment variable not set" + exit 1 fi if ! is_comma_separated_list "$SSL_EXPECTED_CLIENT_I_DN_CN_VALUES"; then - echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES must be a comma-separated list of strings in single quotation marks" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES must be a comma-separated list of strings in single quotation marks" + exit 1 fi if [ "$SSL_VERIFY_CLIENT" != "optional" ] && [ "$SSL_VERIFY_CLIENT" != "require" ]; then - echo "Error: SSL_VERIFY_CLIENT must be set to either 'optional' or 'require'" - exit 1 + echo "Error: SSL_VERIFY_CLIENT must be set to either 'optional' or 'require'" + exit 1 fi out="./conf/extra/certificate_require_expr.conf" -if [ -e "$out" ]; then - echo "Info: Not creating $out, file exists" -elif [ "$SSL_VERIFY_CLIENT" == "optional" ]; then - echo "Require expr \"%{SSL_CLIENT_VERIFY} == 'NONE' || %{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" -elif [ "$SSL_VERIFY_CLIENT" == "require" ]; then - echo "Require expr \"%{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" +if [ ! -f "$out" ]; then + if [ "$SSL_VERIFY_CLIENT" == "optional" ]; then + echo "Require expr \"%{SSL_CLIENT_VERIFY} == 'NONE' || %{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" + elif [ "$SSL_VERIFY_CLIENT" == "require" ]; then + echo "Require expr \"%{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" + fi fi -httpd-foreground \ No newline at end of file +exec httpd-foreground \ No newline at end of file diff --git a/dsf-docker/fhir_proxy/Dockerfile b/dsf-docker/fhir_proxy/Dockerfile index 115969fa1..a7820518f 100755 --- a/dsf-docker/fhir_proxy/Dockerfile +++ b/dsf-docker/fhir_proxy/Dockerfile @@ -3,13 +3,18 @@ LABEL org.opencontainers.image.source=https://github.com/datasharingframework/ds LABEL org.opencontainers.image.description="DSF FHIR Reverse Proxy" LABEL org.opencontainers.image.licenses="Apache License, Version 2.0" +RUN --mount=type=cache,target=/etc/apk/cache \ + apk update && apk upgrade && apk -q add libcap && \ + setcap 'cap_net_bind_service=+ep' /usr/local/apache2/bin/httpd && \ + addgroup -g 4101 apache && adduser -S -H -u 4101 -G apache apache + WORKDIR /usr/local/apache2 COPY ./ ./ -RUN chown daemon:daemon ./ca/ && \ - chmod 750 ./ca/ ./start.sh && \ - chmod 440 ./ca/client_cert_ca_chains.pem ./ca/client_cert_issuing_cas.pem && \ - chmod 644 ./conf/httpd.conf ./conf/extra/host.conf ./conf/extra/host-ssl.conf ./conf/extra/httpd-ssl.conf && \ - apk update && apk upgrade && rm -vrf /var/cache/apk/* + +RUN chmod 750 ./ca/ ./start.sh && \ + chmod 440 ./ca/client_cert_ca_chains.pem ./ca/client_cert_issuing_cas.pem && \ + chmod 640 ./conf/httpd.conf ./conf/extra/host.conf ./conf/extra/host-ssl.conf ./conf/extra/httpd-ssl.conf && \ + chown -hR apache:apache /usr/local/apache2/ # setting non existing default values, see host-ssl.conf IfFile tests ENV SSL_CERTIFICATE_CHAIN_FILE="/does/not/exist" @@ -44,4 +49,6 @@ ENV PROXY_PASS_CONNECTION_TIMEOUT_WS=30 # server context path: / character at start, no / character at end ENV SERVER_CONTEXT_PATH="/fhir" -ENTRYPOINT [ "sh", "./start.sh" ] \ No newline at end of file +USER apache +ENTRYPOINT [ "sh", "./start.sh" ] +HEALTHCHECK --interval=10s --timeout=15s --start-period=10s --retries=5 CMD nc -zv localhost 80 && nc -zv localhost 443 || exit 1 \ No newline at end of file diff --git a/dsf-docker/fhir_proxy/start.sh b/dsf-docker/fhir_proxy/start.sh index 1f83dc1c8..38dcd2b51 100644 --- a/dsf-docker/fhir_proxy/start.sh +++ b/dsf-docker/fhir_proxy/start.sh @@ -1,39 +1,39 @@ #!/bin/sh is_comma_separated_list() { - echo "$1" | grep -qE "^(\'[^\']+\')(,\s*\'[^\']+\')*$" + echo "$1" | grep -qE "^(\'[^\']+\')(,\s*\'[^\']+\')*$" } if [ -z "$SSL_EXPECTED_CLIENT_S_DN_C_VALUES" ]; then - echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES environment variable not set" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES environment variable not set" + exit 1 fi if ! is_comma_separated_list "$SSL_EXPECTED_CLIENT_S_DN_C_VALUES"; then - echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES must be a comma-separated list of strings in single quotation marks" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_S_DN_C_VALUES must be a comma-separated list of strings in single quotation marks" + exit 1 fi if [ -z "$SSL_EXPECTED_CLIENT_I_DN_CN_VALUES" ]; then - echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES environment variable not set" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES environment variable not set" + exit 1 fi if ! is_comma_separated_list "$SSL_EXPECTED_CLIENT_I_DN_CN_VALUES"; then - echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES must be a comma-separated list of strings in single quotation marks" - exit 1 + echo "Error: SSL_EXPECTED_CLIENT_I_DN_CN_VALUES must be a comma-separated list of strings in single quotation marks" + exit 1 fi if [ "$SSL_VERIFY_CLIENT" != "optional" ] && [ "$SSL_VERIFY_CLIENT" != "require" ]; then - echo "Error: SSL_VERIFY_CLIENT must be set to either 'optional' or 'require'" - exit 1 + echo "Error: SSL_VERIFY_CLIENT must be set to either 'optional' or 'require'" + exit 1 fi out="./conf/extra/certificate_require_expr.conf" -if [ -e "$out" ]; then - echo "Info: Not creating $out, file exists" -elif [ "$SSL_VERIFY_CLIENT" == "optional" ]; then - echo "Require expr \"%{SSL_CLIENT_VERIFY} == 'NONE' || %{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" -elif [ "$SSL_VERIFY_CLIENT" == "require" ]; then - echo "Require expr \"%{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" +if [ ! -f "$out" ]; then + if [ "$SSL_VERIFY_CLIENT" == "optional" ]; then + echo "Require expr \"%{SSL_CLIENT_VERIFY} == 'NONE' || %{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" + elif [ "$SSL_VERIFY_CLIENT" == "require" ]; then + echo "Require expr \"%{SSL_CLIENT_S_DN_C} in { $SSL_EXPECTED_CLIENT_S_DN_C_VALUES } && %{SSL_CLIENT_I_DN_CN} in { $SSL_EXPECTED_CLIENT_I_DN_CN_VALUES }\"" > "$out" + fi fi -httpd-foreground \ No newline at end of file +exec httpd-foreground \ No newline at end of file From 77c393afbb20fa534e557ec43049d4c71ba589dc Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 30 Sep 2025 20:36:45 +0200 Subject: [PATCH 25/38] improved error handling, added retries for slow postgresql starts * Added retries for postgresql error messages: "the database system is starting up" and "the database system is not yet accepting connections" --- .../java/dev/dsf/tools/db/DbMigrator.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java b/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java index f7f5c6ad9..abd5fd9e7 100755 --- a/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java +++ b/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java @@ -8,9 +8,11 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.Set; import org.apache.commons.dbcp2.BasicDataSource; import org.postgresql.Driver; +import org.postgresql.util.PSQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +46,6 @@ private static final class DbMigratorExceptions extends RuntimeException } } - private static final class LiquibaseConfigProvider extends AbstractMapConfigurationValueProvider { static final String LIQUIBASE_CHANGELOGLOCK_WAIT_TIME = "liquibase.changelogLockWaitTimeInMinutes"; @@ -75,6 +76,9 @@ protected String getSourceDescription() } } + private static final Set POSTGRES_TRY_AGAIN_ERROR_MESSAGES = Set.of("the database system is starting up", + "the database system is not yet accepting connections"); + private final DbMigratorConfig config; public DbMigrator(DbMigratorConfig config) @@ -210,6 +214,19 @@ else if (cause instanceof UnknownHostException && times > 1) } retryOnConnectException(--times, run); } + else if (cause instanceof PSQLException p + && POSTGRES_TRY_AGAIN_ERROR_MESSAGES.contains(p.getServerErrorMessage().getMessage()) && times > 1) + { + logger.warn("PSQLException ({}): trying again in 5s", p.getServerErrorMessage().getMessage()); + try + { + Thread.sleep(10_000); + } + catch (InterruptedException e1) + { + } + retryOnConnectException(--times, run); + } else { logger.error("Error while running liquibase: {}", e.getMessage()); From aedba99ad9ee6b3d2e708546188ab647e0b0c664 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 1 Oct 2025 12:53:44 +0200 Subject: [PATCH 26/38] maven plugin version upgrades --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index fe616f4fb..af8bafaa9 100755 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 org.apache.maven.plugins @@ -526,22 +526,22 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.2 + 3.12.0 org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 org.apache.maven.plugins maven-shade-plugin - 3.6.0 + 3.6.1 org.apache.maven.plugins @@ -556,7 +556,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 org.codehaus.mojo @@ -567,12 +567,12 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.1 + 3.5.0 net.revelc.code.formatter formatter-maven-plugin - 2.26.0 + 2.29.0 net.revelc.code @@ -602,7 +602,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.1 org.apache.maven.plugins @@ -612,7 +612,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.9.3.0 + 4.9.6.0 org.apache.maven.plugins @@ -622,12 +622,12 @@ org.apache.maven.plugins maven-pmd-plugin - 3.26.0 + 3.27.0 org.sonatype.central central-publishing-maven-plugin - 0.7.0 + 0.9.0 From 45b392e92a697ba865606a90f62db9c1399dcda9 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 1 Oct 2025 12:54:13 +0200 Subject: [PATCH 27/38] dependency version upgrades --- pom.xml | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index af8bafaa9..230e4eaf9 100755 --- a/pom.xml +++ b/pom.xml @@ -22,15 +22,15 @@ ${project.basedir} 2.0.17 - 2.24.3 - 11.0.25 - 3.1.10 + 2.25.2 + 11.0.26 + 3.1.11 2.2.0 - 6.2.7 - 2.19.0 + 6.2.11 + 2.20.0 7.23.0 5.1.0 - 1.80 + 1.82 DSF Parent POM @@ -117,7 +117,7 @@ com.sun.mail jakarta.mail - 1.6.7 + 1.6.8 org.bouncycastle @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.18.0 + 5.20.0 org.bouncycastle @@ -156,12 +156,12 @@ org.liquibase liquibase-core - 4.32.0 + 4.33.0 org.postgresql postgresql - 42.7.6 + 42.7.8 @@ -258,7 +258,8 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + 2.20 + com.fasterxml.jackson.core @@ -287,7 +288,7 @@ org.glassfish.jaxb jaxb-runtime - 4.0.5 + 4.0.6 @@ -402,17 +403,17 @@ org.apache.commons commons-compress - 1.27.1 + 1.28.0 org.apache.commons commons-text - 1.13.1 + 1.14.0 org.apache.commons commons-lang3 - 3.17.0 + 3.19.0 org.apache.httpcomponents @@ -427,7 +428,7 @@ com.google.code.gson gson - 2.13.1 + 2.13.2 org.thymeleaf @@ -438,12 +439,12 @@ commons-io commons-io - 2.19.0 + 2.20.0 commons-codec commons-codec - 1.18.0 + 1.19.0 @@ -465,7 +466,7 @@ org.yaml snakeyaml - 2.4 + 2.5 @@ -478,12 +479,12 @@ org.apache.maven maven-core - 3.9.9 + 3.9.11 org.apache.maven maven-plugin-api - 3.9.9 + 3.9.11 org.apache.maven.plugin-tools From 1c45bb62116252b1d88d35e1044823ce565d4644 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 1 Oct 2025 12:54:49 +0200 Subject: [PATCH 28/38] replaced deprecated code --- .../main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java | 5 ++++- .../src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java index 2f34d738a..5be84ed80 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java @@ -2,6 +2,7 @@ import org.hl7.fhir.r4.model.Resource; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,7 +19,9 @@ private ObjectMapperFactory() public static ObjectMapper createObjectMapper(FhirContext fhirContext) { - return JsonMapper.builder().serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY) + return JsonMapper.builder() + .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL)) + .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY)) .addModule(fhirModule(fhirContext)).disable(MapperFeature.AUTO_DETECT_CREATORS) .disable(MapperFeature.AUTO_DETECT_FIELDS) // .disable(MapperFeature.AUTO_DETECT_GETTERS).disable(MapperFeature.AUTO_DETECT_IS_GETTERS) diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java index 6d6b789f2..286424073 100755 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonGenerator.Feature; import com.fasterxml.jackson.databind.MapperFeature; @@ -16,7 +17,8 @@ public class JsonConfig public ObjectMapper objectMapper() { JsonMapper jsonMapper = JsonMapper.builder().disable(MapperFeature.DEFAULT_VIEW_INCLUSION) - .serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY) + .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL)) + .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY)) .disable(Feature.AUTO_CLOSE_TARGET).build(); return jsonMapper; From 788d8cd90c714d21cf9bee5152da770331f5bcaf Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 1 Oct 2025 13:00:29 +0200 Subject: [PATCH 29/38] camunda version upgrade 7.23.0 -> 7.24.0-alpha3 TODO: Upgrade to camnuda 7.24.0 final release --- .../camunda/postgres_engine_7.23_to_7.24.sql | 19 +++++++++++++++++++ .../db/db.camunda_engine.changelog-1.9.0.xml | 12 ++++++++++++ .../src/main/resources/db/db.changelog.xml | 2 ++ pom.xml | 2 +- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql create mode 100644 dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql new file mode 100644 index 000000000..26a3a358f --- /dev/null +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql @@ -0,0 +1,19 @@ +-- +-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH +-- under one or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information regarding copyright +-- ownership. Camunda licenses this file to you under the Apache License, +-- Version 2.0; you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +insert into ACT_GE_SCHEMA_LOG +values ('1300', CURRENT_TIMESTAMP, '7.24.0'); diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml new file mode 100644 index 000000000..0459e4f85 --- /dev/null +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml index 2885e3f16..f5f1d3f96 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml @@ -21,4 +21,6 @@ + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 230e4eaf9..af391b3ae 100755 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.2.0 6.2.11 2.20.0 - 7.23.0 + 7.24.0-alpha3 5.1.0 1.82 From 8cee4dcf97b9b58ef8faac675455adc3ba00670b Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 1 Oct 2025 14:41:30 +0200 Subject: [PATCH 30/38] adds HARICA Client Authentication ECC / RSA issuing CAs --- dsf-docker/bpe_proxy/Dockerfile | 2 +- dsf-docker/fhir_proxy/Dockerfile | 2 +- .../generator/DefaultCaFilesGenerator.java | 3 +- .../cert/HARICA_Client_Authentication_ECC.pem | 21 ++++++++++ .../cert/HARICA_Client_Authentication_RSA.pem | 39 +++++++++++++++++++ 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_ECC.pem create mode 100644 dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_RSA.pem diff --git a/dsf-docker/bpe_proxy/Dockerfile b/dsf-docker/bpe_proxy/Dockerfile index b57eb7443..ad5fe6e90 100644 --- a/dsf-docker/bpe_proxy/Dockerfile +++ b/dsf-docker/bpe_proxy/Dockerfile @@ -27,7 +27,7 @@ ENV SSL_VERIFY_CLIENT="require" ENV SSL_EXPECTED_CLIENT_S_DN_C_VALUES="'DE'" # expected client certificate issuer DN common-name (CN) values -ENV SSL_EXPECTED_CLIENT_I_DN_CN_VALUES="'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'" +ENV SSL_EXPECTED_CLIENT_I_DN_CN_VALUES="'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA Client Authentication ECC', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA Client Authentication RSA', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'" # timeout (seconds) for reverse proxy to app server http connection, time the proxy waits for a reply ENV PROXY_PASS_TIMEOUT_HTTP=60 diff --git a/dsf-docker/fhir_proxy/Dockerfile b/dsf-docker/fhir_proxy/Dockerfile index 115969fa1..9ea28d62f 100755 --- a/dsf-docker/fhir_proxy/Dockerfile +++ b/dsf-docker/fhir_proxy/Dockerfile @@ -27,7 +27,7 @@ ENV SSL_VERIFY_CLIENT="require" ENV SSL_EXPECTED_CLIENT_S_DN_C_VALUES="'DE'" # expected client certificate issuer DN common-name (CN) values -ENV SSL_EXPECTED_CLIENT_I_DN_CN_VALUES="'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'" +ENV SSL_EXPECTED_CLIENT_I_DN_CN_VALUES="'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA Client Authentication ECC', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA Client Authentication RSA', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'" # timeout (seconds) for reverse proxy to app server http connection, time the proxy waits for a reply ENV PROXY_PASS_TIMEOUT_HTTP=60 diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/src/main/java/dev/dsf/tools/generator/DefaultCaFilesGenerator.java b/dsf-tools/dsf-tools-default-ca-files-generator/src/main/java/dev/dsf/tools/generator/DefaultCaFilesGenerator.java index c350933e9..7648924c0 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/src/main/java/dev/dsf/tools/generator/DefaultCaFilesGenerator.java +++ b/dsf-tools/dsf-tools-default-ca-files-generator/src/main/java/dev/dsf/tools/generator/DefaultCaFilesGenerator.java @@ -40,7 +40,8 @@ public class DefaultCaFilesGenerator private static final List CLIENT_ONLY_ISSUING_CA_COMMON_NAMES = List.of("D-TRUST Limited Basic CA 1-2 2019", "D-TRUST Limited Basic CA 1-3 2019", "Fraunhofer User CA - G02", "GEANT eScience Personal CA 4", "GEANT eScience Personal ECC CA 4", "GEANT Personal CA 4", "GEANT Personal ECC CA 4", "GEANT S/MIME ECC 1", - "GEANT S/MIME RSA 1", "HARICA S/MIME ECC", "HARICA S/MIME RSA"); + "GEANT S/MIME RSA 1", "HARICA Client Authentication ECC", "HARICA Client Authentication RSA", + "HARICA S/MIME ECC", "HARICA S/MIME RSA"); private static final String CLIENT_CERT_ISSUING_CAS_PEM = "client_cert_issuing_cas.pem"; private static final String CLIENT_CERT_CA_CHAINS_PEM = "client_cert_ca_chains.pem"; diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_ECC.pem b/dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_ECC.pem new file mode 100644 index 000000000..357ea7721 --- /dev/null +++ b/dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_ECC.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDgTCCAwagAwIBAgIQE8HgrQAH0BtzfX3LWvJSfzAKBggqhkjOPQQDAzBvMQsw +CQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2Vh +cmNoIEluc3RpdHV0aW9ucyBDQTEnMCUGA1UEAwweSEFSSUNBIENsaWVudCBFQ0Mg +Um9vdCBDQSAyMDIxMB4XDTIxMDMxOTA5MTczOVoXDTM2MDMxNTA5MTczOFowcTEL +MAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl +YXJjaCBJbnN0aXR1dGlvbnMgQ0ExKTAnBgNVBAMMIEhBUklDQSBDbGllbnQgQXV0 +aGVudGljYXRpb24gRUNDMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqEqssLtH6Kkn +Sa4ms1u/YGAi0JW3Py7nkN33soahf1Vf8p4L3eNEaCV3/sZXeviOVEyg2O+F0PWz +gLFZdv4U//ZgLA0qjFDCtYVnB0R5y/953IpMTdgKR+cjrpveu10Lo4IBYzCCAV8w +EgYDVR0TAQH/BAgwBgEB/wIBADAfBgNVHSMEGDAWgBRSCNK+MoEl/fUal+xOXxq7 +U82QrTBXBggrBgEFBQcBAQRLMEkwRwYIKwYBBQUHMAKGO2h0dHA6Ly9yZXBvLmhh +cmljYS5nci9jZXJ0cy9IQVJJQ0EtQ2xpZW50LVJvb3QtMjAyMS1FQ0MuY2VyMEQG +A1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwOi8vcmVwby5oYXJp +Y2EuZ3IvZG9jdW1lbnRzL0NQUzATBgNVHSUEDDAKBggrBgEFBQcDAjBFBgNVHR8E +PjA8MDqgOKA2hjRodHRwOi8vY3JsLmhhcmljYS5nci9IQVJJQ0EtQ2xpZW50LVJv +b3QtMjAyMS1FQ0MuY3JsMB0GA1UdDgQWBBQqHWyH7pXv/Mkv8RzX+Dw52v+X3jAO +BgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMDaQAwZgIxAIE3QcG3SB1Dgj0a8gE7 +ZSKgA7KfGlt+/ajMitsDqHvg7RZCHFmc05ggxGbzXcu2CwIxAI0VJVUxKQbaLnm1 +u8MvlJDaH1hHCujJ3PU9lYRPg5CaOwkgvV+H5OzQhvkn4flaDw== +-----END CERTIFICATE----- diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_RSA.pem b/dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_RSA.pem new file mode 100644 index 000000000..17499bc10 --- /dev/null +++ b/dsf-tools/dsf-tools-default-ca-files-generator/src/main/resources/cert/HARICA_Client_Authentication_RSA.pem @@ -0,0 +1,39 @@ +-----BEGIN CERTIFICATE----- +MIIGzzCCBLegAwIBAgIQZvugWpzzpAYFBJWnGSeXMjANBgkqhkiG9w0BAQsFADBv +MQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl +c2VhcmNoIEluc3RpdHV0aW9ucyBDQTEnMCUGA1UEAwweSEFSSUNBIENsaWVudCBS +U0EgUm9vdCBDQSAyMDIxMB4XDTIxMDMxOTA5MTkzN1oXDTM2MDMxNTA5MTkzNlow +cTELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBS +ZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExKTAnBgNVBAMMIEhBUklDQSBDbGllbnQg +QXV0aGVudGljYXRpb24gUlNBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC +AgEAtdFg0VN118Izv7l4joORHFO+qJQ09hwRqNdfZW9g9SzSjXcAS4mz4+BlOYVC +PrdKoxs+1iVnoz6Hl1w2wf9xjTI9xQ6O6miM06CbST2rYCo58y0sV6yAs4/ptMHf +7smx1/ORdAu3AVYbqzYqoCj5gVehlIivyZKpzko7/45N9eWUs24ah3G4nMiVxTOc +RNYqw3/bfc+WvatbB6qNQRRJfebeDNQ8Hqen3DBPA9qsOf4Nfi4XDVkGgVPJZqfZ +VTE8fmZIZRq+Ujcp+JRc4V2dFRqvn9xKPA3d+nbbic+JQs24+ZqYiWrcNdYNE64d +6GlRhU3chNWFCI4RLNa7VpqoBZkFqlx2S5l83VO/G9DELikFa9nvc2BR+2h/pObG +WmWIqgQf0esW5nzy4+inufbZ4DLwQ9Bao0TMqLsi6ywdyxreFDvfzVuVxm6NWQoO +fi6uxdgwFEUp7FJ79owErc+RjNUrMzmhW1nlPtoCYaIy/7bW6VAqJ89ZftvRCCdV +5QeMOYlqdle65NjcaoXh5sC7g8pTA0VlUk2VHaHWPg13HLGQNyo0yWjtRzE6rIpl +ede96vg/bjB2edSYFUkrEZn5R71C1XhPQ945npiZ6yNv2qMlqasKuQQVEKkpi4bz +ntA0C8JUWiobnD91o1NXARIlanApakhk21b8ba0O+WsjgyECAwEAAaOCAWMwggFf +MBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0jBBgwFoAUoNYHPV4k93ugRC4kUg0Z +qisEkacwVwYIKwYBBQUHAQEESzBJMEcGCCsGAQUFBzAChjtodHRwOi8vcmVwby5o +YXJpY2EuZ3IvY2VydHMvSEFSSUNBLUNsaWVudC1Sb290LTIwMjEtUlNBLmNlcjBE +BgNVHSAEPTA7MDkGBFUdIAAwMTAvBggrBgEFBQcCARYjaHR0cDovL3JlcG8uaGFy +aWNhLmdyL2RvY3VtZW50cy9DUFMwEwYDVR0lBAwwCgYIKwYBBQUHAwIwRQYDVR0f +BD4wPDA6oDigNoY0aHR0cDovL2NybC5oYXJpY2EuZ3IvSEFSSUNBLUNsaWVudC1S +b290LTIwMjEtUlNBLmNybDAdBgNVHQ4EFgQU8qBdeyXizDQ4cBVNxXMsNAswGCYw +DgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQAr9ecjniPGgn1Le9OW +sgHWRAEAqAMnFEH7S7zlL6nzEN10kjkxWE4P6776V1rYeRWpSNbB71u2zVqAPcKD +aGiMP0I9oWlmtWxq2/JjEcf0UgRT+e9e2CleQMmTLbai1hpx08tZj/XMd6X5t78M +w4WJDfRUnfIjHcWTxu1Nkkj64rfGXI4hzjcLD7wFq6ZXVlhTe9sp5sDCfrVZHCMh +cHCu9odUF7IXPpPzJrKfB/uidE9mLt+V7DXepDJ2VCySL2JAP3yo4LdjrDEZGFZ7 +YZnHzjdeeq/dn+/DJ7BUVDVIMUQZT3MXoI5yb1PZ9JZrQ4x8jZbP3EPrbQK0RPyU +4hYjxT52BWjMlP9JXtZw4aVMaOZb9QklKzJHTtWsBrer9pi1seDC2Z2pLw6mK+Yl +NHdsk/qZ/CpK6NNrs4uWm2U3Jj7z9wFk0TCGXSS1HI024960RZTYe/3laBClflSQ +7T7xD6HwgPfNivqerXzImw87NHgM275Nd63eV/Lhw4XgH0e+NRGk8vYE6re0p6Y9 +L79OnCWtEqywdJcJ8qr3MvviOBphUXxubDYWZzy56DCACVZEKSRKkZUJIM2UEiCz +2Q9ATajqiODuPR5/lcmORxGauCkS2VIDKUekblssnemMqfrPEPllcLyLBYnlnM7e +fV8it5CZjT8kxUrFTcE3ZVkpkw== +-----END CERTIFICATE----- From 1f5237085cc670f5b36fa05d1c1417757d4c6a22 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Thu, 2 Oct 2025 21:15:27 +0200 Subject: [PATCH 31/38] Thread sleep time to 5s --- .../src/main/java/dev/dsf/tools/db/DbMigrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java b/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java index abd5fd9e7..43c2587ee 100755 --- a/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java +++ b/dsf-tools/dsf-tools-db-migration/src/main/java/dev/dsf/tools/db/DbMigrator.java @@ -220,7 +220,7 @@ else if (cause instanceof PSQLException p logger.warn("PSQLException ({}): trying again in 5s", p.getServerErrorMessage().getMessage()); try { - Thread.sleep(10_000); + Thread.sleep(5_000); } catch (InterruptedException e1) { From 6567c5c791865fc8dfbe9e579e1f6f3cd331ffd0 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Mon, 13 Oct 2025 16:18:42 +0200 Subject: [PATCH 32/38] maven plugin version upgrades --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index af391b3ae..6ac7b07bc 100755 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.1 + 3.9.0 org.codehaus.mojo @@ -603,7 +603,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.1 + 3.6.2 org.apache.maven.plugins @@ -623,7 +623,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.27.0 + 3.28.0 org.sonatype.central From f02a3f8de983c8f82d557a011a1434befcd43698 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 14 Oct 2025 12:50:30 +0200 Subject: [PATCH 33/38] camunda version upgrade to 7.24.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ac7b07bc..589c1dc06 100755 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.2.0 6.2.11 2.20.0 - 7.24.0-alpha3 + 7.24.0 5.1.0 1.82 From 72be7800c00443b8f28e10e2c9432bf1ae04e9ff Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 14 Oct 2025 14:54:37 +0200 Subject: [PATCH 34/38] QuestionnaireResponse.authored to current date for completed resources --- dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js index 6346221f6..04fd12ab1 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js @@ -224,6 +224,7 @@ function readQuestionnaireResponseAnswersFromForm() { }) questionnaireResponse.status = "completed" + questionnaireResponse.authored = new Date().toISOString() questionnaireResponse.item = newItems return valid ? questionnaireResponse : null From 639e6460129fcd39c9b5bfb0eef65a3d78e2b083 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 14 Oct 2025 15:03:33 +0200 Subject: [PATCH 35/38] 1.9.0 release --- CITATION.cff | 2 +- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 3c660e945..a06d443ef 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -25,7 +25,7 @@ preferred-citation: type: proceedings title: "Data Sharing Framework (DSF)" version: 1.9.0 -date-released: 2025-10-14 +date-released: 2025-10-21 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 444a7b764..77185e23e 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF BPE Process API v1 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index ba1b39a46..db7265444 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF BPE Server Jetty diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index a63efc1d9..f01764764 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF BPE Server diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 79ea896cb..6f9c6133c 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0-SNAPSHOT + 1.9.0 diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 1606e4717..7034a6da0 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common Auth diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index b1c0864f5..16306db83 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common Config diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index 0b874d97e..573ce46bc 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common DB diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index e788b03b0..849a8c573 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common Documentation diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index 1f6bc7173..35f83ce75 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common Jetty diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 73cf270eb..73a64e1f8 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common Status diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index 3de8f8e0e..ab69694c7 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Common UI diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index 70cef9cf4..2efb3e690 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0-SNAPSHOT + 1.9.0 diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index a5512387d..c51a42ddc 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Auth diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 888d1f748..fd63f44fe 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Rest Adapter diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index fe8da7b32..ffc013ddb 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Server Jetty diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index fb6c06fd4..d9b4fc2bf 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Server diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 16d29d5cd..9cc713d6b 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Validation @@ -106,7 +106,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 3d2795eca..efc686bc5 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Webservice Client diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index adf118398..84213271a 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF FHIR Websocket Client diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index c1227e785..c08423915 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0-SNAPSHOT + 1.9.0 diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index ee48f5a49..082820e9f 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools Build Info Reader diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index c1ef03f02..be6b60415 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools Bundle Generator diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 513ff5630..e7e73a41c 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools DB Migration diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index 22952cae2..55d51504c 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools Default CA Files Generator diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index ea54fb0e9..7516f4f2e 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools Docker Secrets Reader diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 57e361911..73d001e4c 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools Documentation Generator diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index cd004a688..6850200fc 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index b573e7d55..72558839f 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0-SNAPSHOT + 1.9.0 DSF Tools Test Data Generator diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 1b76e675d..3c6c1cb01 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0-SNAPSHOT + 1.9.0 diff --git a/pom.xml b/pom.xml index 589c1dc06..3fa484699 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.9.0-SNAPSHOT + 1.9.0 pom From 733cb3a7da79db5daddc1fd8b2e538e6732a6eaa Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Sat, 18 Oct 2025 16:41:15 +0200 Subject: [PATCH 36/38] 1.9.0 release Spring Framework version upgrade 6.2.11 -> 6.2.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fa484699..6368ab691 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 11.0.26 3.1.11 2.2.0 - 6.2.11 + 6.2.12 2.20.0 7.24.0 5.1.0 From 50051a43888ba8ee726f9e8a5d6c913dcbebd04f Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 21 Oct 2025 18:46:34 +0200 Subject: [PATCH 37/38] test-setup: increased client_max_body_size to 8G --- dsf-docker-test-setup-3dic-ttp/proxy/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dsf-docker-test-setup-3dic-ttp/proxy/nginx.conf b/dsf-docker-test-setup-3dic-ttp/proxy/nginx.conf index d9aece023..f2ae3022e 100644 --- a/dsf-docker-test-setup-3dic-ttp/proxy/nginx.conf +++ b/dsf-docker-test-setup-3dic-ttp/proxy/nginx.conf @@ -19,6 +19,8 @@ http { ssl_client_certificate /run/secrets/proxy_trusted_client_cas.pem; ssl_verify_client optional; ssl_verify_depth 2; + + client_max_body_size 8G; map $http_upgrade $connection_upgrade { default upgrade; From 74e31786613e9ef2602cef8b0ef24e61bd6a372f Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 25 Nov 2025 15:20:34 +0100 Subject: [PATCH 38/38] version to 2.0.0-SNAPSHOT --- CITATION.cff | 4 ++-- dsf-bpe/dsf-bpe-process-api-v1/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-common/dsf-common-auth/pom.xml | 2 +- dsf-common/dsf-common-config/pom.xml | 2 +- dsf-common/dsf-common-db/pom.xml | 2 +- dsf-common/dsf-common-documentation/pom.xml | 2 +- dsf-common/dsf-common-jetty/pom.xml | 2 +- dsf-common/dsf-common-status/pom.xml | 2 +- dsf-common/dsf-common-ui/pom.xml | 2 +- dsf-common/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-default-ca-files-generator/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index a06d443ef..d280ac3d6 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ preferred-citation: doi: 10.3233/SHTI210060 type: proceedings title: "Data Sharing Framework (DSF)" -version: 1.9.0 -date-released: 2025-10-21 +version: 2.0.0 +date-released: 2025-11-25 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 77185e23e..21569889b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF BPE Process API v1 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index db7265444..9ee2525a5 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF BPE Server Jetty diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index f01764764..b05f9c77e 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF BPE Server diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 6f9c6133c..94e7e35d2 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0 + 2.0.0-SNAPSHOT diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 7034a6da0..073f479a1 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common Auth diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index 16306db83..dbab88330 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common Config diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index 573ce46bc..a0df95dc8 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common DB diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index 849a8c573..1737f2623 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common Documentation diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index 35f83ce75..d8cc06feb 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common Jetty diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 73a64e1f8..64fe34f05 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common Status diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index ab69694c7..94cd4b51a 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Common UI diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index 2efb3e690..77dc3713a 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0 + 2.0.0-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index c51a42ddc..a414724ff 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Auth diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index fd63f44fe..a718f1e73 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Rest Adapter diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index ffc013ddb..14e7fa565 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Server Jetty diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index d9b4fc2bf..cf3ad951f 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Server diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 9cc713d6b..7231d8410 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Validation @@ -106,7 +106,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index efc686bc5..6255cdd8d 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Webservice Client diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index 84213271a..5fcff412d 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF FHIR Websocket Client diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index c08423915..fba8757bd 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0 + 2.0.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 082820e9f..13bc48e25 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools Build Info Reader diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index be6b60415..177e63a6b 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools Bundle Generator diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index e7e73a41c..5cb34e770 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools DB Migration diff --git a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml index 55d51504c..b42a6f540 100644 --- a/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml +++ b/dsf-tools/dsf-tools-default-ca-files-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools Default CA Files Generator diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index 7516f4f2e..f52781633 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools Docker Secrets Reader diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 73d001e4c..f1ce4ed54 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools Documentation Generator diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index 6850200fc..e33681416 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 72558839f..aa2710510 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.9.0 + 2.0.0-SNAPSHOT DSF Tools Test Data Generator diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 3c6c1cb01..3acdf428f 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.9.0 + 2.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6368ab691..a26a506c4 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.9.0 + 2.0.0-SNAPSHOT pom