Skip to content

Commit 55b4a38

Browse files
SteffengreinerSteffengreiner
committed
Merge branch 'feature/#948-integrate-orcid-public-api-search-for-person-query' of https://github.com/qbicsoftware/data-manager-app into feature/#948-integrate-orcid-public-api-search-for-person-query
2 parents 13976fb + 3ff63c2 commit 55b4a38

File tree

36 files changed

+661
-106
lines changed

36 files changed

+661
-106
lines changed

‎.github/workflows/build_package.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
steps:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
18-
- name: Set up JDK 17
18+
- name: Set up JDK 21
1919
uses: actions/setup-java@v4
2020
with:
2121
distribution: 'zulu'
22-
java-version: '17'
22+
java-version: '21'
2323
- name: Load local Maven repository cache
2424
uses: actions/cache@v4
2525
with:

‎.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
steps:
3939
- name: Checkout repository
4040
uses: actions/checkout@v4
41-
- name: Set up JDK 17
41+
- name: Set up JDK 21
4242
uses: actions/setup-java@v4
4343
with:
4444
distribution: 'zulu'
45-
java-version: '17'
45+
java-version: '21'
4646
settings-path: ${{ github.workspace }}
4747

4848
- name: Load local Maven repository cache

‎.github/workflows/create-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
- name: Checkout repository
1515
uses: actions/checkout@v4
16-
- name: Set up JDK 17
16+
- name: Set up JDK 21
1717
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'zulu'
20-
java-version: '17'
20+
java-version: '21'
2121
settings-path: ${{ github.workspace }}
2222

2323
- name: Load local Maven repository cache

‎.github/workflows/nexus-publish-snapshots.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
steps:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'zulu'
24-
java-version: '17'
24+
java-version: '21'
2525
settings-path: ${{ github.workspace }}
2626

2727
- name: Load local Maven repository cache

‎.github/workflows/run_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
steps:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
18-
- name: Set up JDK 17
18+
- name: Set up JDK 21
1919
uses: actions/setup-java@v4
2020
with:
2121
distribution: 'zulu'
22-
java-version: '17'
22+
java-version: '21'
2323
settings-path: ${{ github.workspace }}
2424

2525
- name: Load local Maven repository cache

‎.github/workflows/sonarcloud.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
steps:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'zulu'
24-
java-version: '17'
24+
java-version: '21'
2525
- name: Load local Maven repository cache
2626
uses: actions/cache@v4
2727
with:

‎README.md

+1-11
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,7 @@ $$
255255

256256
$$
257257
\begin{aligned}
258-
\text{where } & \text{ P(x_i) is the probability of character } x_i, \\
259-
& n \text{ is the total length of the password}.
260-
\end{aligned}
261-
$$
262-
$$
263-
H = -\sum_{i=1}^{n} P(x_i) \log_2 P(x_i) \times n > 100.,
264-
$$
265-
266-
$$
267-
\begin{aligned}
268-
\text{where } & \text{ P(x_i) is the probability of character } x_i, \\
258+
\text{where } & P(x_i) \text{ is the probability of character } x_i, \\
269259
& n \text{ is the total length of the password}.
270260
\end{aligned}
271261
$$

‎application-commons/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>application-commons</artifactId>

‎broadcasting/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>broadcasting</artifactId>

‎domain-concept/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<artifactId>domain-concept</artifactId>
1313

1414
<properties>
15-
<maven.compiler.source>17</maven.compiler.source>
16-
<maven.compiler.target>17</maven.compiler.target>
15+
<maven.compiler.source>21</maven.compiler.source>
16+
<maven.compiler.target>21</maven.compiler.target>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
</properties>
1919

‎email-service-provider/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.infrastructure</groupId>
1313
<artifactId>email-service-provider</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>17</maven.compiler.source>
17-
<maven.compiler.target>17</maven.compiler.target>
16+
<maven.compiler.source>21</maven.compiler.source>
17+
<maven.compiler.target>21</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
</properties>
2020
<dependencies>
2121
<dependency>
2222
<groupId>life.qbic</groupId>
2323
<artifactId>identity</artifactId>
24-
<version>1.7.2</version>
24+
<version>1.8.2</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>life.qbic</groupId>
2929
<artifactId>project-management</artifactId>
30-
<version>1.7.2</version>
30+
<version>1.8.2</version>
3131
<scope>compile</scope>
3232
</dependency>
3333
<dependency>

‎finances-api/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.finances</groupId>
1313
<artifactId>finances-api</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>17</maven.compiler.source>
17-
<maven.compiler.target>17</maven.compiler.target>
16+
<maven.compiler.source>21</maven.compiler.source>
17+
<maven.compiler.target>21</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
</properties>
2020

‎finances-infrastructure/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<artifactId>finances-infrastructure</artifactId>
1313

1414
<properties>
15-
<maven.compiler.source>17</maven.compiler.source>
16-
<maven.compiler.target>17</maven.compiler.target>
15+
<maven.compiler.source>21</maven.compiler.source>
16+
<maven.compiler.target>21</maven.compiler.target>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
</properties>
1919
<dependencies>
2020
<dependency>
2121
<groupId>life.qbic</groupId>
2222
<artifactId>finances</artifactId>
23-
<version>1.7.2</version>
23+
<version>1.8.2</version>
2424
<scope>compile</scope>
2525
</dependency>
2626
<dependency>

‎finances/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>finances</artifactId>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>life.qbic.finances</groupId>
4040
<artifactId>finances-api</artifactId>
41-
<version>1.7.2</version>
41+
<version>1.8.2</version>
4242
<scope>compile</scope>
4343
</dependency>
4444
</dependencies>

‎identity-api/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.datamanager</groupId>
1313
<artifactId>identity-api</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>17</maven.compiler.source>
17-
<maven.compiler.target>17</maven.compiler.target>
16+
<maven.compiler.source>21</maven.compiler.source>
17+
<maven.compiler.target>21</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
</properties>
2020
<dependencies>
2121
<dependency>
2222
<groupId>life.qbic</groupId>
2323
<artifactId>application-commons</artifactId>
24-
<version>1.7.2</version>
24+
<version>1.8.2</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
</dependencies>

‎identity-infrastructure/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111
<artifactId>identity-infrastructure</artifactId>
1212
<dependencies>
1313
<dependency>
1414
<groupId>life.qbic</groupId>
1515
<artifactId>identity</artifactId>
16-
<version>1.7.2</version>
16+
<version>1.8.2</version>
1717
<scope>compile</scope>
1818
</dependency>
1919
<dependency>
@@ -30,8 +30,8 @@
3030
</dependencies>
3131

3232
<properties>
33-
<maven.compiler.source>17</maven.compiler.source>
34-
<maven.compiler.target>17</maven.compiler.target>
33+
<maven.compiler.source>21</maven.compiler.source>
34+
<maven.compiler.target>21</maven.compiler.target>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
</properties>
3737

‎identity/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -45,25 +45,25 @@
4545
<dependency>
4646
<groupId>life.qbic</groupId>
4747
<artifactId>broadcasting</artifactId>
48-
<version>1.7.2</version>
48+
<version>1.8.2</version>
4949
<scope>compile</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>life.qbic</groupId>
5353
<artifactId>application-commons</artifactId>
54-
<version>1.7.2</version>
54+
<version>1.8.2</version>
5555
<scope>compile</scope>
5656
</dependency>
5757
<dependency>
5858
<groupId>life.qbic</groupId>
5959
<artifactId>logging</artifactId>
60-
<version>1.7.2</version>
60+
<version>1.8.2</version>
6161
<scope>compile</scope>
6262
</dependency>
6363
<dependency>
6464
<groupId>life.qbic</groupId>
6565
<artifactId>domain-concept</artifactId>
66-
<version>1.7.2</version>
66+
<version>1.8.2</version>
6767
<scope>compile</scope>
6868
</dependency>
6969
<dependency>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>life.qbic.datamanager</groupId>
8888
<artifactId>identity-api</artifactId>
89-
<version>1.7.2</version>
89+
<version>1.8.2</version>
9090
<scope>compile</scope>
9191
</dependency>
9292
</dependencies>

‎logging/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>life.qbic.logging</groupId>
5555
<artifactId>subscription-api</artifactId>
56-
<version>1.7.2</version>
56+
<version>1.8.2</version>
5757
<scope>compile</scope>
5858
</dependency>
5959
</dependencies>

‎pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
99
<name>Data Manager</name>
10-
<version>1.7.2</version>
10+
<version>1.8.2</version>
1111
<modules>
1212
<module>user-interface</module>
1313
<module>identity</module>
@@ -29,10 +29,10 @@
2929
<packaging>pom</packaging>
3030

3131
<properties>
32-
<java.version>17</java.version>
32+
<java.version>21</java.version>
3333
<vaadin.version>24.4.13</vaadin.version>
34-
<maven.compiler.source>17</maven.compiler.source>
35-
<maven.compiler.target>17</maven.compiler.target>
34+
<maven.compiler.source>21</maven.compiler.source>
35+
<maven.compiler.target>21</maven.compiler.target>
3636
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<jackson.version>2.18.1</jackson.version>

0 commit comments

Comments
 (0)