Skip to content

Commit 3171144

Browse files
hhundhhund
committed
depdendency and plugin version upgrades, large object log to debug
1 parent 973baae commit 3171144

File tree

6 files changed

+26
-31
lines changed

6 files changed

+26
-31
lines changed

‎dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/CryptoServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void validateClientCertificate(KeyStore trustStore, Collection<? extends
157157
Objects.requireNonNull(trustStore, "trustStore");
158158
Objects.requireNonNull(certificateChain, "certificateChain");
159159

160-
CertificateValidator.vaildateClientCertificate(trustStore, certificateChain);
160+
CertificateValidator.validateClientCertificate(trustStore, certificateChain);
161161
}
162162

163163
@Override
@@ -167,7 +167,7 @@ public void validateServerCertificate(KeyStore trustStore, Collection<? extends
167167
Objects.requireNonNull(trustStore, "trustStore");
168168
Objects.requireNonNull(certificateChain, "certificateChain");
169169

170-
CertificateValidator.vaildateServerCertificate(trustStore, certificateChain);
170+
CertificateValidator.validateServerCertificate(trustStore, certificateChain);
171171
}
172172

173173
@Override

‎dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ else if (!dsfServerBaseUrl.startsWith("https://"))
427427
try
428428
{
429429
X509Certificate clientCertiticate = PemReader.readCertificate(Paths.get(getDsfClientCertificateFile()));
430-
CertificateValidator.vaildateClientCertificate(getDsfClientTrustedClientCas(), clientCertiticate);
430+
CertificateValidator.validateClientCertificate(getDsfClientTrustedClientCas(), clientCertiticate);
431431
}
432432
catch (CertificateException e)
433433
{

‎dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/jdbc/LargeObjectManagerJdbc.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public OidAndSize create(InputStream inputStream) throws SQLException
5454
LargeObject largeObject = getLargeObjectManager(connection).open(oid);
5555
try (inputStream; OutputStream outputStream = largeObject.getOutputStream())
5656
{
57-
logger.info("Writing to large object '{}' ...", oid);
57+
logger.debug("Writing to large object '{}' ...", oid);
5858
long size = copy(inputStream, outputStream);
59-
logger.info("Writing to large object '{}' [Done, {} bytes]", oid, size);
59+
logger.debug("Writing to large object '{}' [Done, {} bytes]", oid, size);
6060

6161
return new OidAndSize(oid, size);
6262
}

‎dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/PropertiesConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ else if (!serverBaseUrl.startsWith("https://"))
223223
List<X509Certificate> certificates = PemReader
224224
.readCertificates(Paths.get(getDsfClientTrustedClientCasFile()));
225225
KeyStore dsfClientTrustedClientCas = KeyStoreCreator.jksForTrustedCertificates(certificates);
226-
CertificateValidator.vaildateClientCertificate(dsfClientTrustedClientCas, clientCertiticate);
226+
CertificateValidator.validateClientCertificate(dsfClientTrustedClientCas, clientCertiticate);
227227
}
228228
catch (CertificateException e)
229229
{

‎dsf-fhir/dsf-fhir-validation/src/main/java/dev/dsf/fhir/validation/ResourceValidatorImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.IOException;
44
import java.net.URISyntaxException;
5+
import java.util.List;
56
import java.util.Locale;
67
import java.util.Set;
78
import java.util.regex.Pattern;
@@ -13,6 +14,7 @@
1314
import org.hl7.fhir.instance.model.api.IBaseResource;
1415
import org.hl7.fhir.r4.model.Resource;
1516
import org.hl7.fhir.r5.model.CanonicalResource;
17+
import org.hl7.fhir.r5.model.CanonicalType;
1618
import org.hl7.fhir.r5.model.CodeSystem;
1719
import org.hl7.fhir.r5.model.Coding;
1820
import org.hl7.fhir.r5.model.ValueSet;
@@ -51,7 +53,7 @@ public IValidatorResourceFetcher setLocale(Locale locale)
5153

5254
@Override
5355
public boolean resolveURL(IResourceValidator validator, Object appContext, String path, String url, String type,
54-
boolean canonical) throws IOException, FHIRException
56+
boolean canonical, List<CanonicalType> targets) throws IOException, FHIRException
5557
{
5658
if (("urn:ietf:bcp:13".equals(url) || "urn:ietf:bcp:13|4.0.1".equals(url)
5759
|| "urn:ietf:rfc:3986".equals(url)) && "uri".equals(type) && !canonical)

‎pom.xml‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323

2424
<slf4j.version>2.0.17</slf4j.version>
2525
<log4j.version>2.24.3</log4j.version>
26-
<jetty.version>12.0.18</jetty.version>
26+
<jetty.version>12.0.21</jetty.version>
2727
<jersey.version>3.1.10</jersey.version>
2828
<tyrus.version>2.2.0</tyrus.version>
29-
<spring.version>6.2.5</spring.version>
30-
<jackson.version>2.18.3</jackson.version>
29+
<spring.version>6.2.7</spring.version>
30+
<jackson.version>2.19.0</jackson.version>
3131
<camunda.version>7.22.0</camunda.version>
3232
<hapi.fhir.version.v1>5.1.0</hapi.fhir.version.v1>
33-
<hapi.fhir.version.v2>8.0.0</hapi.fhir.version.v2>
33+
<hapi.fhir.version.v2>8.2.0</hapi.fhir.version.v2>
3434
<hapi.fhir.org.hl7.version.v2>6.4.0</hapi.fhir.org.hl7.version.v2>
35-
<hapi.fhir.version>8.0.0</hapi.fhir.version>
35+
<hapi.fhir.version>8.2.0</hapi.fhir.version>
3636
<bouncycastle.version>1.80</bouncycastle.version>
3737
<crypto-utils.version.v1>3.8.0</crypto-utils.version.v1>
38-
<crypto-utils.version.v2>5.0.0</crypto-utils.version.v2>
39-
<crypto-utils.version>5.0.0</crypto-utils.version>
40-
<apache.tika.version>3.1.0</apache.tika.version>
38+
<crypto-utils.version.v2>5.1.0</crypto-utils.version.v2>
39+
<crypto-utils.version>5.1.0</crypto-utils.version>
40+
<apache.tika.version>3.2.0</apache.tika.version>
4141
</properties>
4242

4343
<name>DSF</name>
@@ -141,7 +141,7 @@
141141
<dependency>
142142
<groupId>org.mockito</groupId>
143143
<artifactId>mockito-core</artifactId>
144-
<version>5.16.1</version>
144+
<version>5.18.0</version>
145145
</dependency>
146146
<dependency>
147147
<groupId>org.bouncycastle</groupId>
@@ -163,13 +163,12 @@
163163
<dependency>
164164
<groupId>org.liquibase</groupId>
165165
<artifactId>liquibase-core</artifactId>
166-
<version>4.31.1</version>
166+
<version>4.32.0</version>
167167
</dependency>
168168
<dependency>
169169
<groupId>org.postgresql</groupId>
170170
<artifactId>postgresql</artifactId>
171-
<!-- 42.7.4 https://github.com/pgjdbc/pgjdbc/issues/3365 -->
172-
<version>42.7.3</version>
171+
<version>42.7.6</version>
173172
</dependency>
174173

175174
<!-- hhn rwh -->
@@ -387,7 +386,7 @@
387386
<dependency>
388387
<groupId>org.apache.commons</groupId>
389388
<artifactId>commons-text</artifactId>
390-
<version>1.13.0</version>
389+
<version>1.13.1</version>
391390
</dependency>
392391
<dependency>
393392
<groupId>org.apache.commons</groupId>
@@ -407,12 +406,12 @@
407406
<dependency>
408407
<groupId>com.google.guava</groupId>
409408
<artifactId>guava</artifactId>
410-
<version>33.4.6-jre</version>
409+
<version>33.4.8-jre</version>
411410
</dependency>
412411
<dependency>
413412
<groupId>com.google.code.gson</groupId>
414413
<artifactId>gson</artifactId>
415-
<version>2.12.1</version>
414+
<version>2.13.1</version>
416415
</dependency>
417416
<dependency>
418417
<groupId>org.thymeleaf</groupId>
@@ -423,7 +422,7 @@
423422
<dependency>
424423
<groupId>commons-io</groupId>
425424
<artifactId>commons-io</artifactId>
426-
<version>2.18.0</version>
425+
<version>2.19.0</version>
427426
</dependency>
428427
<dependency>
429428
<groupId>commons-codec</groupId>
@@ -516,12 +515,12 @@
516515
<plugin>
517516
<groupId>org.apache.maven.plugins</groupId>
518517
<artifactId>maven-surefire-plugin</artifactId>
519-
<version>3.5.2</version>
518+
<version>3.5.3</version>
520519
</plugin>
521520
<plugin>
522521
<groupId>org.apache.maven.plugins</groupId>
523522
<artifactId>maven-failsafe-plugin</artifactId>
524-
<version>3.5.2</version>
523+
<version>3.5.3</version>
525524
</plugin>
526525
<plugin>
527526
<groupId>org.apache.maven.plugins</groupId>
@@ -543,12 +542,6 @@
543542
<artifactId>maven-gpg-plugin</artifactId>
544543
<version>3.2.7</version>
545544
</plugin>
546-
<plugin>
547-
<groupId>org.codehaus.mojo</groupId>
548-
<artifactId>exec-maven-plugin</artifactId>
549-
<!-- 3.3.0 not working, https://github.com/mojohaus/exec-maven-plugin/issues/247 -->
550-
<version>3.0.0</version>
551-
</plugin>
552545
<plugin>
553546
<groupId>org.apache.maven.plugins</groupId>
554547
<artifactId>maven-clean-plugin</artifactId>

0 commit comments

Comments
 (0)