Skip to content

Commit

Permalink
Merge pull request #207 from ehrbase/develop
Browse files Browse the repository at this point in the history 
[pull] develop from ehrbase:develop
  • Loading branch information
@crisdelta
crisdelta committed Jan 23, 2024
2 parents e581a77 + 8888f0f commit 2ba0a32
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 14 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [unreleased]
### Added
### Changed
### Fixed

## [0.32.0]
### Added
### Changed
- Upgrade openEHR_SDK to version 2.6.0 see https://github.com/ehrbase/openEHR_SDK/blob/develop/CHANGELOG.md
### Fixed
- Fix the folder audit status event type ([#1193](https://github.com/ehrbase/ehrbase/pull/1193))
- Fix OAuth2 Security Configuration for admin role and management endpoints ([#1196](https://github.com/ehrbase/ehrbase/pull/1196))
Expand Down Expand Up @@ -705,4 +711,5 @@ the next release this file will provide a proper overview.
[0.29.0]: https://github.com/ehrbase/ehrbase/compare/v0.28.0...v0.29.0
[0.30.0]: https://github.com/ehrbase/ehrbase/compare/v0.29.0...v0.30.0
[0.31.0]: https://github.com/ehrbase/ehrbase/compare/v0.30.0...v0.31.0
[unreleased]: https://github.com/ehrbase/ehrbase/compare/v0.31.0...HEAD
[0.32.0]: https://github.com/ehrbase/ehrbase/compare/v0.31.0...v0.32.0
[unreleased]: https://github.com/ehrbase/ehrbase/compare/v0.32.0...HEAD
1 change: 1 addition & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN su - postgres -c "pg_ctl -D ${PGDATA} -w start" && \
#FIXME version is fixed to 17.0.6_p10-r0 because 17.0.7 is currently broken (https://packages.adoptium.net/ui/native/apk/alpine/main/x86_64/)
ENV JAVA_HOME /usr/lib/jvm/java-17-temurin
ENV PATH $JAVA_HOME/bin:$PATH
RUN apk update && apk upgrade --no-cache
RUN wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk && \
echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories && \
su -c "apk add temurin-17=17.0.6_p10-r0" && \
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>application</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>base</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<groupId>org.ehrbase.openehr</groupId>
<artifactId>bom</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>EHRbase</name>
Expand Down Expand Up @@ -103,7 +103,7 @@
<archie.version>3.3.0</archie.version>
<commons-io.version>2.15.1</commons-io.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<ehrbase.sdk.version>2.5.0-SNAPSHOT</ehrbase.sdk.version>
<ehrbase.sdk.version>2.7.0-SNAPSHOT</ehrbase.sdk.version>
<flyway.version>8.5.13</flyway.version>
<jackson-bom.version>2.15.0</jackson-bom.version>
<javamelody.version>1.95.0</javamelody.version>
Expand Down
2 changes: 1 addition & 1 deletion jooq-pq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>jooq-pg</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.ehrbase.openehr</groupId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>bom</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
<relativePath>/bom/pom.xml</relativePath>
</parent>

<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion rest-ehr-scape/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>rest-ehr-scape</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion rest-openehr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>rest-openehr</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>service</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test-coverage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>server</artifactId>
<version>0.32.0-SNAPSHOT</version>
<version>0.33.0-SNAPSHOT</version>
</parent>

<artifactId>test-coverage</artifactId>
Expand Down

0 comments on commit 2ba0a32

Please sign in to comment.