Merge pull request #412 from buschlab/updateDEHubModel

update dehub model to 2.2.6
buschlab · Oct 10, 2024 · 1b71585 · 1b71585
2 parents 60cf02d + b93522b
commit 1b71585
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -10,11 +10,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '17'
+          distribution: "adopt"
+          java-version: "21"
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
@@ -25,44 +25,44 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/maven
-          ref: 061d99ff7da75f53b2b27b6193dcf2a9d254ed93
+          ref: 37dab8a52e2c38cb5d45a1c59cacaf4070c668ba
       - name: Build IMI Maven Parent
         run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout IMI Spring Parent
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/maven.spring
-          ref: 322fa274c9532b89b61d69b1785060e9c391aee4
+          ref: d716857d7e60d7e5a8fb213b93ea30c75958ad12
       - name: Build IMI Spring Parent
         run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub Parent
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.maven
-          ref: bff16bc88486891d0c8d3ba3ec22d4ad7c539749
+          ref: 2bffcdf94cb2e210caa9ea67f84bf8b2e4e56612
       - name: Build Build DataElementHub Parent
-        run: sed -i '8 i <version>11.0.0</version>' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub Spring Parent
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.maven.spring
-          ref: d3e6bed8ead13396e0a52127fef9f685aebbec84
+          ref: 657516f56f73d7ab07872a3bf736bf258c7e018c
       - name: Build DataElementHub Spring Parent
-        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+        run: sed -i 's/<version>12.0.0<\/version>/<version>13.0.0<\/version>/' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub DAL
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.dal
-          ref: 079da7a05cd4ab29cc45ee2c19749c6baa82b3ea
+          ref: 1f9cb07c4fed12dba3c09a846e89150c222efbf0
       - name: Build DataElementHub DAL
-        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=17
+        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub Model
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.model
-          ref: d67f3654b371b94394d2c7eaf8b1a83188303df4
+          ref: 0ae6275653b8b997253a1e7ad04549f95367d504
       - name: Build DataElementHub Model
-        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+        run: sed -i 's/<version>11.3.0<\/version>/<version>13.0.0<\/version>/' pom.xml && sed -i 's/<version>1.18.24<\/version>/<version>1.18.30<\/version>/' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - uses: actions/checkout@v4
       - name: Build with Maven
         run: mvn install
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -35,44 +35,44 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/maven
-          ref: 061d99ff7da75f53b2b27b6193dcf2a9d254ed93
+          ref: 37dab8a52e2c38cb5d45a1c59cacaf4070c668ba
       - name: Build IMI Maven Parent
         run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout IMI Spring Parent
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/maven.spring
-          ref: 322fa274c9532b89b61d69b1785060e9c391aee4
+          ref: d716857d7e60d7e5a8fb213b93ea30c75958ad12
       - name: Build IMI Spring Parent
         run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub Parent
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.maven
-          ref: bff16bc88486891d0c8d3ba3ec22d4ad7c539749
+          ref: 2bffcdf94cb2e210caa9ea67f84bf8b2e4e56612
       - name: Build Build DataElementHub Parent
-        run: sed -i '8 i <version>11.0.0</version>' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub Spring Parent
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.maven.spring
-          ref: d3e6bed8ead13396e0a52127fef9f685aebbec84
+          ref: 657516f56f73d7ab07872a3bf736bf258c7e018c
       - name: Build DataElementHub Spring Parent
-        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+        run: sed -i 's/<version>12.0.0<\/version>/<version>13.0.0<\/version>/' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub DAL
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.dal
-          ref: 079da7a05cd4ab29cc45ee2c19749c6baa82b3ea
+          ref: 1f9cb07c4fed12dba3c09a846e89150c222efbf0
       - name: Build DataElementHub DAL
-        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=17
+        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - name: Checkout DataElementHub Model
         uses: actions/checkout@v4
         with:
           repository: imi-frankfurt/dataelementhub.model
-          ref: d67f3654b371b94394d2c7eaf8b1a83188303df4
+          ref: 0ae6275653b8b997253a1e7ad04549f95367d504
       - name: Build DataElementHub Model
-        run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+        run: sed -i 's/<version>11.3.0<\/version>/<version>13.0.0<\/version>/' pom.xml && sed -i 's/<version>1.18.24<\/version>/<version>1.18.30<\/version>/' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
       - uses: actions/checkout@v4
       - name: Build and analyze
         env:

diff --git a/Dockerfile b/Dockerfile
@@ -1,31 +1,32 @@
-FROM maven:3-eclipse-temurin-17 as build
+FROM maven:3-eclipse-temurin-21 as build
 
 RUN apt-get update && apt-get -y install git
 
 RUN git clone https://github.com/imi-frankfurt/maven.git /maven
 WORKDIR /maven
-RUN git checkout 061d99ff7da75f53b2b27b6193dcf2a9d254ed93 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+RUN git checkout 37dab8a52e2c38cb5d45a1c59cacaf4070c668ba && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
 
 RUN git clone https://github.com/imi-frankfurt/maven.spring.git /maven-spring
 WORKDIR /maven-spring
-RUN git checkout 322fa274c9532b89b61d69b1785060e9c391aee4 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+RUN git checkout d716857d7e60d7e5a8fb213b93ea30c75958ad12 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
 
 RUN git clone https://github.com/imi-frankfurt/dataelementhub.maven.git /dehub-parent
 WORKDIR /dehub-parent
-RUN git checkout bff16bc88486891d0c8d3ba3ec22d4ad7c539749 && sed -i '8 i <version>11.0.0</version>' pom.xml
-RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+RUN git checkout 2bffcdf94cb2e210caa9ea67f84bf8b2e4e56612 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
 
 RUN git clone https://github.com/imi-frankfurt/dataelementhub.maven.spring.git /dehub-maven-spring
 WORKDIR /dehub-maven-spring
-RUN git checkout d3e6bed8ead13396e0a52127fef9f685aebbec84 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+RUN git checkout 657516f56f73d7ab07872a3bf736bf258c7e018c && sed -i 's/<version>12.0.0<\/version>/<version>13.0.0<\/version>/' pom.xml
+RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
 
 RUN git clone https://github.com/imi-frankfurt/dataelementhub.dal.git /dehub-dal
 WORKDIR /dehub-dal
-RUN git checkout 079da7a05cd4ab29cc45ee2c19749c6baa82b3ea && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=17
+RUN git checkout 1f9cb07c4fed12dba3c09a846e89150c222efbf0 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
 
 RUN git clone https://github.com/imi-frankfurt/dataelementhub.model.git /dehub-model
 WORKDIR /dehub-model
-RUN git checkout d67f3654b371b94394d2c7eaf8b1a83188303df4 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+RUN git checkout 0ae6275653b8b997253a1e7ad04549f95367d504 && sed -i 's/<version>11.3.0<\/version>/<version>13.0.0<\/version>/' pom.xml && sed -i 's/<version>1.18.24<\/version>/<version>1.18.30<\/version>/' pom.xml
+RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
 
 COPY $PWD /mtbimporter
 WORKDIR /mtbimporter

diff --git a/pom.xml b/pom.xml
@@ -120,7 +120,7 @@
     <dependency>
       <groupId>de.dataelementhub</groupId>
       <artifactId>dehub-model</artifactId>
-      <version>2.0.0</version>
+      <version>2.2.6</version>
     </dependency>
   </dependencies>
   <build>