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

Commit 2fcdeda

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3449: Ordered Compile deps and Test libraries
- removed superfluous comments for singular dependencies
1 parent 4114475 commit 2fcdeda

1 file changed

Lines changed: 100 additions & 106 deletions

File tree

‎sormas-base/pom.xml‎

Lines changed: 100 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<swagger.version>2.1.2</swagger.version>
3333
<bouncycastle.version>1.66</bouncycastle.version>
3434
<keycloak.version>11.0.0</keycloak.version>
35+
<xdocreport.version>2.0.2</xdocreport.version>
3536

3637
<!-- Attention: Compile dependencies with versions are maintained redundantly in sormas-app/app/build.gradle -->
3738

@@ -270,36 +271,6 @@
270271

271272
<!-- *** Payara modules END *** -->
272273

273-
<!-- Baseline for tests, so that in all projects in any case the test
274-
libs are available -->
275-
<dependency>
276-
<groupId>junit</groupId>
277-
<artifactId>junit</artifactId>
278-
<version>4.12</version>
279-
<scope>test</scope>
280-
</dependency>
281-
282-
<dependency>
283-
<groupId>org.hamcrest</groupId>
284-
<artifactId>hamcrest-core</artifactId>
285-
<version>1.3</version>
286-
<scope>test</scope>
287-
</dependency>
288-
289-
<dependency>
290-
<groupId>org.hamcrest</groupId>
291-
<artifactId>hamcrest-library</artifactId>
292-
<version>1.3</version>
293-
<scope>test</scope>
294-
</dependency>
295-
296-
<dependency>
297-
<groupId>org.mockito</groupId>
298-
<artifactId>mockito-inline</artifactId>
299-
<version>3.5.13</version>
300-
<scope>test</scope>
301-
</dependency>
302-
303274
<!-- *** Domain libs *** -->
304275

305276
<dependency>
@@ -572,81 +543,59 @@
572543

573544
<!-- *** Domain libs END *** -->
574545

575-
<dependency>
576-
<groupId>org.hibernate.validator</groupId>
577-
<artifactId>hibernate-validator</artifactId>
578-
<version>6.1.5.Final</version>
579-
<scope>test</scope>
580-
</dependency>
546+
<!-- *** Compile dependencies *** -->
581547

582548
<dependency>
583-
<groupId>com.h2database</groupId>
584-
<artifactId>h2</artifactId>
585-
<version>1.4.200</version>
586-
<scope>test</scope>
587-
<!-- In-memory-database for bean-test -->
588-
<!-- better compatibility to PostgreSQL than HSQLDB -->
589-
</dependency>
590-
591-
<dependency>
592-
<groupId>info.novatec</groupId>
593-
<artifactId>bean-test</artifactId>
594-
<version>0.2.Final</version>
595-
<scope>test</scope>
549+
<groupId>com.googlecode.libphonenumber</groupId>
550+
<artifactId>libphonenumber</artifactId>
551+
<version>8.12.11</version>
596552
</dependency>
597553

598-
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
599554
<dependency>
600-
<groupId>org.apache.poi</groupId>
601-
<artifactId>poi-ooxml</artifactId>
602-
<version>3.17</version>
603-
<scope>test</scope>
555+
<groupId>com.jayway.jsonpath</groupId>
556+
<artifactId>json-path</artifactId>
557+
<version>2.4.0</version>
604558
</dependency>
605559

606560
<dependency>
607-
<groupId>org.apache.geronimo.config</groupId>
608-
<artifactId>geronimo-config-impl</artifactId>
609-
<version>1.0</version>
610-
<scope>test</scope>
561+
<groupId>com.nexmo</groupId>
562+
<artifactId>client</artifactId>
563+
<version>3.3.0</version>
611564
</dependency>
612565

613566
<dependency>
614-
<groupId>p6spy</groupId>
615-
<artifactId>p6spy</artifactId>
616-
<version>3.9.0</version>
617-
<scope>test</scope>
567+
<groupId>commons-validator</groupId>
568+
<artifactId>commons-validator</artifactId>
569+
<version>1.6</version>
618570
</dependency>
619571

620572
<dependency>
621573
<groupId>fr.opensagres.xdocreport</groupId>
622574
<artifactId>xdocreport</artifactId>
623-
<version>2.0.2</version>
575+
<version>${xdocreport.version}</version>
624576
</dependency>
625-
626577
<dependency>
627578
<groupId>fr.opensagres.xdocreport</groupId>
628579
<artifactId>fr.opensagres.xdocreport.template.velocity</artifactId>
629-
<version>2.0.2</version>
580+
<version>${xdocreport.version}</version>
630581
</dependency>
631582

632583
<dependency>
633-
<groupId>org.freemarker</groupId>
634-
<artifactId>freemarker</artifactId>
635-
<version>2.3.20</version>
584+
<groupId>io.swagger.core.v3</groupId>
585+
<artifactId>swagger-jaxrs2</artifactId>
586+
<version>${swagger.version}</version>
636587
</dependency>
637588

638-
<!-- compile dependencies -->
639-
640589
<dependency>
641-
<groupId>commons-validator</groupId>
642-
<artifactId>commons-validator</artifactId>
643-
<version>1.6</version>
590+
<groupId>org.freemarker</groupId>
591+
<artifactId>freemarker</artifactId>
592+
<version>2.3.20</version>
644593
</dependency>
645594

646595
<dependency>
647-
<groupId>com.googlecode.libphonenumber</groupId>
648-
<artifactId>libphonenumber</artifactId>
649-
<version>8.12.11</version>
596+
<groupId>org.geotools</groupId>
597+
<artifactId>gt-shapefile</artifactId>
598+
<version>21.4</version>
650599
</dependency>
651600

652601
<dependency>
@@ -690,18 +639,6 @@
690639
<version>${keycloak.version}</version>
691640
</dependency>
692641

693-
<dependency>
694-
<groupId>com.googlecode.libphonenumber</groupId>
695-
<artifactId>libphonenumber</artifactId>
696-
<version>8.12.11</version>
697-
</dependency>
698-
699-
<dependency>
700-
<groupId>com.jayway.jsonpath</groupId>
701-
<artifactId>json-path</artifactId>
702-
<version>2.4.0</version>
703-
</dependency>
704-
705642
<dependency>
706643
<groupId>com.fasterxml.jackson.core</groupId>
707644
<artifactId>jackson-module-jaxm-annotations</artifactId>
@@ -717,7 +654,7 @@
717654
<!-- TODO #3449: not yet somwhere bundled. Needed? -->
718655
</dependency>
719656

720-
<!-- Vaadin -->
657+
<!-- ** Vaadin ** -->
721658

722659
<dependency>
723660
<groupId>com.vaadin</groupId>
@@ -756,47 +693,104 @@
756693
<version>0.3.0</version>
757694
</dependency>
758695

696+
<!-- ** Vaadin END ** -->
697+
698+
<!-- *** Compile dependencies END *** -->
699+
700+
<!-- *** Test dependencies *** -->
701+
759702
<dependency>
760-
<groupId>org.geotools</groupId>
761-
<artifactId>gt-shapefile</artifactId>
762-
<version>21.4</version>
703+
<groupId>com.h2database</groupId>
704+
<artifactId>h2</artifactId>
705+
<version>1.4.200</version>
706+
<scope>test</scope>
707+
<!-- In-memory-database for bean-test -->
708+
<!-- better compatibility to PostgreSQL than HSQLDB -->
763709
</dependency>
764710

765-
<!-- Nexmo SMS API -->
766711
<dependency>
767-
<groupId>com.nexmo</groupId>
768-
<artifactId>client</artifactId>
769-
<version>3.3.0</version>
712+
<groupId>info.novatec</groupId>
713+
<artifactId>bean-test</artifactId>
714+
<version>0.2.Final</version>
715+
<scope>test</scope>
770716
</dependency>
771717

772-
<!-- Swagger -->
773718
<dependency>
774-
<groupId>io.swagger.core.v3</groupId>
775-
<artifactId>swagger-jaxrs2</artifactId>
776-
<version>${swagger.version}</version>
719+
<groupId>junit</groupId>
720+
<artifactId>junit</artifactId>
721+
<version>4.12</version>
722+
<scope>test</scope>
777723
</dependency>
778-
724+
725+
<dependency>
726+
<groupId>org.apache.geronimo.config</groupId>
727+
<artifactId>geronimo-config-impl</artifactId>
728+
<version>1.0</version>
729+
<scope>test</scope>
730+
</dependency>
731+
732+
<dependency>
733+
<groupId>org.apache.poi</groupId>
734+
<artifactId>poi-ooxml</artifactId>
735+
<version>3.17</version>
736+
<scope>test</scope>
737+
</dependency>
738+
739+
<dependency>
740+
<groupId>org.hamcrest</groupId>
741+
<artifactId>hamcrest-core</artifactId>
742+
<version>1.3</version>
743+
<scope>test</scope>
744+
</dependency>
745+
<dependency>
746+
<groupId>org.hamcrest</groupId>
747+
<artifactId>hamcrest-library</artifactId>
748+
<version>1.3</version>
749+
<scope>test</scope>
750+
</dependency>
751+
752+
<dependency>
753+
<groupId>org.hibernate.validator</groupId>
754+
<artifactId>hibernate-validator</artifactId>
755+
<version>6.1.5.Final</version>
756+
<scope>test</scope>
757+
</dependency>
758+
759+
<dependency>
760+
<groupId>org.mockito</groupId>
761+
<artifactId>mockito-inline</artifactId>
762+
<version>3.5.13</version>
763+
<scope>test</scope>
764+
</dependency>
765+
766+
<dependency>
767+
<groupId>p6spy</groupId>
768+
<artifactId>p6spy</artifactId>
769+
<version>3.9.0</version>
770+
<scope>test</scope>
771+
</dependency>
772+
773+
<!-- *** Test dependencies END *** -->
774+
779775
</dependencies>
780776
</dependencyManagement>
781777

782778
<dependencies>
783-
<!-- Testbibliotheken für alle Submodule -->
784-
<!-- Reihenfolge ist wichtig (Matcher-Implementierungen) -->
779+
780+
<!-- Test libraries for all modules as baseline -->
781+
<!-- Order is important because of Matcher implementations -->
785782
<dependency>
786783
<groupId>org.hamcrest</groupId>
787784
<artifactId>hamcrest-core</artifactId>
788785
</dependency>
789-
790786
<dependency>
791787
<groupId>junit</groupId>
792788
<artifactId>junit</artifactId>
793789
</dependency>
794-
795790
<dependency>
796791
<groupId>org.hamcrest</groupId>
797792
<artifactId>hamcrest-library</artifactId>
798793
</dependency>
799-
800794
<dependency>
801795
<groupId>org.mockito</groupId>
802796
<artifactId>mockito-inline</artifactId>

0 commit comments

Comments
 (0)