Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 4114475

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3449: Define deps of sormas-api as Domain libs (compile for sormas-app)
1 parent e4a005c commit 4114475

6 files changed

Lines changed: 169 additions & 24 deletions

File tree

‎sormas-app/app/build.gradle‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ dependencies {
9292
implementation 'com.google.firebase:firebase-analytics:17.2.2'
9393
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
9494
implementation("de.symeda.sormas:sormas-api:$sormasVersion") { changing = true }
95+
implementation 'com.github.mpkorstanje:simmetrics-core:4.1.1'
96+
implementation 'com.google.guava:guava:19.0'
97+
implementation 'com.opencsv:opencsv:5.3'
98+
implementation 'commons-beanutils:commons-beanutils:1.9.2'
99+
implementation 'commons-codec:commons-codec:1.9'
100+
implementation 'commons-collections:commons-collections:3.2.2'
101+
implementation 'commons-logging:commons-logging:1.2'
102+
implementation 'joda-time:joda-time:2.9.4'
103+
implementation 'org.apache.commons:commons-collections4:4.4'
104+
implementation 'org.apache.commons:commons-lang3:3.10'
105+
implementation 'org.apache.commons:commons-text:1.9'
95106
implementation 'com.googlecode:openbeans:1.0'
96107
implementation files('libs/MPAndroidChart-v3.0.2.jar')
97108
implementation(name: 'CircleProgress-v1.2.1', ext: 'aar')

‎sormas-backend/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
<artifactId>commons-lang3</artifactId>
3030
</dependency>
3131

32+
<dependency>
33+
<groupId>com.opencsv</groupId>
34+
<artifactId>opencsv</artifactId>
35+
</dependency>
36+
3237
<dependency>
3338
<groupId>commons-validator</groupId>
3439
<artifactId>commons-validator</artifactId>

‎sormas-base/dependencies/serverlibs.pom‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,21 @@
3333
<artifactId>jackson-jaxrs-json-provider</artifactId>
3434
</dependency>
3535

36+
<dependency>
37+
<groupId>com.github.mpkorstanje</groupId>
38+
<artifactId>simmetrics-core</artifactId>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>com.google.guava</groupId>
43+
<artifactId>guava</artifactId>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>com.opencsv</groupId>
48+
<artifactId>opencsv</artifactId>
49+
</dependency>
50+
3651
<dependency>
3752
<groupId>com.vaadin</groupId>
3853
<artifactId>vaadin-themes</artifactId>
@@ -43,11 +58,46 @@
4358
<artifactId>hibernate-types-52</artifactId>
4459
</dependency>
4560

61+
<dependency>
62+
<groupId>commons-beanutils</groupId>
63+
<artifactId>commons-beanutils</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>commons-codec</groupId>
67+
<artifactId>commons-codec</artifactId>
68+
</dependency>
69+
<dependency>
70+
<groupId>commons-collections</groupId>
71+
<artifactId>commons-collections</artifactId>
72+
</dependency>
73+
<dependency>
74+
<groupId>commons-logging</groupId>
75+
<artifactId>commons-logging</artifactId>
76+
</dependency>
77+
78+
<dependency>
79+
<groupId>joda-time</groupId>
80+
<artifactId>joda-time</artifactId>
81+
</dependency>
82+
4683
<dependency>
4784
<groupId>org.apache.httpcomponents</groupId>
4885
<artifactId>httpclient</artifactId>
4986
</dependency>
5087

88+
<dependency>
89+
<groupId>org.apache.commons</groupId>
90+
<artifactId>commons-collections4</artifactId>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.apache.commons</groupId>
94+
<artifactId>commons-lang3</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.apache.commons</groupId>
98+
<artifactId>commons-text</artifactId>
99+
</dependency>
100+
51101
<dependency>
52102
<groupId>org.bouncycastle</groupId>
53103
<artifactId>bcpkix-jdk15on</artifactId>

‎sormas-base/pom.xml‎

Lines changed: 93 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<bouncycastle.version>1.66</bouncycastle.version>
3434
<keycloak.version>11.0.0</keycloak.version>
3535

36+
<!-- Attention: Compile dependencies with versions are maintained redundantly in sormas-app/app/build.gradle -->
37+
3638
</properties>
3739

3840
<dependencyManagement>
@@ -324,6 +326,46 @@
324326
<artifactId>jackson-jaxrs-json-provider</artifactId>
325327
<version>${jackson.version}</version>
326328
<scope>provided</scope>
329+
<exclusions>
330+
<!-- Exclude Payara modules here -->
331+
<exclusion>
332+
<groupId>com.fasterxml.jackson.core</groupId>
333+
<artifactId>jackson-annotations</artifactId>
334+
</exclusion>
335+
<exclusion>
336+
<groupId>com.fasterxml.jackson.core</groupId>
337+
<artifactId>jackson-core</artifactId>
338+
</exclusion>
339+
<exclusion>
340+
<groupId>com.fasterxml.jackson.core</groupId>
341+
<artifactId>jackson-databind</artifactId>
342+
</exclusion>
343+
<exclusion>
344+
<groupId>com.fasterxml.jackson.module</groupId>
345+
<artifactId>jackson-module-jaxb-annotations</artifactId>
346+
</exclusion>
347+
</exclusions>
348+
</dependency>
349+
350+
<dependency>
351+
<groupId>com.github.mpkorstanje</groupId>
352+
<artifactId>simmetrics-core</artifactId>
353+
<version>4.1.1</version>
354+
<scope>provided</scope>
355+
</dependency>
356+
357+
<dependency>
358+
<groupId>com.google.guava</groupId>
359+
<artifactId>guava</artifactId>
360+
<version>19.0</version>
361+
<scope>provided</scope>
362+
</dependency>
363+
364+
<dependency>
365+
<groupId>com.opencsv</groupId>
366+
<artifactId>opencsv</artifactId>
367+
<version>5.3</version>
368+
<scope>provided</scope>
327369
</dependency>
328370

329371
<dependency>
@@ -333,6 +375,38 @@
333375
<scope>provided</scope>
334376
</dependency>
335377

378+
<dependency>
379+
<groupId>commons-beanutils</groupId>
380+
<artifactId>commons-beanutils</artifactId>
381+
<version>1.9.2</version>
382+
<scope>provided</scope>
383+
</dependency>
384+
<dependency>
385+
<groupId>commons-codec</groupId>
386+
<artifactId>commons-codec</artifactId>
387+
<version>1.9</version>
388+
<scope>provided</scope>
389+
</dependency>
390+
<dependency>
391+
<groupId>commons-collections</groupId>
392+
<artifactId>commons-collections</artifactId>
393+
<version>3.2.2</version>
394+
<scope>provided</scope>
395+
</dependency>
396+
<dependency>
397+
<groupId>commons-logging</groupId>
398+
<artifactId>commons-logging</artifactId>
399+
<version>1.2</version>
400+
<scope>provided</scope>
401+
</dependency>
402+
403+
<dependency>
404+
<groupId>joda-time</groupId>
405+
<artifactId>joda-time</artifactId>
406+
<version>2.9.4</version>
407+
<scope>provided</scope>
408+
</dependency>
409+
336410
<dependency>
337411
<groupId>org.apache.httpcomponents</groupId>
338412
<artifactId>httpclient</artifactId>
@@ -346,6 +420,25 @@
346420
<scope>provided</scope>
347421
</dependency>
348422

423+
<dependency>
424+
<groupId>org.apache.commons</groupId>
425+
<artifactId>commons-collections4</artifactId>
426+
<version>4.4</version>
427+
<scope>provided</scope>
428+
</dependency>
429+
<dependency>
430+
<groupId>org.apache.commons</groupId>
431+
<artifactId>commons-lang3</artifactId>
432+
<version>3.10</version>
433+
<scope>provided</scope>
434+
</dependency>
435+
<dependency>
436+
<groupId>org.apache.commons</groupId>
437+
<artifactId>commons-text</artifactId>
438+
<version>1.9</version>
439+
<scope>provided</scope>
440+
</dependency>
441+
349442
<dependency>
350443
<groupId>org.bouncycastle</groupId>
351444
<artifactId>bcpkix-jdk15on</artifactId>
@@ -544,29 +637,12 @@
544637

545638
<!-- compile dependencies -->
546639

547-
<dependency>
548-
<groupId>org.apache.commons</groupId>
549-
<artifactId>commons-lang3</artifactId>
550-
<version>3.10</version>
551-
</dependency>
552-
553640
<dependency>
554641
<groupId>commons-validator</groupId>
555642
<artifactId>commons-validator</artifactId>
556643
<version>1.6</version>
557644
</dependency>
558645

559-
<dependency>
560-
<groupId>com.github.mpkorstanje</groupId>
561-
<artifactId>simmetrics-core</artifactId>
562-
<version>4.1.1</version>
563-
</dependency>
564-
565-
<dependency>
566-
<groupId>joda-time</groupId>
567-
<artifactId>joda-time</artifactId>
568-
<version>2.9.4</version>
569-
</dependency>
570646
<dependency>
571647
<groupId>com.googlecode.libphonenumber</groupId>
572648
<artifactId>libphonenumber</artifactId>
@@ -693,13 +769,6 @@
693769
<version>3.3.0</version>
694770
</dependency>
695771

696-
<!-- OpenCSV -->
697-
<dependency>
698-
<groupId>com.opencsv</groupId>
699-
<artifactId>opencsv</artifactId>
700-
<version>5.3</version>
701-
</dependency>
702-
703772
<!-- Swagger -->
704773
<dependency>
705774
<groupId>io.swagger.core.v3</groupId>

‎sormas-rest/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
<artifactId>javaee-web-api</artifactId>
2323
</dependency>
2424

25+
<dependency>
26+
<groupId>com.opencsv</groupId>
27+
<artifactId>opencsv</artifactId>
28+
</dependency>
29+
2530
<dependency>
2631
<groupId>org.slf4j</groupId>
2732
<artifactId>slf4j-api</artifactId>

‎sormas-ui/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
<version>${project.version}</version>
3939
</dependency>
4040

41+
<dependency>
42+
<groupId>com.opencsv</groupId>
43+
<artifactId>opencsv</artifactId>
44+
</dependency>
45+
4146
<dependency>
4247
<groupId>org.slf4j</groupId>
4348
<artifactId>slf4j-api</artifactId>

0 commit comments

Comments
 (0)