Skip to content

Commit adc2455

Browse files
nr23730nr23730
committed
Merge pull request #412 from buschlab/updateDEHubModel
update dehub model to 2.2.6
2 parents 60cf02d + b93522b commit adc2455

File tree

4 files changed

+36
-35
lines changed

4 files changed

+36
-35
lines changed

‎.github/workflows/maven.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Set up JDK 17
13+
- name: Set up JDK 21
1414
uses: actions/setup-java@v4
1515
with:
16-
distribution: 'adopt'
17-
java-version: '17'
16+
distribution: "adopt"
17+
java-version: "21"
1818
- name: Cache Maven packages
1919
uses: actions/cache@v4
2020
with:
@@ -25,44 +25,44 @@ jobs:
2525
uses: actions/checkout@v4
2626
with:
2727
repository: imi-frankfurt/maven
28-
ref: 061d99ff7da75f53b2b27b6193dcf2a9d254ed93
28+
ref: 37dab8a52e2c38cb5d45a1c59cacaf4070c668ba
2929
- name: Build IMI Maven Parent
3030
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
3131
- name: Checkout IMI Spring Parent
3232
uses: actions/checkout@v4
3333
with:
3434
repository: imi-frankfurt/maven.spring
35-
ref: 322fa274c9532b89b61d69b1785060e9c391aee4
35+
ref: d716857d7e60d7e5a8fb213b93ea30c75958ad12
3636
- name: Build IMI Spring Parent
3737
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
3838
- name: Checkout DataElementHub Parent
3939
uses: actions/checkout@v4
4040
with:
4141
repository: imi-frankfurt/dataelementhub.maven
42-
ref: bff16bc88486891d0c8d3ba3ec22d4ad7c539749
42+
ref: 2bffcdf94cb2e210caa9ea67f84bf8b2e4e56612
4343
- name: Build Build DataElementHub Parent
44-
run: sed -i '8 i <version>11.0.0</version>' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
44+
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
4545
- name: Checkout DataElementHub Spring Parent
4646
uses: actions/checkout@v4
4747
with:
4848
repository: imi-frankfurt/dataelementhub.maven.spring
49-
ref: d3e6bed8ead13396e0a52127fef9f685aebbec84
49+
ref: 657516f56f73d7ab07872a3bf736bf258c7e018c
5050
- name: Build DataElementHub Spring Parent
51-
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
51+
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
5252
- name: Checkout DataElementHub DAL
5353
uses: actions/checkout@v4
5454
with:
5555
repository: imi-frankfurt/dataelementhub.dal
56-
ref: 079da7a05cd4ab29cc45ee2c19749c6baa82b3ea
56+
ref: 1f9cb07c4fed12dba3c09a846e89150c222efbf0
5757
- name: Build DataElementHub DAL
58-
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=17
58+
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
5959
- name: Checkout DataElementHub Model
6060
uses: actions/checkout@v4
6161
with:
6262
repository: imi-frankfurt/dataelementhub.model
63-
ref: d67f3654b371b94394d2c7eaf8b1a83188303df4
63+
ref: 0ae6275653b8b997253a1e7ad04549f95367d504
6464
- name: Build DataElementHub Model
65-
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
65+
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
6666
- uses: actions/checkout@v4
6767
- name: Build with Maven
6868
run: mvn install

‎.github/workflows/sonar.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
17-
- name: Set up JDK 17
17+
- name: Set up JDK 21
1818
uses: actions/setup-java@v4
1919
with:
20-
distribution: 'zulu'
21-
java-version: '17'
20+
distribution: 'adopt'
21+
java-version: '21'
2222
- name: Cache SonarCloud packages
2323
uses: actions/cache@v4
2424
with:
@@ -35,44 +35,44 @@ jobs:
3535
uses: actions/checkout@v4
3636
with:
3737
repository: imi-frankfurt/maven
38-
ref: 061d99ff7da75f53b2b27b6193dcf2a9d254ed93
38+
ref: 37dab8a52e2c38cb5d45a1c59cacaf4070c668ba
3939
- name: Build IMI Maven Parent
4040
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
4141
- name: Checkout IMI Spring Parent
4242
uses: actions/checkout@v4
4343
with:
4444
repository: imi-frankfurt/maven.spring
45-
ref: 322fa274c9532b89b61d69b1785060e9c391aee4
45+
ref: d716857d7e60d7e5a8fb213b93ea30c75958ad12
4646
- name: Build IMI Spring Parent
4747
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
4848
- name: Checkout DataElementHub Parent
4949
uses: actions/checkout@v4
5050
with:
5151
repository: imi-frankfurt/dataelementhub.maven
52-
ref: bff16bc88486891d0c8d3ba3ec22d4ad7c539749
52+
ref: 2bffcdf94cb2e210caa9ea67f84bf8b2e4e56612
5353
- name: Build Build DataElementHub Parent
54-
run: sed -i '8 i <version>11.0.0</version>' pom.xml && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
54+
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
5555
- name: Checkout DataElementHub Spring Parent
5656
uses: actions/checkout@v4
5757
with:
5858
repository: imi-frankfurt/dataelementhub.maven.spring
59-
ref: d3e6bed8ead13396e0a52127fef9f685aebbec84
59+
ref: 657516f56f73d7ab07872a3bf736bf258c7e018c
6060
- name: Build DataElementHub Spring Parent
61-
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
61+
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
6262
- name: Checkout DataElementHub DAL
6363
uses: actions/checkout@v4
6464
with:
6565
repository: imi-frankfurt/dataelementhub.dal
66-
ref: 079da7a05cd4ab29cc45ee2c19749c6baa82b3ea
66+
ref: 1f9cb07c4fed12dba3c09a846e89150c222efbf0
6767
- name: Build DataElementHub DAL
68-
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=17
68+
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
6969
- name: Checkout DataElementHub Model
7070
uses: actions/checkout@v4
7171
with:
7272
repository: imi-frankfurt/dataelementhub.model
73-
ref: d67f3654b371b94394d2c7eaf8b1a83188303df4
73+
ref: 0ae6275653b8b997253a1e7ad04549f95367d504
7474
- name: Build DataElementHub Model
75-
run: mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
75+
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
7676
- uses: actions/checkout@v4
7777
- name: Build and analyze
7878
env:

‎Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
FROM maven:3-eclipse-temurin-17 as build
1+
FROM maven:3-eclipse-temurin-21 as build
22

33
RUN apt-get update && apt-get -y install git
44

55
RUN git clone https://github.com/imi-frankfurt/maven.git /maven
66
WORKDIR /maven
7-
RUN git checkout 061d99ff7da75f53b2b27b6193dcf2a9d254ed93 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
7+
RUN git checkout 37dab8a52e2c38cb5d45a1c59cacaf4070c668ba && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
88

99
RUN git clone https://github.com/imi-frankfurt/maven.spring.git /maven-spring
1010
WORKDIR /maven-spring
11-
RUN git checkout 322fa274c9532b89b61d69b1785060e9c391aee4 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
11+
RUN git checkout d716857d7e60d7e5a8fb213b93ea30c75958ad12 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
1212

1313
RUN git clone https://github.com/imi-frankfurt/dataelementhub.maven.git /dehub-parent
1414
WORKDIR /dehub-parent
15-
RUN git checkout bff16bc88486891d0c8d3ba3ec22d4ad7c539749 && sed -i '8 i <version>11.0.0</version>' pom.xml
16-
RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
15+
RUN git checkout 2bffcdf94cb2e210caa9ea67f84bf8b2e4e56612 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
1716

1817
RUN git clone https://github.com/imi-frankfurt/dataelementhub.maven.spring.git /dehub-maven-spring
1918
WORKDIR /dehub-maven-spring
20-
RUN git checkout d3e6bed8ead13396e0a52127fef9f685aebbec84 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
19+
RUN git checkout 657516f56f73d7ab07872a3bf736bf258c7e018c && sed -i 's/<version>12.0.0<\/version>/<version>13.0.0<\/version>/' pom.xml
20+
RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
2121

2222
RUN git clone https://github.com/imi-frankfurt/dataelementhub.dal.git /dehub-dal
2323
WORKDIR /dehub-dal
24-
RUN git checkout 079da7a05cd4ab29cc45ee2c19749c6baa82b3ea && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=17
24+
RUN git checkout 1f9cb07c4fed12dba3c09a846e89150c222efbf0 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
2525

2626
RUN git clone https://github.com/imi-frankfurt/dataelementhub.model.git /dehub-model
2727
WORKDIR /dehub-model
28-
RUN git checkout d67f3654b371b94394d2c7eaf8b1a83188303df4 && mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
28+
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
29+
RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
2930

3031
COPY $PWD /mtbimporter
3132
WORKDIR /mtbimporter

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>de.dataelementhub</groupId>
122122
<artifactId>dehub-model</artifactId>
123-
<version>2.0.0</version>
123+
<version>2.2.6</version>
124124
</dependency>
125125
</dependencies>
126126
<build>

0 commit comments

Comments
 (0)