Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to archie 1.0.4 #292

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Upgrade to archie 1.0.4 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
### Added

- Flat : added more test and devise fixes ( see https://github.com/ehrbase/openEHR_SDK/pull/291)
- Upgrade to Archie 1.0.4 ([#292](https://github.com/ehrbase/openEHR_SDK/pull/292))

### Fixed

Expand Down
10 changes: 9 additions & 1 deletion building/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,17 @@

<dependencies>
<dependency>
<groupId>com.github.openEHR.archie</groupId>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>archie-utils</artifactId>
</dependency>
<dependency>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>openehr-rm</artifactId>
</dependency>
<dependency>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>tools</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
Expand Down
19 changes: 15 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<antlr4.version>4.9.1</antlr4.version>
<archie.version>1.0.3</archie.version>
<archie.version>1.0.4</archie.version>
<assertj.version>3.18.1</assertj.version>
<cglib.version>3.3.0</cglib.version>
<classgraph.version>4.8.98</classgraph.version>
Expand Down Expand Up @@ -314,6 +314,7 @@
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -472,15 +473,25 @@
<version>${everit-json-schema.version}</version>
</dependency>
<dependency>
<groupId>com.github.openEHR</groupId>
<artifactId>archie</artifactId>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>archie-utils</artifactId>
<version>${archie.version}</version>
</dependency>
<dependency>
<groupId>com.github.openEHR.archie</groupId>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>openehr-rm</artifactId>
<version>${archie.version}</version>
</dependency>
<dependency>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>test-rm</artifactId>
<version>${archie.version}</version>
</dependency>
<dependency>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>tools</artifactId>
<version>${archie.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down
8 changes: 6 additions & 2 deletions response-dto/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@

<dependencies>
<dependency>
<groupId>com.github.openEHR</groupId>
<artifactId>archie</artifactId>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>openehr-rm</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
Expand Down
8 changes: 4 additions & 4 deletions serialisation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
<artifactId>serialisation</artifactId>

<dependencies>
<dependency>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>test-rm</artifactId>
</dependency>
<dependency>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>web-template</artifactId>
Expand Down Expand Up @@ -70,10 +74,6 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
<dependency>
<groupId>com.github.openEHR</groupId>
<artifactId>archie</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions terminology/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

<dependencies>
<dependency>
<groupId>com.github.openEHR</groupId>
<artifactId>archie</artifactId>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>openehr-rm</artifactId>
</dependency>
<dependency>
<groupId>org.ehrbase.openehr.sdk</groupId>
Expand Down
5 changes: 3 additions & 2 deletions validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@
<artifactId>opt-1.4</artifactId>
</dependency>
<dependency>
<groupId>com.github.openEHR</groupId>
<artifactId>archie</artifactId>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>archie-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ehrbase.openehr.sdk</groupId>
Expand Down
4 changes: 0 additions & 4 deletions web-template/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.openEHR</groupId>
<artifactId>archie</artifactId>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
Expand Down