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

Commit e4a005c

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3449: Defined more Domain libs, reviewed deps which stay compile scope
1 parent 0129b0f commit e4a005c

2 files changed

Lines changed: 99 additions & 20 deletions

File tree

‎sormas-base/dependencies/serverlibs.pom‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<dependencies>
1616

1717
<!-- To collect these dependencies, they have to be on scope "provided" (usually defined in parent POM) -->
18+
<!-- Transitive dependencies are automatically included (if not defined as exclusion) -->
1819

1920
<dependency>
2021
<groupId>ch.qos.logback</groupId>
@@ -27,11 +28,26 @@
2728
<scope>provided</scope>
2829
</dependency>
2930

31+
<dependency>
32+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
33+
<artifactId>jackson-jaxrs-json-provider</artifactId>
34+
</dependency>
35+
3036
<dependency>
3137
<groupId>com.vaadin</groupId>
3238
<artifactId>vaadin-themes</artifactId>
3339
</dependency>
3440

41+
<dependency>
42+
<groupId>com.vladmihalcea</groupId>
43+
<artifactId>hibernate-types-52</artifactId>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>org.apache.httpcomponents</groupId>
48+
<artifactId>httpclient</artifactId>
49+
</dependency>
50+
3551
<dependency>
3652
<groupId>org.bouncycastle</groupId>
3753
<artifactId>bcpkix-jdk15on</artifactId>

‎sormas-base/pom.xml‎

Lines changed: 83 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<payara.version>5.2020.2</payara.version>
2424

2525
<!-- *** Other dependency versions *** -->
26+
<glassfish.jaxb.version>2.3.1</glassfish.jaxb.version>
2627
<slf4j.version>1.7.30</slf4j.version>
2728
<logback.version>1.1.7</logback.version>
2829
<vaadin.version.warning>TODO: Remove bootstrap.js in widgetset</vaadin.version.warning>
@@ -312,6 +313,39 @@
312313
<scope>runtime</scope>
313314
</dependency>
314315

316+
<dependency>
317+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
318+
<artifactId>jackson-jaxrs-base</artifactId>
319+
<version>${jackson.version}</version>
320+
<scope>provided</scope>
321+
</dependency>
322+
<dependency>
323+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
324+
<artifactId>jackson-jaxrs-json-provider</artifactId>
325+
<version>${jackson.version}</version>
326+
<scope>provided</scope>
327+
</dependency>
328+
329+
<dependency>
330+
<groupId>com.vaadin</groupId>
331+
<artifactId>vaadin-themes</artifactId>
332+
<version>${vaadin.version}</version>
333+
<scope>provided</scope>
334+
</dependency>
335+
336+
<dependency>
337+
<groupId>org.apache.httpcomponents</groupId>
338+
<artifactId>httpclient</artifactId>
339+
<version>4.5.4</version>
340+
<scope>provided</scope>
341+
</dependency>
342+
<dependency>
343+
<groupId>org.apache.httpcomponents</groupId>
344+
<artifactId>httpcore</artifactId>
345+
<version>4.4.1</version>
346+
<scope>provided</scope>
347+
</dependency>
348+
315349
<dependency>
316350
<groupId>org.bouncycastle</groupId>
317351
<artifactId>bcpkix-jdk15on</artifactId>
@@ -362,6 +396,47 @@
362396
</exclusion>
363397
</exclusions>
364398
</dependency>
399+
<dependency>
400+
<groupId>com.sun.xml.fastinfoset</groupId>
401+
<artifactId>FastInfoset</artifactId>
402+
<version>1.2.15</version>
403+
<scope>provided</scope>
404+
<!-- Dependency of hibernate-core -->
405+
</dependency>
406+
<dependency>
407+
<groupId>org.glassfish.jaxb</groupId>
408+
<artifactId>jaxb-runtime</artifactId>
409+
<version>${glassfish.jaxb.version}</version>
410+
<scope>provided</scope>
411+
<!-- Dependency of hibernate-core -->
412+
</dependency>
413+
<dependency>
414+
<groupId>org.glassfish.jaxb</groupId>
415+
<artifactId>txw2</artifactId>
416+
<version>${glassfish.jaxb.version}</version>
417+
<scope>provided</scope>
418+
<!-- Dependency of hibernate-core -->
419+
</dependency>
420+
<dependency>
421+
<groupId>org.jvnet.staxex</groupId>
422+
<artifactId>stax-ex</artifactId>
423+
<version>1.8</version>
424+
<scope>provided</scope>
425+
<!-- Dependency of hibernate-core -->
426+
</dependency>
427+
<dependency>
428+
<groupId>com.vladmihalcea</groupId>
429+
<artifactId>hibernate-types-52</artifactId>
430+
<version>2.9.13</version>
431+
<scope>provided</scope>
432+
<!-- Additional datatypes for hibernate-core -->
433+
<exclusions>
434+
<exclusion>
435+
<groupId>com.fasterxml.jackson.module</groupId>
436+
<artifactId>jackson-module-jaxb-annotations</artifactId>
437+
</exclusion>
438+
</exclusions>
439+
</dependency>
365440

366441
<dependency>
367442
<groupId>org.jsoup</groupId>
@@ -402,13 +477,6 @@
402477
<scope>provided</scope>
403478
</dependency>
404479

405-
<dependency>
406-
<groupId>com.vaadin</groupId>
407-
<artifactId>vaadin-themes</artifactId>
408-
<version>${vaadin.version}</version>
409-
<scope>provided</scope>
410-
</dependency>
411-
412480
<!-- *** Domain libs END *** -->
413481

414482
<dependency>
@@ -509,7 +577,6 @@
509577
<groupId>org.keycloak</groupId>
510578
<artifactId>keycloak-admin-client</artifactId>
511579
<version>${keycloak.version}</version>
512-
<!-- TODO #3449: avoid scope compile -->
513580
<exclusions>
514581
<!-- Exclude Payara modules here -->
515582
<exclusion>
@@ -529,45 +596,41 @@
529596
</exclusion>
530597
</exclusions>
531598
</dependency>
599+
<dependency>
600+
<groupId>org.keycloak</groupId>
601+
<artifactId>keycloak-common</artifactId>
602+
<version>${keycloak.version}</version>
603+
<!-- No Domain lib, because it ran with Ant into problem, see https://stackoverflow.com/questions/64857838/invalid-jdk-version-in-profile-compile-java8-release-flag-unbounded-range-9 -->
604+
</dependency>
532605
<dependency>
533606
<groupId>org.keycloak</groupId>
534607
<artifactId>keycloak-core</artifactId>
535608
<version>${keycloak.version}</version>
536-
<!-- TODO #3449: avoid scope compile -->
609+
<!-- No Domain lib, because it ran with Ant into problem, see https://stackoverflow.com/questions/64857838/invalid-jdk-version-in-profile-compile-java8-release-flag-unbounded-range-9 -->
537610
</dependency>
538611
<dependency>
539612
<groupId>org.keycloak</groupId>
540613
<artifactId>keycloak-servlet-filter-adapter</artifactId>
541614
<version>${keycloak.version}</version>
542-
<!-- TODO #3449: avoid scope compile -->
543615
</dependency>
544616

545617
<dependency>
546618
<groupId>com.googlecode.libphonenumber</groupId>
547619
<artifactId>libphonenumber</artifactId>
548620
<version>8.12.11</version>
549-
<!-- TODO #3449: avoid scope compile -->
550621
</dependency>
551622

552623
<dependency>
553624
<groupId>com.jayway.jsonpath</groupId>
554625
<artifactId>json-path</artifactId>
555626
<version>2.4.0</version>
556-
<!-- TODO #3449: avoid scope compile -->
557-
</dependency>
558-
559-
<dependency>
560-
<groupId>com.vladmihalcea</groupId>
561-
<artifactId>hibernate-types-52</artifactId>
562-
<version>2.9.13</version>
563-
<!-- TODO #3449: avoid scope compile -->
564627
</dependency>
565628

566629
<dependency>
567630
<groupId>com.fasterxml.jackson.core</groupId>
568631
<artifactId>jackson-module-jaxm-annotations</artifactId>
569632
<version>${jackson.version}</version>
570-
<!-- TODO #3449: avoid scope compile -->
633+
<!-- TODO #3449: Not existing artifactId -->
571634
</dependency>
572635

573636
<dependency>

0 commit comments

Comments
 (0)