updated pom files

SevKohler · Apr 3, 2023 · 657fe98 · 657fe98
1 parent 58c58c9
commit 657fe98
Show file tree

Hide file tree

Showing 45 changed files with 337 additions and 380 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.5</version>
+        <version>3.0.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>6.0.0</version>
+            <version>6.0.6</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -59,24 +59,12 @@
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
             <artifactId>serialisation</artifactId>
-            <version>1.22.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.26.0</version>
         </dependency>
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>
             <artifactId>client</artifactId>
-            <version>1.22.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.26.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -86,7 +74,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.3.20</version>
+            <version>6.0.6</version>
         </dependency>
         <dependency>
             <groupId>net.jcip</groupId>
@@ -96,7 +84,7 @@
         <dependency>
             <groupId>com.intuit.karate</groupId>
             <artifactId>karate-junit5</artifactId>
-            <version>1.2.0</version>
+            <version>1.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/setup/docker-compose-cdm+ehrbase.yml b/setup/docker-compose-cdm+ehrbase.yml
@@ -13,39 +13,40 @@ services:
     #    - "5433" # Publishes 5433 to other containers but NOT to host machine
     ports:
       - "5433:5432"
-
   ehrbase:
     image: ehrbase/ehrbase:next
     ports:
-      - "8080:8080"
+      - 8080:8080
     networks:
-      - ehrbase-network
+      - ehrbase-net
     environment:
-      DB_URL: jdbc:postgresql://ehrbase-db:5432/ehrbase
-      DB_USER: ehrbase
-      DB_PASS: ehrbase
+      DB_URL: jdbc:postgresql://ehrdb:5432/ehrbase
+      DB_USER_ADMIN: ehrbase
+      DB_PASS_ADMIN: ehrbase
       SECURITY_AUTHTYPE: BASIC
       SECURITY_AUTHUSER: myuser
       SECURITY_AUTHPASSWORD: myPassword432
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
-      SYSTEM_NAME: local.ehrbase.org
-      ADMIN_API_ACTIVE: 'true'
-      SERVER_DISABLESTRICTVALIDATION: 'true'
+      DB_USER: ehrbase_restricted
+      DB_PASS: ehrbase_restricted
     depends_on:
-      - ehrbase-db
+      - ehrdb
     restart: on-failure
-  ehrbase-db:
-    image: ehrbase/ehrbase-postgres:latest
+
+  ehrdb:
+    image: ehrbase/ehrbase-postgres:13.4.v2
     ports:
-      - "5432:5432"
+      - 5432:5432
     networks:
-      - ehrbase-network
+      - ehrbase-net
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      EHRBASE_USER: ehrbase
-      EHRBASE_PASSWORD: ehrbase
-networks:
-  ehrbase-network: { }
+      EHRBASE_USER_ADMIN: ehrbase
+      EHRBASE_PASSWORD_ADMIN: ehrbase
+      EHRBASE_USER: ehrbase_restricted
+      EHRBASE_PASSWORD: ehrbase_restricted
 
+networks:
+  ehrbase-net: {}
diff --git a/setup/docker-compose-ehrbase.yml b/setup/docker-compose-ehrbase.yml
@@ -1,38 +1,41 @@
 #docker-compose-only-cdm.yml
 version: '3'
+
 services:
   ehrbase:
     image: ehrbase/ehrbase:next
     ports:
-      - "8080:8080"
+      - 8080:8080
     networks:
-      - ehrbase-network
+      - ehrbase-net
     environment:
-      DB_URL: jdbc:postgresql://ehrbase-db:5432/ehrbase
-      DB_USER: ehrbase
-      DB_PASS: ehrbase
+      DB_URL: jdbc:postgresql://ehrdb:5432/ehrbase
+      DB_USER_ADMIN: ehrbase
+      DB_PASS_ADMIN: ehrbase
       SECURITY_AUTHTYPE: BASIC
       SECURITY_AUTHUSER: myuser
       SECURITY_AUTHPASSWORD: myPassword432
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
-      SYSTEM_NAME: local.ehrbase.org
-      ADMIN_API_ACTIVE: 'true'
-      SERVER_DISABLESTRICTVALIDATION: 'true'
+      DB_USER: ehrbase_restricted
+      DB_PASS: ehrbase_restricted
     depends_on:
-      - ehrbase-db
+      - ehrdb
     restart: on-failure
-  ehrbase-db:
-    image: ehrbase/ehrbase-postgres:latest
+
+  ehrdb:
+    image: ehrbase/ehrbase-postgres:13.4.v2
     ports:
-      - "5432:5432"
+      - 5432:5432
     networks:
-      - ehrbase-network
+      - ehrbase-net
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      EHRBASE_USER: ehrbase
-      EHRBASE_PASSWORD: ehrbase
-networks:
-  ehrbase-network: { }
+      EHRBASE_USER_ADMIN: ehrbase
+      EHRBASE_PASSWORD_ADMIN: ehrbase
+      EHRBASE_USER: ehrbase_restricted
+      EHRBASE_PASSWORD: ehrbase_restricted
 
+networks:
+  ehrbase-net: {}
diff --git a/setup/docker-compose-ehrbase2.yml b/setup/docker-compose-ehrbase2.yml
diff --git a/setup/docker-compose-full.yml b/setup/docker-compose-full.yml
@@ -21,35 +21,38 @@ services:
   ehrbase:
     image: ehrbase/ehrbase:next
     ports:
-      - "8080:8080"
+      - 8080:8080
     networks:
-      - ehrbase-network
+      - ehrbase-net
     environment:
-      DB_URL: jdbc:postgresql://ehrbase-db:5432/ehrbase
-      DB_USER: ehrbase
-      DB_PASS: ehrbase
+      DB_URL: jdbc:postgresql://ehrdb:5432/ehrbase
+      DB_USER_ADMIN: ehrbase
+      DB_PASS_ADMIN: ehrbase
       SECURITY_AUTHTYPE: BASIC
       SECURITY_AUTHUSER: myuser
       SECURITY_AUTHPASSWORD: myPassword432
       SECURITY_AUTHADMINUSER: myadmin
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
-      SYSTEM_NAME: local.ehrbase.org
-      ADMIN_API_ACTIVE: 'true'
-      SERVER_DISABLESTRICTVALIDATION: 'true'
+      DB_USER: ehrbase_restricted
+      DB_PASS: ehrbase_restricted
     depends_on:
-      - ehrbase-db
+      - ehrdb
     restart: on-failure
-  ehrbase-db:
-    image: ehrbase/ehrbase-postgres:latest
+
+  ehrdb:
+    image: ehrbase/ehrbase-postgres:13.4.v2
     ports:
-      - "5432:5432"
+      - 5432:5432
     networks:
-      - ehrbase-network
+      - ehrbase-net
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      EHRBASE_USER: ehrbase
-      EHRBASE_PASSWORD: ehrbase
+      EHRBASE_USER_ADMIN: ehrbase
+      EHRBASE_PASSWORD_ADMIN: ehrbase
+      EHRBASE_USER: ehrbase_restricted
+      EHRBASE_PASSWORD: ehrbase_restricted
+
   eos:
     image: ghcr.io/sevkohler/eos:latest
     volumes:

diff --git a/src/main/java/org/bih/eos/jpabase/entity/CareSite.java b/src/main/java/org/bih/eos/jpabase/entity/CareSite.java
@@ -32,17 +32,17 @@
 
 package org.bih.eos.jpabase.entity;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 
 @Entity

diff --git a/src/main/java/org/bih/eos/jpabase/entity/Concept.java b/src/main/java/org/bih/eos/jpabase/entity/Concept.java
@@ -34,14 +34,14 @@
 
 import java.util.Date;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "concept")

diff --git a/src/main/java/org/bih/eos/jpabase/entity/ConceptAncestor.java b/src/main/java/org/bih/eos/jpabase/entity/ConceptAncestor.java
@@ -34,14 +34,14 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import net.jcip.annotations.Immutable;
 

diff --git a/src/main/java/org/bih/eos/jpabase/entity/ConceptClass.java b/src/main/java/org/bih/eos/jpabase/entity/ConceptClass.java
@@ -33,14 +33,14 @@
 
 package org.bih.eos.jpabase.entity;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name="concept_class")

diff --git a/src/main/java/org/bih/eos/jpabase/entity/ConceptRelationship.java b/src/main/java/org/bih/eos/jpabase/entity/ConceptRelationship.java
@@ -35,12 +35,12 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name="concept_relationship")