Skip to content

Commit 4b1efc0

Browse files
hhundhhund
committed
maven plugin and dependency version upgrades
1 parent 542d9ff commit 4b1efc0

File tree

4 files changed

+34
-23
lines changed

4 files changed

+34
-23
lines changed

‎dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/ObjectMapperFactory.java‎

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

33
import org.hl7.fhir.r4.model.Resource;
44

5+
import com.fasterxml.jackson.annotation.JsonInclude;
56
import com.fasterxml.jackson.annotation.JsonInclude.Include;
67
import com.fasterxml.jackson.databind.MapperFeature;
78
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,7 +19,9 @@ private ObjectMapperFactory()
1819

1920
public static ObjectMapper createObjectMapper(FhirContext fhirContext)
2021
{
21-
return JsonMapper.builder().serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY)
22+
return JsonMapper.builder()
23+
.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
24+
.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
2225
.addModule(fhirModule(fhirContext)).disable(MapperFeature.AUTO_DETECT_CREATORS)
2326
.disable(MapperFeature.AUTO_DETECT_FIELDS)
2427
// .disable(MapperFeature.AUTO_DETECT_GETTERS).disable(MapperFeature.AUTO_DETECT_IS_GETTERS)

‎dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/ObjectMapperFactory.java‎

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

33
import org.hl7.fhir.r4.model.Resource;
44

5+
import com.fasterxml.jackson.annotation.JsonInclude;
56
import com.fasterxml.jackson.annotation.JsonInclude.Include;
67
import com.fasterxml.jackson.databind.MapperFeature;
78
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,7 +19,9 @@ private ObjectMapperFactory()
1819

1920
public static ObjectMapper createObjectMapper(FhirContext fhirContext)
2021
{
21-
return JsonMapper.builder().serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY)
22+
return JsonMapper.builder()
23+
.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
24+
.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
2225
.addModule(fhirModule(fhirContext)).disable(MapperFeature.AUTO_DETECT_CREATORS)
2326
.disable(MapperFeature.AUTO_DETECT_FIELDS).disable(MapperFeature.AUTO_DETECT_GETTERS)
2427
.disable(MapperFeature.AUTO_DETECT_IS_GETTERS).disable(MapperFeature.AUTO_DETECT_SETTERS).build();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;
55

6+
import com.fasterxml.jackson.annotation.JsonInclude;
67
import com.fasterxml.jackson.annotation.JsonInclude.Include;
78
import com.fasterxml.jackson.core.JsonGenerator.Feature;
89
import com.fasterxml.jackson.databind.MapperFeature;
@@ -16,7 +17,8 @@ public class JsonConfig
1617
public ObjectMapper objectMapper()
1718
{
1819
JsonMapper jsonMapper = JsonMapper.builder().disable(MapperFeature.DEFAULT_VIEW_INCLUSION)
19-
.serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY)
20+
.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
21+
.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
2022
.disable(Feature.AUTO_CLOSE_TARGET).build();
2123

2224
return jsonMapper;

‎pom.xml‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
<main.basedir>${project.basedir}</main.basedir>
2323

2424
<slf4j.version>2.0.17</slf4j.version>
25-
<log4j.version>2.24.3</log4j.version>
26-
<jetty.version>12.0.21</jetty.version>
27-
<jersey.version>3.1.10</jersey.version>
25+
<log4j.version>2.25.1</log4j.version>
26+
<jetty.version>12.1.0</jetty.version>
27+
<jersey.version>3.1.11</jersey.version>
2828
<tyrus.version>2.2.0</tyrus.version>
29-
<spring.version>6.2.7</spring.version>
30-
<jackson.version>2.19.0</jackson.version>
29+
<spring.version>6.2.10</spring.version>
30+
<jackson.version>2.20.0</jackson.version>
3131
<camunda.version>7.23.0</camunda.version>
3232
<hapi.fhir.version.v1>5.1.0</hapi.fhir.version.v1>
3333
<hapi.fhir.version.v2>8.2.0</hapi.fhir.version.v2>
3434
<hapi.fhir.org.hl7.version.v2>6.5.18</hapi.fhir.org.hl7.version.v2>
3535
<hapi.fhir.version>8.2.0</hapi.fhir.version>
36-
<bouncycastle.version>1.80</bouncycastle.version>
36+
<bouncycastle.version>1.81</bouncycastle.version>
3737
<crypto-utils.version.v1>3.8.0</crypto-utils.version.v1>
38-
<crypto-utils.version.v2>5.1.0</crypto-utils.version.v2>
39-
<crypto-utils.version>5.1.0</crypto-utils.version>
38+
<crypto-utils.version.v2>5.2.0</crypto-utils.version.v2>
39+
<crypto-utils.version>5.2.0</crypto-utils.version>
4040
<apache.tika.version>3.2.0</apache.tika.version>
4141
</properties>
4242

@@ -129,7 +129,7 @@
129129
<dependency>
130130
<groupId>com.sun.mail</groupId>
131131
<artifactId>jakarta.mail</artifactId>
132-
<version>1.6.7</version>
132+
<version>1.6.8</version>
133133
</dependency>
134134
<dependency>
135135
<groupId>org.bouncycastle</groupId>
@@ -146,7 +146,7 @@
146146
<dependency>
147147
<groupId>org.mockito</groupId>
148148
<artifactId>mockito-core</artifactId>
149-
<version>5.18.0</version>
149+
<version>5.19.0</version>
150150
</dependency>
151151
<dependency>
152152
<groupId>org.bouncycastle</groupId>
@@ -168,12 +168,12 @@
168168
<dependency>
169169
<groupId>org.liquibase</groupId>
170170
<artifactId>liquibase-core</artifactId>
171-
<version>4.32.0</version>
171+
<version>4.33.0</version>
172172
</dependency>
173173
<dependency>
174174
<groupId>org.postgresql</groupId>
175175
<artifactId>postgresql</artifactId>
176-
<version>42.7.6</version>
176+
<version>42.7.7</version>
177177
</dependency>
178178

179179
<!-- hhn rwh -->
@@ -274,7 +274,10 @@
274274
<dependency>
275275
<groupId>com.fasterxml.jackson.core</groupId>
276276
<artifactId>jackson-annotations</artifactId>
277-
<version>${jackson.version}</version>
277+
<!-- TODO change back to ${jackson.version} when
278+
jackson-annotations hase same version as other jackson libs
279+
again -->
280+
<version>2.20</version>
278281
</dependency>
279282
<dependency>
280283
<groupId>com.fasterxml.jackson.core</groupId>
@@ -402,12 +405,12 @@
402405
<dependency>
403406
<groupId>org.apache.commons</groupId>
404407
<artifactId>commons-text</artifactId>
405-
<version>1.13.1</version>
408+
<version>1.14.0</version>
406409
</dependency>
407410
<dependency>
408411
<groupId>org.apache.commons</groupId>
409412
<artifactId>commons-lang3</artifactId>
410-
<version>3.17.0</version>
413+
<version>3.18.0</version>
411414
</dependency>
412415
<dependency>
413416
<groupId>org.apache.httpcomponents</groupId>
@@ -438,12 +441,12 @@
438441
<dependency>
439442
<groupId>commons-io</groupId>
440443
<artifactId>commons-io</artifactId>
441-
<version>2.19.0</version>
444+
<version>2.20.0</version>
442445
</dependency>
443446
<dependency>
444447
<groupId>commons-codec</groupId>
445448
<artifactId>commons-codec</artifactId>
446-
<version>1.18.0</version>
449+
<version>1.19.0</version>
447450
</dependency>
448451

449452
<dependency>
@@ -465,7 +468,7 @@
465468
<dependency>
466469
<groupId>org.yaml</groupId>
467470
<artifactId>snakeyaml</artifactId>
468-
<version>2.4</version>
471+
<version>2.5</version>
469472
</dependency>
470473

471474
<dependency>
@@ -478,12 +481,12 @@
478481
<dependency>
479482
<groupId>org.apache.maven</groupId>
480483
<artifactId>maven-core</artifactId>
481-
<version>3.9.9</version>
484+
<version>3.9.11</version>
482485
</dependency>
483486
<dependency>
484487
<groupId>org.apache.maven</groupId>
485488
<artifactId>maven-plugin-api</artifactId>
486-
<version>3.9.9</version>
489+
<version>3.9.11</version>
487490
</dependency>
488491
<dependency>
489492
<groupId>org.apache.maven.plugin-tools</groupId>

0 commit comments

Comments
 (0)