Skip to content

Commit de5083b

Browse files
author
bot
committed
Merge branch 'release/v2.25.0'
2 parents e2c47f4 + 82a4a90 commit de5083b

File tree

35 files changed

+158
-188
lines changed

35 files changed

+158
-188
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Note: version releases in the 0.x.y range may introduce breaking changes.
44

5+
## [2.25.0]
6+
### Added
7+
### Changed
8+
- Removed unused libraries, bumped versions for some [#680](https://github.com/ehrbase/openEHR_SDK/pull/680)
9+
### Fixed
10+
511
## [2.24.0]
612
### Added
713
### Changed
@@ -490,3 +496,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
490496
[2.22.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.21.0...v2.22.0
491497
[2.23.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.22.0...v2.23.0
492498
[2.24.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.23.0...v2.24.0
499+
[2.25.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.24.0...v2.25.0

‎aql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.ehrbase.openehr.sdk</groupId>
2727
<artifactId>sdk-parent</artifactId>
28-
<version>2.24.0</version>
28+
<version>2.25.0</version>
2929
</parent>
3030

3131
<artifactId>aql</artifactId>

‎bom/pom.xml‎

Lines changed: 35 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<artifactId>bom</artifactId>
1010
<groupId>org.ehrbase.openehr.sdk</groupId>
11-
<version>2.24.0</version>
11+
<version>2.25.0</version>
1212
<packaging>pom</packaging>
1313

1414
<name>openEHR SDK</name>
@@ -40,40 +40,33 @@
4040
<properties>
4141
<antlr4.version>4.13.2</antlr4.version>
4242
<archie.version>3.13.0</archie.version>
43-
<assertj.version>3.27.3</assertj.version>
44-
<cglib.version>3.3.0</cglib.version>
45-
<classgraph.version>4.8.179</classgraph.version>
46-
<commons-cli.version>1.9.0</commons-cli.version>
47-
<commons-collections4.version>4.4</commons-collections4.version>
48-
<commons-io.version>2.18.0</commons-io.version>
49-
<commons-lang3.version>3.17.0</commons-lang3.version>
50-
<commons-text.version>1.13.0</commons-text.version>
51-
<ehcache.version>3.10.8</ehcache.version>
52-
<everit-json-schema.version>1.14.4</everit-json-schema.version>
53-
<guava.version>32.1.3-jre</guava.version>
54-
<gson.version>2.12.1</gson.version>
43+
<assertj.version>3.27.4</assertj.version>
44+
<classgraph.version>4.8.181</classgraph.version>
45+
<commons-cli.version>1.10.0</commons-cli.version>
46+
<commons-collections4.version>4.5.0</commons-collections4.version>
47+
<commons-io.version>2.20.0</commons-io.version>
48+
<commons-lang3.version>3.18.0</commons-lang3.version>
49+
<commons-text.version>1.14.0</commons-text.version>
5550
<httpclient.version>4.5.14</httpclient.version>
56-
<jackson-bom.version>2.18.2</jackson-bom.version>
51+
<guava.version>33.4.8-jre</guava.version>
52+
<jackson-bom.version>2.19.2</jackson-bom.version>
5753
<javapoet.version>1.13.0</javapoet.version>
5854
<javax-annotation.version>1.3.2</javax-annotation.version>
5955
<javax-cache.version>1.1.1</javax-cache.version>
6056
<javax-jaxb.version>2.3.1</javax-jaxb.version>
61-
<json.version>20231013</json.version>
62-
<json-path.version>2.9.0</json-path.version>
63-
<json-smart.version>2.5.1</json-smart.version>
64-
<jsonassert.version>1.5.3</jsonassert.version>
65-
<junit.version>5.11.4</junit.version>
57+
<jsonassert.version>2.0-rc1</jsonassert.version>
58+
<junit.version>5.13.4</junit.version>
6659
<mockito.version>4.11.0</mockito.version>
6760
<slf4j.version>1.7.36</slf4j.version>
6861
<xmlbeans.version>3.1.0</xmlbeans.version>
6962
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
70-
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
71-
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
63+
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
64+
<maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
7265
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
73-
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
66+
<maven-javadoc-plugin.version>3.11.3</maven-javadoc-plugin.version>
7467
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
75-
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
76-
<jacoco.version>0.8.12</jacoco.version>
68+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
69+
<jacoco.version>0.8.13</jacoco.version>
7770
<threeten-extra.version>1.8.0</threeten-extra.version>
7871
<jaxb-runtime.version>2.3.9</jaxb-runtime.version>
7972
<sonar.scanner.version>3.11.0.3922</sonar.scanner.version>
@@ -152,25 +145,15 @@
152145
<artifactId>example-generator</artifactId>
153146
<version>${project.version}</version>
154147
</dependency>
155-
<!-- External Dependencies -->
156-
<dependency>
157-
<groupId>cglib</groupId>
158-
<artifactId>cglib</artifactId>
159-
<version>${cglib.version}</version>
160-
</dependency>
161-
<!-- include bom-->
148+
149+
<!-- include bom -->
162150
<dependency>
163151
<groupId>com.fasterxml.jackson</groupId>
164152
<artifactId>jackson-bom</artifactId>
165153
<version>${jackson-bom.version}</version>
166154
<type>pom</type>
167155
<scope>import</scope>
168156
</dependency>
169-
<dependency>
170-
<groupId>com.github.erosb</groupId>
171-
<artifactId>everit-json-schema</artifactId>
172-
<version>${everit-json-schema.version}</version>
173-
</dependency>
174157
<dependency>
175158
<groupId>com.nedap.healthcare.archie</groupId>
176159
<artifactId>archie-utils</artifactId>
@@ -196,26 +179,6 @@
196179
<artifactId>utils</artifactId>
197180
<version>${archie.version}</version>
198181
</dependency>
199-
<dependency>
200-
<groupId>com.google.code.gson</groupId>
201-
<artifactId>gson</artifactId>
202-
<version>${gson.version}</version>
203-
</dependency>
204-
<dependency>
205-
<groupId>com.google.guava</groupId>
206-
<artifactId>guava</artifactId>
207-
<version>${guava.version}</version>
208-
</dependency>
209-
<dependency>
210-
<groupId>com.jayway.jsonpath</groupId>
211-
<artifactId>json-path</artifactId>
212-
<version>${json-path.version}</version>
213-
</dependency>
214-
<dependency>
215-
<groupId>net.minidev</groupId>
216-
<artifactId>json-smart</artifactId>
217-
<version>${json-smart.version}</version>
218-
</dependency>
219182
<dependency>
220183
<groupId>com.squareup</groupId>
221184
<artifactId>javapoet</artifactId>
@@ -281,11 +244,6 @@
281244
<artifactId>xmlbeans</artifactId>
282245
<version>${xmlbeans.version}</version>
283246
</dependency>
284-
<dependency>
285-
<groupId>org.ehcache</groupId>
286-
<artifactId>ehcache</artifactId>
287-
<version>${ehcache.version}</version>
288-
</dependency>
289247
<dependency>
290248
<groupId>org.glassfish.jaxb</groupId>
291249
<artifactId>jaxb-runtime</artifactId>
@@ -296,27 +254,30 @@
296254
<artifactId>threeten-extra</artifactId>
297255
<version>${threeten-extra.version}</version>
298256
</dependency>
299-
<dependency>
300-
<groupId>org.json</groupId>
301-
<artifactId>json</artifactId>
302-
<version>${json.version}</version>
303-
</dependency>
304257
<dependency>
305258
<groupId>org.mockito</groupId>
306259
<artifactId>mockito-core</artifactId>
307260
<version>${mockito.version}</version>
308261
</dependency>
309-
<dependency>
310-
<groupId>org.skyscreamer</groupId>
311-
<artifactId>jsonassert</artifactId>
312-
<version>${jsonassert.version}</version>
313-
</dependency>
314262
<dependency>
315263
<groupId>org.slf4j</groupId>
316264
<artifactId>slf4j-api</artifactId>
317265
<version>${slf4j.version}</version>
318266
</dependency>
267+
268+
<dependency>
269+
<groupId>com.google.guava</groupId>
270+
<artifactId>guava</artifactId>
271+
<version>${guava.version}</version>
272+
</dependency>
273+
319274
<!-- Test Dependencies -->
275+
<dependency>
276+
<groupId>org.skyscreamer</groupId>
277+
<artifactId>jsonassert</artifactId>
278+
<version>${jsonassert.version}</version>
279+
<scope>test</scope>
280+
</dependency>
320281
<dependency>
321282
<groupId>org.slf4j</groupId>
322283
<artifactId>slf4j-simple</artifactId>
@@ -339,13 +300,13 @@
339300
<dependency>
340301
<groupId>org.testcontainers</groupId>
341302
<artifactId>testcontainers</artifactId>
342-
<version>1.20.4</version>
303+
<version>1.21.3</version>
343304
<scope>test</scope>
344305
</dependency>
345306
<dependency>
346307
<groupId>org.testcontainers</groupId>
347308
<artifactId>junit-jupiter</artifactId>
348-
<version>1.20.4</version>
309+
<version>1.21.3</version>
349310
<scope>test</scope>
350311
</dependency>
351312
</dependencies>
@@ -385,7 +346,7 @@
385346
<plugin>
386347
<groupId>com.diffplug.spotless</groupId>
387348
<artifactId>spotless-maven-plugin</artifactId>
388-
<version>2.44.2</version>
349+
<version>2.46.1</version>
389350
</plugin>
390351
<plugin>
391352
<groupId>org.antlr</groupId>

‎client/pom.xml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>org.ehrbase.openehr.sdk</groupId>
2828
<artifactId>sdk-parent</artifactId>
29-
<version>2.24.0</version>
29+
<version>2.25.0</version>
3030
</parent>
3131

3232
<artifactId>client</artifactId>
@@ -89,10 +89,6 @@
8989
<groupId>io.github.classgraph</groupId>
9090
<artifactId>classgraph</artifactId>
9191
</dependency>
92-
<dependency>
93-
<groupId>com.google.guava</groupId>
94-
<artifactId>guava</artifactId>
95-
</dependency>
9692
<dependency>
9793
<groupId>org.slf4j</groupId>
9894
<artifactId>slf4j-api</artifactId>
@@ -121,11 +117,6 @@
121117
<artifactId>validation</artifactId>
122118
<scope>test</scope>
123119
</dependency>
124-
<dependency>
125-
<groupId>org.ehcache</groupId>
126-
<artifactId>ehcache</artifactId>
127-
<scope>test</scope>
128-
</dependency>
129120
<dependency>
130121
<groupId>org.junit.jupiter</groupId>
131122
<artifactId>junit-jupiter-engine</artifactId>
@@ -159,7 +150,7 @@
159150
<dependency>
160151
<groupId>org.springframework</groupId>
161152
<artifactId>spring-core</artifactId>
162-
<version>6.2.2</version>
153+
<version>6.2.11</version>
163154
<scope>test</scope>
164155
</dependency>
165156
<dependency>

‎client/src/main/java/org/ehrbase/openehr/sdk/client/openehrclient/VersionedCompositionEndpoint.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.List;
2626
import java.util.Optional;
2727
import java.util.UUID;
28-
import javax.annotation.Nullable;
2928

3029
public interface VersionedCompositionEndpoint {
3130

@@ -70,5 +69,5 @@ <T> Optional<OriginalVersion<T>> findVersionById(
7069
* @return the version of the versioned composition, or an empty {@link Optional}
7170
*/
7271
<T> Optional<OriginalVersion<T>> findVersionAtTime(
73-
UUID versionedObjectUid, @Nullable LocalDateTime versionAtTime, Class<T> clazz);
72+
UUID versionedObjectUid, LocalDateTime versionAtTime, Class<T> clazz);
7473
}

‎client/src/main/java/org/ehrbase/openehr/sdk/client/openehrclient/builder/ContributionBuilder.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.nedap.archie.rm.support.identification.ObjectVersionId;
3131
import com.nedap.archie.rm.support.identification.TerminologyId;
3232
import com.nedap.archie.rm.support.identification.UIDBasedId;
33-
import javax.annotation.Nullable;
3433
import org.ehrbase.openehr.sdk.client.openehrclient.ContributionChangeType;
3534
import org.ehrbase.openehr.sdk.response.dto.ContributionCreateDto;
3635

@@ -161,15 +160,14 @@ public ContributionBuilder addCompositionDeletion(final String precedingVersionU
161160
return this;
162161
}
163162

164-
private void updateContribution(
165-
Locatable composition, ContributionChangeType type, @Nullable String precedingVersionUid) {
163+
private void updateContribution(Locatable composition, ContributionChangeType type, String precedingVersionUid) {
166164
updateContribution(composition, type, precedingVersionUid, new OriginalVersion<>());
167165
}
168166

169167
private void updateContribution(
170-
@Nullable Locatable composition,
168+
Locatable composition,
171169
ContributionChangeType type,
172-
@Nullable String precedingVersionUid,
170+
String precedingVersionUid,
173171
OriginalVersion<Locatable> originalVersion) {
174172

175173
if (originalVersion == null) {

‎client/src/main/java/org/ehrbase/openehr/sdk/client/openehrclient/defaultrestclient/DefaultRestAqlEndpoint.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818
package org.ehrbase.openehr.sdk.client.openehrclient.defaultrestclient;
1919

20+
import com.fasterxml.jackson.core.JsonProcessingException;
2021
import com.fasterxml.jackson.core.Version;
2122
import com.fasterxml.jackson.databind.ObjectMapper;
2223
import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -26,6 +27,7 @@
2627
import com.nedap.archie.rm.datavalues.DvCodedText;
2728
import com.nedap.archie.rm.support.identification.ObjectVersionId;
2829
import java.io.IOException;
30+
import java.io.UncheckedIOException;
2931
import java.net.URI;
3032
import java.net.URISyntaxException;
3133
import java.time.temporal.TemporalAccessor;
@@ -57,7 +59,6 @@
5759
import org.ehrbase.openehr.sdk.serialisation.jsonencoding.ArchieObjectMapperProvider;
5860
import org.ehrbase.openehr.sdk.util.exception.ClientException;
5961
import org.ehrbase.openehr.sdk.webtemplate.templateprovider.TemplateProvider;
60-
import org.json.JSONObject;
6162

6263
public class DefaultRestAqlEndpoint implements AqlEndpoint {
6364

@@ -250,9 +251,12 @@ public void storeAqlQuery(Query query, StoredQueryParameter queryParameter) {
250251
throw new ClientException(INVALID_PARAMETERS_ERROR_STRING);
251252
}
252253

253-
JSONObject requestBody = new JSONObject();
254-
requestBody.put("q", query.buildAql());
255-
254+
String body;
255+
try {
256+
body = AQL_OBJECT_MAPPER.writeValueAsString(Map.of("q", query.buildAql()));
257+
} catch (JsonProcessingException e) {
258+
throw new UncheckedIOException(e);
259+
}
256260
URIBuilder uriBuilder = getBaseUriBuilder()
257261
.setPath(defaultRestClient.getConfig().getBaseUri().getPath()
258262
+ STORE_AQL_QUERY_PATH
@@ -264,7 +268,7 @@ public void storeAqlQuery(Query query, StoredQueryParameter queryParameter) {
264268
defaultRestClient.internalPut(
265269
uriBuilder.build(),
266270
Collections.emptyMap(),
267-
requestBody.toString(),
271+
body,
268272
ContentType.APPLICATION_JSON,
269273
ContentType.APPLICATION_JSON.getMimeType());
270274

‎client/src/main/java/org/ehrbase/openehr/sdk/client/openehrclient/defaultrestclient/DefaultRestVersionedCompositionEndpoint.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.List;
3535
import java.util.Optional;
3636
import java.util.UUID;
37-
import javax.annotation.Nullable;
3837
import org.apache.http.HttpResponse;
3938
import org.apache.http.HttpStatus;
4039
import org.apache.http.client.utils.URIBuilder;
@@ -102,7 +101,7 @@ public <T> Optional<OriginalVersion<T>> findVersionById(
102101

103102
@Override
104103
public <T> Optional<OriginalVersion<T>> findVersionAtTime(
105-
UUID versionedObjectUid, @Nullable LocalDateTime versionAtTime, Class<T> clazz) {
104+
UUID versionedObjectUid, LocalDateTime versionAtTime, Class<T> clazz) {
106105
try {
107106
URIBuilder uriBuilder = new URIBuilder(defaultRestClient
108107
.getConfig()

‎client/src/test/java/org/ehrbase/openehr/sdk/client/templateprovider/TestDataTemplateProvider.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
package org.ehrbase.openehr.sdk.client.templateprovider;
1919

2020
import java.io.IOException;
21-
import java.util.*;
21+
import java.util.Arrays;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
25+
import java.util.Optional;
2226
import java.util.stream.Collectors;
2327
import org.apache.xmlbeans.XmlException;
2428
import org.ehrbase.openehr.sdk.test_data.operationaltemplate.OperationalTemplateTestData;

‎example-generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>sdk-parent</artifactId>
77
<groupId>org.ehrbase.openehr.sdk</groupId>
8-
<version>2.24.0</version>
8+
<version>2.25.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)