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

Commit 0129b0f

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3449: Refactoring: Reordered already present Domain libs
1 parent f581ce2 commit 0129b0f

1 file changed

Lines changed: 78 additions & 66 deletions

File tree

‎sormas-base/pom.xml‎

Lines changed: 78 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,34 @@
297297
<scope>test</scope>
298298
</dependency>
299299

300+
<!-- *** Domain libs *** -->
301+
302+
<dependency>
303+
<groupId>ch.qos.logback</groupId>
304+
<artifactId>logback-core</artifactId>
305+
<version>${logback.version}</version>
306+
<scope>runtime</scope>
307+
</dependency>
308+
<dependency>
309+
<groupId>ch.qos.logback</groupId>
310+
<artifactId>logback-classic</artifactId>
311+
<version>${logback.version}</version>
312+
<scope>runtime</scope>
313+
</dependency>
314+
315+
<dependency>
316+
<groupId>org.bouncycastle</groupId>
317+
<artifactId>bcpkix-jdk15on</artifactId>
318+
<version>${bouncycastle.version}</version>
319+
<scope>provided</scope>
320+
</dependency>
321+
<dependency>
322+
<groupId>org.bouncycastle</groupId>
323+
<artifactId>bcprov-jdk15on</artifactId>
324+
<version>${bouncycastle.version}</version>
325+
<scope>provided</scope>
326+
</dependency>
327+
300328
<dependency>
301329
<groupId>org.hibernate</groupId>
302330
<artifactId>hibernate-core</artifactId>
@@ -335,6 +363,54 @@
335363
</exclusions>
336364
</dependency>
337365

366+
<dependency>
367+
<groupId>org.jsoup</groupId>
368+
<artifactId>jsoup</artifactId>
369+
<version>1.13.1</version>
370+
<scope>provided</scope>
371+
</dependency>
372+
373+
<dependency>
374+
<groupId>org.postgresql</groupId>
375+
<artifactId>postgresql</artifactId>
376+
<version>42.2.14</version>
377+
<scope>provided</scope>
378+
<exclusions>
379+
<exclusion>
380+
<artifactId>waffle-jna</artifactId>
381+
<groupId>com.github.dblock.waffle</groupId>
382+
</exclusion>
383+
</exclusions>
384+
</dependency>
385+
386+
<dependency>
387+
<groupId>org.slf4j</groupId>
388+
<artifactId>jcl-over-slf4j</artifactId>
389+
<version>${slf4j.version}</version>
390+
<scope>provided</scope>
391+
</dependency>
392+
<dependency>
393+
<groupId>org.slf4j</groupId>
394+
<artifactId>jul-to-slf4j</artifactId>
395+
<version>${slf4j.version}</version>
396+
<scope>provided</scope>
397+
</dependency>
398+
<dependency>
399+
<groupId>org.slf4j</groupId>
400+
<artifactId>slf4j-api</artifactId>
401+
<version>${slf4j.version}</version>
402+
<scope>provided</scope>
403+
</dependency>
404+
405+
<dependency>
406+
<groupId>com.vaadin</groupId>
407+
<artifactId>vaadin-themes</artifactId>
408+
<version>${vaadin.version}</version>
409+
<scope>provided</scope>
410+
</dependency>
411+
412+
<!-- *** Domain libs END *** -->
413+
338414
<dependency>
339415
<groupId>org.hibernate.validator</groupId>
340416
<artifactId>hibernate-validator</artifactId>
@@ -494,56 +570,12 @@
494570
<!-- TODO #3449: avoid scope compile -->
495571
</dependency>
496572

497-
<!-- serverlibs -->
498-
499-
<dependency>
500-
<groupId>org.postgresql</groupId>
501-
<artifactId>postgresql</artifactId>
502-
<version>42.2.14</version>
503-
<scope>provided</scope>
504-
<exclusions>
505-
<exclusion>
506-
<artifactId>waffle-jna</artifactId>
507-
<groupId>com.github.dblock.waffle</groupId>
508-
</exclusion>
509-
</exclusions>
510-
</dependency>
511-
512-
<!-- bundles -->
513-
514-
<dependency>
515-
<groupId>org.slf4j</groupId>
516-
<artifactId>slf4j-api</artifactId>
517-
<version>${slf4j.version}</version>
518-
<scope>provided</scope>
519-
</dependency>
520-
<dependency>
521-
<groupId>org.slf4j</groupId>
522-
<artifactId>jcl-over-slf4j</artifactId>
523-
<version>${slf4j.version}</version>
524-
</dependency>
525-
<dependency>
526-
<groupId>org.slf4j</groupId>
527-
<artifactId>jul-to-slf4j</artifactId>
528-
<version>${slf4j.version}</version>
529-
</dependency>
530573
<dependency>
531574
<groupId>org.slf4j</groupId>
532575
<artifactId>slf4j-log4j12</artifactId>
533576
<version>${slf4j.version}</version>
534-
</dependency>
535-
536-
<dependency>
537-
<groupId>ch.qos.logback</groupId>
538-
<artifactId>logback-core</artifactId>
539-
<version>${logback.version}</version>
540-
<scope>runtime</scope>
541-
</dependency>
542-
<dependency>
543-
<groupId>ch.qos.logback</groupId>
544-
<artifactId>logback-classic</artifactId>
545-
<version>${logback.version}</version>
546-
<scope>runtime</scope>
577+
<scope>provided</scope>
578+
<!-- TODO #3449: not yet somwhere bundled. Needed? -->
547579
</dependency>
548580

549581
<!-- Vaadin -->
@@ -572,12 +604,6 @@
572604
<artifactId>vaadin-compatibility-server</artifactId>
573605
<version>${vaadin.version}</version>
574606
</dependency>
575-
<dependency>
576-
<groupId>com.vaadin</groupId>
577-
<artifactId>vaadin-themes</artifactId>
578-
<version>${vaadin.version}</version>
579-
<scope>provided</scope>
580-
</dependency>
581607

582608
<dependency>
583609
<groupId>org.vaadin.addons</groupId>
@@ -611,27 +637,13 @@
611637
<version>5.3</version>
612638
</dependency>
613639

614-
<dependency>
615-
<groupId>org.jsoup</groupId>
616-
<artifactId>jsoup</artifactId>
617-
<version>1.13.1</version>
618-
<scope>provided</scope>
619-
</dependency>
620-
621640
<!-- Swagger -->
622641
<dependency>
623642
<groupId>io.swagger.core.v3</groupId>
624643
<artifactId>swagger-jaxrs2</artifactId>
625644
<version>${swagger.version}</version>
626645
</dependency>
627646

628-
<dependency>
629-
<groupId>org.bouncycastle</groupId>
630-
<artifactId>bcpkix-jdk15on</artifactId>
631-
<version>${bouncycastle.version}</version>
632-
<scope>provided</scope>
633-
</dependency>
634-
635647
</dependencies>
636648
</dependencyManagement>
637649

0 commit comments

Comments
 (0)