Skip to content

Commit 6c149ae

Browse files
hhundhhund
committed
Merge remote-tracking branch
'origin/issue/308_Migrate_OSSRH_Namespace_to_Central_Portal_DSF_2x' into develop_2
2 parents 5f714d1 + 9163e7c commit 6c149ae

File tree

17 files changed

+143
-370
lines changed

17 files changed

+143
-370
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
name: Java 21 CodeQL
1+
name: DSF 2.x CodeQL
22

33
on:
44
push:
5-
branches: develop_2
5+
branches: [ "develop_2", "hotfix/2*", "release/2*" ]
66
pull_request:
7-
branches: develop_2
7+
branches: [ "develop_2", "hotfix/2*", "release/2*" ]
8+
schedule:
9+
- cron: '11 15 * * 0' # Sundays, 15:11
810

911
jobs:
1012
analyze:
@@ -39,7 +41,7 @@ jobs:
3941

4042
- name: Compile with Maven
4143
if: ${{ matrix.language == 'java-kotlin' }}
42-
run: mvn --batch-mode --fail-at-end --threads 1C -Dmaven.javadoc.skip=true -Dimpsort.skip=true -Dformatter.skip=true -Dgpg.skip -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests clean package
44+
run: mvn --batch-mode --fail-at-end --threads 1C -Dimpsort.skip=true -Dformatter.skip=true -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests -DskipShadePlugin=true -P!generate-source-and-javadoc-jars clean package
4345

4446
- name: Perform CodeQL Analysis
4547
uses: github/codeql-action/analyze@v3

‎.github/workflows/maven-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: Java 21 CI Build with Maven
1+
name: DSF 2.x Java CI Build with Maven
22

3-
on:
3+
on:
44
pull_request:
55
branches: develop_2
66

@@ -18,4 +18,4 @@ jobs:
1818
java-version: 21
1919
cache: 'maven'
2020
- name: Build with Maven
21-
run: mvn --batch-mode --fail-at-end -DforkCount=2 -Dgpg.skip clean verify
21+
run: mvn --batch-mode --fail-at-end -DforkCount=2 clean verify

‎.github/workflows/maven-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java 21 CI Publish with Maven
1+
name: DSF 2.x Java CI Publish with Maven
22

33
on:
44
pull_request:
@@ -25,4 +25,4 @@ jobs:
2525
- name: Publish with Maven
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
run: mvn --batch-mode --fail-at-end -DforkCount=2 -Dgpg.skip clean deploy
28+
run: mvn --batch-mode --fail-at-end -DforkCount=2 clean deploy

‎dsf-bpe/dsf-bpe-server/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@
1616
</dependency>
1717
<dependency>
1818
<groupId>dev.dsf</groupId>
19-
<artifactId>dsf-fhir-websocket-client</artifactId>
19+
<artifactId>dsf-common-auth</artifactId>
2020
</dependency>
2121
<dependency>
2222
<groupId>dev.dsf</groupId>
23-
<artifactId>dsf-tools-build-info-reader</artifactId>
23+
<artifactId>dsf-common-config</artifactId>
2424
</dependency>
2525
<dependency>
2626
<groupId>dev.dsf</groupId>
27-
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
27+
<artifactId>dsf-common-db</artifactId>
2828
</dependency>
2929
<dependency>
3030
<groupId>dev.dsf</groupId>
31-
<artifactId>dsf-common-auth</artifactId>
31+
<artifactId>dsf-common-documentation</artifactId>
3232
</dependency>
3333
<dependency>
3434
<groupId>dev.dsf</groupId>
35-
<artifactId>dsf-common-config</artifactId>
35+
<artifactId>dsf-common-status</artifactId>
3636
</dependency>
3737
<dependency>
3838
<groupId>dev.dsf</groupId>
39-
<artifactId>dsf-common-documentation</artifactId>
39+
<artifactId>dsf-common-ui</artifactId>
4040
</dependency>
4141
<dependency>
4242
<groupId>dev.dsf</groupId>
43-
<artifactId>dsf-common-db</artifactId>
43+
<artifactId>dsf-fhir-websocket-client</artifactId>
4444
</dependency>
4545
<dependency>
4646
<groupId>dev.dsf</groupId>
47-
<artifactId>dsf-common-status</artifactId>
47+
<artifactId>dsf-tools-build-info-reader</artifactId>
4848
</dependency>
4949
<dependency>
5050
<groupId>dev.dsf</groupId>
51-
<artifactId>dsf-common-ui</artifactId>
51+
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
5252
</dependency>
5353
<dependency>
5454
<groupId>de.hs-heilbronn.mi</groupId>

‎dsf-bpe/pom.xml‎

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
<artifactId>dsf-bpe-server</artifactId>
8888
<version>${project.version}</version>
8989
</dependency>
90-
<dependency>
91-
<groupId>dev.dsf</groupId>
92-
<artifactId>dsf-bpe-server-jetty</artifactId>
93-
<version>${project.version}</version>
94-
</dependency>
9590
<dependency>
9691
<groupId>dev.dsf</groupId>
9792
<artifactId>dsf-bpe-test-plugin</artifactId>
@@ -107,81 +102,68 @@
107102
<artifactId>dsf-bpe-test-plugin-v2</artifactId>
108103
<version>${project.version}</version>
109104
</dependency>
110-
105+
111106
<dependency>
112107
<groupId>dev.dsf</groupId>
113-
<artifactId>dsf-fhir-server</artifactId>
114-
<version>${project.version}</version>
115-
</dependency>
116-
<dependency>
117-
<groupId>dev.dsf</groupId>
118-
<artifactId>dsf-fhir-websocket-client</artifactId>
119-
<version>${project.version}</version>
120-
</dependency>
121-
122-
<dependency>
123-
<groupId>dev.dsf</groupId>
124-
<artifactId>dsf-tools-db-migration</artifactId>
108+
<artifactId>dsf-common-auth</artifactId>
125109
<version>${project.version}</version>
126110
</dependency>
127111
<dependency>
128112
<groupId>dev.dsf</groupId>
129-
<artifactId>dsf-tools-build-info-reader</artifactId>
113+
<artifactId>dsf-common-config</artifactId>
130114
<version>${project.version}</version>
131115
</dependency>
132116
<dependency>
133117
<groupId>dev.dsf</groupId>
134-
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
118+
<artifactId>dsf-common-db</artifactId>
135119
<version>${project.version}</version>
136120
</dependency>
137121
<dependency>
138122
<groupId>dev.dsf</groupId>
139-
<artifactId>dsf-tools-documentation-generator</artifactId>
123+
<artifactId>dsf-common-documentation</artifactId>
140124
<version>${project.version}</version>
141125
</dependency>
142-
143126
<dependency>
144127
<groupId>dev.dsf</groupId>
145-
<artifactId>dsf-common-auth</artifactId>
128+
<artifactId>dsf-common-jetty</artifactId>
146129
<version>${project.version}</version>
147130
</dependency>
148131
<dependency>
149132
<groupId>dev.dsf</groupId>
150-
<artifactId>dsf-common-config</artifactId>
133+
<artifactId>dsf-common-status</artifactId>
151134
<version>${project.version}</version>
152135
</dependency>
153136
<dependency>
154137
<groupId>dev.dsf</groupId>
155-
<artifactId>dsf-common-documentation</artifactId>
138+
<artifactId>dsf-common-ui</artifactId>
156139
<version>${project.version}</version>
157140
</dependency>
141+
158142
<dependency>
159143
<groupId>dev.dsf</groupId>
160-
<artifactId>dsf-common-db</artifactId>
144+
<artifactId>dsf-fhir-server</artifactId>
161145
<version>${project.version}</version>
162146
</dependency>
163147
<dependency>
164148
<groupId>dev.dsf</groupId>
165-
<artifactId>dsf-common-jetty</artifactId>
149+
<artifactId>dsf-fhir-websocket-client</artifactId>
166150
<version>${project.version}</version>
167151
</dependency>
152+
168153
<dependency>
169154
<groupId>dev.dsf</groupId>
170-
<artifactId>dsf-common-status</artifactId>
155+
<artifactId>dsf-tools-build-info-reader</artifactId>
171156
<version>${project.version}</version>
172157
</dependency>
173158
<dependency>
174159
<groupId>dev.dsf</groupId>
175-
<artifactId>dsf-common-ui</artifactId>
160+
<artifactId>dsf-tools-db-migration</artifactId>
176161
<version>${project.version}</version>
177162
</dependency>
178-
179163
<dependency>
180164
<groupId>dev.dsf</groupId>
181-
<artifactId>dsf-bpe-process-base</artifactId>
165+
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
182166
<version>${project.version}</version>
183-
<scope>test</scope>
184-
<type>test-jar</type>
185167
</dependency>
186168
</dependencies>
187169
</dependencyManagement>

‎dsf-common/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,43 +42,43 @@
4242
<dependencyManagement>
4343
<dependencies>
4444
<dependency>
45-
<groupId>${project.groupId}</groupId>
45+
<groupId>dev.dsf</groupId>
4646
<artifactId>dsf-common-auth</artifactId>
4747
<version>${project.version}</version>
4848
</dependency>
4949
<dependency>
50-
<groupId>${project.groupId}</groupId>
50+
<groupId>dev.dsf</groupId>
5151
<artifactId>dsf-common-config</artifactId>
5252
<version>${project.version}</version>
5353
</dependency>
5454
<dependency>
55-
<groupId>${project.groupId}</groupId>
55+
<groupId>dev.dsf</groupId>
5656
<artifactId>dsf-common-db</artifactId>
5757
<version>${project.version}</version>
5858
</dependency>
5959
<dependency>
60-
<groupId>${project.groupId}</groupId>
60+
<groupId>dev.dsf</groupId>
6161
<artifactId>dsf-common-documentation</artifactId>
6262
<version>${project.version}</version>
6363
</dependency>
6464
<dependency>
65-
<groupId>${project.groupId}</groupId>
65+
<groupId>dev.dsf</groupId>
6666
<artifactId>dsf-common-jetty</artifactId>
6767
<version>${project.version}</version>
6868
</dependency>
6969
<dependency>
70-
<groupId>${project.groupId}</groupId>
70+
<groupId>dev.dsf</groupId>
7171
<artifactId>dsf-common-status</artifactId>
7272
<version>${project.version}</version>
7373
</dependency>
7474
<dependency>
75-
<groupId>${project.groupId}</groupId>
75+
<groupId>dev.dsf</groupId>
7676
<artifactId>dsf-common-ui</artifactId>
7777
<version>${project.version}</version>
7878
</dependency>
7979

8080
<dependency>
81-
<groupId>${project.groupId}</groupId>
81+
<groupId>dev.dsf</groupId>
8282
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
8383
<version>${project.version}</version>
8484
</dependency>

‎dsf-fhir/dsf-fhir-server-jetty/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,21 @@
1212
<dependencies>
1313
<dependency>
1414
<groupId>dev.dsf</groupId>
15-
<artifactId>dsf-fhir-server</artifactId>
15+
<artifactId>dsf-common-documentation</artifactId>
1616
</dependency>
1717
<dependency>
1818
<groupId>dev.dsf</groupId>
19-
<artifactId>dsf-tools-db-migration</artifactId>
19+
<artifactId>dsf-common-jetty</artifactId>
2020
</dependency>
2121
<dependency>
2222
<groupId>dev.dsf</groupId>
23-
<artifactId>dsf-common-documentation</artifactId>
23+
<artifactId>dsf-fhir-server</artifactId>
2424
</dependency>
2525
<dependency>
2626
<groupId>dev.dsf</groupId>
27-
<artifactId>dsf-common-jetty</artifactId>
27+
<artifactId>dsf-tools-db-migration</artifactId>
2828
</dependency>
29+
2930
<dependency>
3031
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
3132
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>

‎dsf-fhir/dsf-fhir-server/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@
1212
<dependencies>
1313
<dependency>
1414
<groupId>dev.dsf</groupId>
15-
<artifactId>dsf-fhir-rest-adapter</artifactId>
15+
<artifactId>dsf-fhir-auth</artifactId>
1616
</dependency>
1717
<dependency>
1818
<groupId>dev.dsf</groupId>
19-
<artifactId>dsf-fhir-webservice-client</artifactId>
19+
<artifactId>dsf-fhir-rest-adapter</artifactId>
2020
</dependency>
2121
<dependency>
2222
<groupId>dev.dsf</groupId>
23-
<artifactId>dsf-tools-build-info-reader</artifactId>
23+
<artifactId>dsf-fhir-validation</artifactId>
2424
</dependency>
2525
<dependency>
2626
<groupId>dev.dsf</groupId>
27-
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
27+
<artifactId>dsf-fhir-webservice-client</artifactId>
2828
</dependency>
2929
<dependency>
3030
<groupId>dev.dsf</groupId>
31-
<artifactId>dsf-fhir-validation</artifactId>
31+
<artifactId>dsf-tools-build-info-reader</artifactId>
3232
</dependency>
3333
<dependency>
3434
<groupId>dev.dsf</groupId>
35-
<artifactId>dsf-fhir-auth</artifactId>
35+
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
3636
</dependency>
3737
<dependency>
3838
<groupId>dev.dsf</groupId>

‎dsf-fhir/dsf-fhir-websocket-client/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
<groupId>org.glassfish.tyrus</groupId>
2929
<artifactId>tyrus-container-grizzly-client</artifactId>
3030
</dependency>
31-
<dependency>
32-
<groupId>de.hs-heilbronn.mi</groupId>
33-
<artifactId>crypto-utils</artifactId>
34-
<version>${crypto-utils.version}</version>
35-
</dependency>
3631

3732
<dependency>
3833
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)